You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/08/15 15:41:58 UTC
[07/26] tomee git commit: Added MP Fault Tolerance.
Added MP Fault Tolerance.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3ae5f87b
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3ae5f87b
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3ae5f87b
Branch: refs/heads/master
Commit: 3ae5f87b053607a0a4cdb473e2f0207403878a6f
Parents: 6ed9d08
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Fri Jul 27 20:22:58 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Jul 27 23:55:49 2018 +0100
----------------------------------------------------------------------
pom.xml | 4 +-
tck/microprofile-tck/fault-tolerance/pom.xml | 88 ++++++++++++++++++++
.../src/test/resources/arquillian.xml | 37 ++++++++
tck/microprofile-tck/pom.xml | 1 +
tomee/tomee-microprofile-webapp/pom.xml | 11 +++
5 files changed, 139 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/3ae5f87b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fb28d60..ffd2f68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,13 +194,13 @@
<!-- Micro Profile -->
<microprofile.version>1.2</microprofile.version>
- <!-- Micro Profile Config -->
<microprofile.config.version>1.2</microprofile.config.version>
<!-- Geronimo Config 1.1 targets MP Config 1.2 API -->
<microprofile.config.impl.version>1.1</microprofile.config.impl.version>
- <!-- Micro Profile JWT -->
<microprofile.jwt.version>1.0</microprofile.jwt.version>
<microprofile.jwt.impl.version>${project.version}</microprofile.jwt.impl.version>
+ <microprofile.fault-tolerance.version>1.0</microprofile.fault-tolerance.version>
+ <microprofile.fault-tolerance.impl.version>1.0</microprofile.fault-tolerance.impl.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3ae5f87b/tck/microprofile-tck/fault-tolerance/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/fault-tolerance/pom.xml b/tck/microprofile-tck/fault-tolerance/pom.xml
new file mode 100644
index 0000000..59917db
--- /dev/null
+++ b/tck/microprofile-tck/fault-tolerance/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>microprofile-tck</artifactId>
+ <version>8.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>microprofile-fault-tolerance-tck</artifactId>
+ <name>OpenEJB :: TCK :: MicroProfile Fault Tolerance TCK</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!-- Updated version to fix hanging text -->
+ <version>2.22.0</version>
+ <configuration>
+ <dependenciesToScan>
+ <dependency>org.eclipse.microprofile.fault-tolerance:microprofile-fault-tolerance-tck</dependency>
+ </dependenciesToScan>
+ <excludes>
+ <exclude>org.eclipse.microprofile.fault.tolerance.tck.ConfigTest</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>${microprofile.fault-tolerance.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-tck</artifactId>
+ <version>${microprofile.fault-tolerance.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <classifier>microprofile</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>arquillian-tomee-remote</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3ae5f87b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
new file mode 100644
index 0000000..414f1d5
--- /dev/null
+++ b/tck/microprofile-tck/fault-tolerance/src/test/resources/arquillian.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<arquillian xmlns="http://jboss.org/schema/arquillian"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://jboss.org/schema/arquillian
+ http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+ <container qualifier="tomee-remote" default="true">
+ <configuration>
+ <property name="debug">false</property>
+ <property name="httpPort">-1</property>
+ <property name="ajpPort">-1</property>
+ <property name="stopPort">-1</property>
+ <property name="classifier">microprofile</property>
+ <property name="conf">src/test/conf</property>
+ <property name="dir">target/tomee</property>
+ <property name="appWorkingDir">target/workdir</property>
+ <property name="cleanOnStartUp">true</property>
+ </configuration>
+ </container>
+</arquillian>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3ae5f87b/tck/microprofile-tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/pom.xml b/tck/microprofile-tck/pom.xml
index 9726358..cb448e7 100644
--- a/tck/microprofile-tck/pom.xml
+++ b/tck/microprofile-tck/pom.xml
@@ -33,6 +33,7 @@
<modules>
<module>config</module>
<module>jwt</module>
+ <module>fault-tolerance</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/3ae5f87b/tomee/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index 9e0db8d..0ae24eb 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -71,6 +71,17 @@
<version>${microprofile.jwt.impl.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>${microprofile.fault-tolerance.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.safeguard</groupId>
+ <artifactId>safeguard-impl</artifactId>
+ <version>${microprofile.fault-tolerance.impl.version}</version>
+ </dependency>
</dependencies>
<build>