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/11/29 21:53:58 UTC
[07/15] tomee git commit: TOMEE-2278 - rename
tomee-microprofile-common to mp-common and update loading inclusions
TOMEE-2278 - rename tomee-microprofile-common to mp-common and update loading inclusions
Signed-off-by: brunobat <br...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f6bc6ca4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f6bc6ca4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f6bc6ca4
Branch: refs/heads/master
Commit: f6bc6ca41bc54111a12c7bcb6197b2572f2ce660
Parents: 37bc867
Author: brunobat <br...@gmail.com>
Authored: Wed Nov 21 00:57:18 2018 +0000
Committer: brunobat <br...@gmail.com>
Committed: Wed Nov 21 00:57:18 2018 +0000
----------------------------------------------------------------------
.../apache/openejb/config/DeploymentLoader.java | 2 +-
.../org/apache/tomee/installer/Installer.java | 2 +-
tomee/tomee-microprofile/mp-common/pom.xml | 35 +++++++++
...ilsafeContainerExecutionManagerProvider.java | 69 ++++++++++++++++++
.../src/main/resources/META-INF/beans.xml | 22 ++++++
...feContainerExecutionManagerProviderTest.java | 76 ++++++++++++++++++++
tomee/tomee-microprofile/pom.xml | 2 +-
.../tomee-microprofile-common/pom.xml | 35 ---------
...ilsafeContainerExecutionManagerProvider.java | 69 ------------------
.../src/main/resources/META-INF/beans.xml | 22 ------
...feContainerExecutionManagerProviderTest.java | 76 --------------------
.../tomee-microprofile-webapp/pom.xml | 2 +-
12 files changed, 206 insertions(+), 206 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f6bc6ca4/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
index d0ebfe3..e3ec208 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
@@ -1108,7 +1108,7 @@ public class DeploymentLoader implements DeploymentFilterable {
try {
UrlSet urlSet = new UrlSet(ParentClassLoaderFinder.Helper.get());
urlSet = URLs.cullSystemJars(urlSet);
- final PatternFilter containerIncludes = new PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_INCLUDES, ".*(geronimo|mp-jwt|failsafe).*"));
+ final PatternFilter containerIncludes = new PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_INCLUDES, ".*(geronimo|mp-jwt|mp-common|failsafe).*"));
final PatternFilter containerExcludes = new PatternFilter(SystemInstance.get().getProperty(OPENEJB_CONTAINER_EXCLUDES, ""));
urlSet = NewLoaderLogic.applyBuiltinExcludes(urlSet, containerIncludes, containerExcludes);
containerUrls = urlSet.getUrls();
http://git-wip-us.apache.org/repos/asf/tomee/blob/f6bc6ca4/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 5ad3b09..01d2c90 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -794,7 +794,7 @@ public class Installer implements InstallerInterface {
systemPropertiesWriter.write("#\n");
systemPropertiesWriter.write("# Which paths / libraries should be scanned?\n");
systemPropertiesWriter.write("openejb.scan.webapp.container = true\n");
- systemPropertiesWriter.write("openejb.scan.webapp.container.includes = .*(geronimo|mp-jwt|failsafe).*\n");
+ systemPropertiesWriter.write("openejb.scan.webapp.container.includes = .*(geronimo|mp-jwt|mp-common|failsafe).*\n");
systemPropertiesWriter.write("openejb.scan.webapp.container.excludes = \n");
} catch (final IOException e) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/f6bc6ca4/tomee/tomee-microprofile/mp-common/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/mp-common/pom.xml b/tomee/tomee-microprofile/mp-common/pom.xml
new file mode 100644
index 0000000..bc55465
--- /dev/null
+++ b/tomee/tomee-microprofile/mp-common/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>tomee-microprofile</artifactId>
+ <groupId>org.apache.tomee</groupId>
+ <version>8.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>mp-common</artifactId>
+ <name>OpenEJB :: TomEE :: MicroProfile Common</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
+ <artifactId>microprofile-fault-tolerance-api</artifactId>
+ <version>${microprofile.fault-tolerance.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.safeguard</groupId>
+ <artifactId>safeguard-impl</artifactId>
+ <version>${microprofile.fault-tolerance.impl.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/f6bc6ca4/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProvider.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProvider.java b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProvider.java
new file mode 100644
index 0000000..8f437e2
--- /dev/null
+++ b/tomee/tomee-microprofile/mp-common/src/main/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProvider.java
@@ -0,0 +1,69 @@
+package org.apache.tomee.microprofile.faulttolerance;
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.
+ */
+
+
+import org.apache.safeguard.api.ExecutionManager;
+import org.apache.safeguard.impl.FailsafeExecutionManager;
+import org.apache.safeguard.impl.bulkhead.BulkheadManagerImpl;
+import org.apache.safeguard.impl.cdi.FailsafeExecutionManagerProvider;
+import org.apache.safeguard.impl.circuitbreaker.FailsafeCircuitBreakerManager;
+import org.apache.safeguard.impl.config.MicroprofileAnnotationMapper;
+import org.apache.safeguard.impl.executionPlans.ExecutionPlanFactory;
+import org.apache.safeguard.impl.executorService.DefaultExecutorServiceProvider;
+import org.apache.safeguard.impl.retry.FailsafeRetryManager;
+
+import javax.annotation.Priority;
+import javax.annotation.Resource;
+import javax.enterprise.concurrent.ManagedScheduledExecutorService;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Alternative;
+import javax.enterprise.inject.Specializes;
+import javax.enterprise.inject.spi.Extension;
+import javax.interceptor.Interceptor;
+import javax.ws.rs.Produces;
+
+@Alternative
+@Specializes
+@Priority(Interceptor.Priority.APPLICATION+10)
+@ApplicationScoped
+public class FailsafeContainerExecutionManagerProvider extends FailsafeExecutionManagerProvider implements Extension {
+
+ @Resource(name = "DefaultManagedScheduledExecutorService")
+ ManagedScheduledExecutorService executor;
+
+ @Override
+ @Produces
+ @ApplicationScoped
+ public ExecutionManager createExecutionManager() {
+
+ final MicroprofileAnnotationMapper mapper = MicroprofileAnnotationMapper.getInstance();
+ final DefaultExecutorServiceProvider executorServiceProvider = new DefaultExecutorServiceProvider(executor);
+ final BulkheadManagerImpl bulkheadManager = new BulkheadManagerImpl();
+ final FailsafeCircuitBreakerManager circuitBreakerManager = new FailsafeCircuitBreakerManager();
+ final FailsafeRetryManager retryManager = new FailsafeRetryManager();
+
+ return new FailsafeExecutionManager(
+ mapper,
+ bulkheadManager,
+ circuitBreakerManager,
+ retryManager,
+ new ExecutionPlanFactory(circuitBreakerManager, retryManager, bulkheadManager, mapper,
+ executorServiceProvider),
+ executorServiceProvider);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/f6bc6ca4/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/beans.xml b/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/beans.xml
new file mode 100644
index 0000000..1756cff
--- /dev/null
+++ b/tomee/tomee-microprofile/mp-common/src/main/resources/META-INF/beans.xml
@@ -0,0 +1,22 @@
+<!--
+
+ 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.
+-->
+<beans>
+ <alternatives>
+ <class>org.apache.tomee.microprofile.faulttolerance.FailsafeContainerExecutionManagerProvider</class>
+ </alternatives>
+</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/f6bc6ca4/tomee/tomee-microprofile/mp-common/src/test/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProviderTest.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/mp-common/src/test/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProviderTest.java b/tomee/tomee-microprofile/mp-common/src/test/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProviderTest.java
new file mode 100644
index 0000000..a28330e
--- /dev/null
+++ b/tomee/tomee-microprofile/mp-common/src/test/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProviderTest.java
@@ -0,0 +1,76 @@
+package org.apache.tomee.microprofile.faulttolerance;
+
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.
+ */
+
+import org.apache.openejb.jee.WebApp;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.Module;
+import org.apache.safeguard.api.ExecutionManager;
+import org.apache.safeguard.impl.cdi.FailsafeExecutionManagerProvider;
+import org.apache.safeguard.impl.cdi.SafeguardInterceptor;
+import org.eclipse.microprofile.faulttolerance.CircuitBreaker;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.ejb.Singleton;
+import javax.inject.Inject;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(ApplicationComposer.class)
+public class FailsafeContainerExecutionManagerProviderTest {
+
+ @Inject
+ private FailsafeExecutionManagerProvider manager;
+
+ @Inject
+ private MyClass myClass;
+
+ @Module
+ @Classes(value = {FailsafeContainerExecutionManagerProvider.class,
+ FailsafeExecutionManagerProvider.class,
+ ExecutionManager.class,
+ SafeguardInterceptor.class,
+ MyClass.class},
+ cdi = true)
+ public WebApp app() {
+ return new WebApp();
+ }
+
+ @Test
+ public void testManagerInjection() throws Exception {
+
+ assertEquals("called", myClass.validateInjectedClass());
+
+ assertTrue("We must override the original FailsafeExecutionManagerProvider, was:" + manager.getClass(),
+ manager instanceof FailsafeContainerExecutionManagerProvider);
+ }
+
+
+ @Singleton
+ public static class MyClass {
+
+ @CircuitBreaker
+ public String validateInjectedClass() {
+ return "called";
+ }
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/f6bc6ca4/tomee/tomee-microprofile/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/pom.xml b/tomee/tomee-microprofile/pom.xml
index 16742ef..c4d6da9 100644
--- a/tomee/tomee-microprofile/pom.xml
+++ b/tomee/tomee-microprofile/pom.xml
@@ -14,7 +14,7 @@
<packaging>pom</packaging>
<modules>
- <module>tomee-microprofile-common</module>
+ <module>mp-common</module>
<module>tomee-microprofile-webapp</module>
</modules>
http://git-wip-us.apache.org/repos/asf/tomee/blob/f6bc6ca4/tomee/tomee-microprofile/tomee-microprofile-common/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/tomee-microprofile-common/pom.xml b/tomee/tomee-microprofile/tomee-microprofile-common/pom.xml
deleted file mode 100644
index 124d641..0000000
--- a/tomee/tomee-microprofile/tomee-microprofile-common/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>tomee-microprofile</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>8.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>tomee-microprofile-common</artifactId>
- <name>OpenEJB :: TomEE :: MicroProfile Common</name>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>javaee-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.microprofile.fault-tolerance</groupId>
- <artifactId>microprofile-fault-tolerance-api</artifactId>
- <version>${microprofile.fault-tolerance.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.safeguard</groupId>
- <artifactId>safeguard-impl</artifactId>
- <version>${microprofile.fault-tolerance.impl.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/f6bc6ca4/tomee/tomee-microprofile/tomee-microprofile-common/src/main/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProvider.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/tomee-microprofile-common/src/main/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProvider.java b/tomee/tomee-microprofile/tomee-microprofile-common/src/main/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProvider.java
deleted file mode 100644
index 8f437e2..0000000
--- a/tomee/tomee-microprofile/tomee-microprofile-common/src/main/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProvider.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.apache.tomee.microprofile.faulttolerance;
-/**
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.
- */
-
-
-import org.apache.safeguard.api.ExecutionManager;
-import org.apache.safeguard.impl.FailsafeExecutionManager;
-import org.apache.safeguard.impl.bulkhead.BulkheadManagerImpl;
-import org.apache.safeguard.impl.cdi.FailsafeExecutionManagerProvider;
-import org.apache.safeguard.impl.circuitbreaker.FailsafeCircuitBreakerManager;
-import org.apache.safeguard.impl.config.MicroprofileAnnotationMapper;
-import org.apache.safeguard.impl.executionPlans.ExecutionPlanFactory;
-import org.apache.safeguard.impl.executorService.DefaultExecutorServiceProvider;
-import org.apache.safeguard.impl.retry.FailsafeRetryManager;
-
-import javax.annotation.Priority;
-import javax.annotation.Resource;
-import javax.enterprise.concurrent.ManagedScheduledExecutorService;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Specializes;
-import javax.enterprise.inject.spi.Extension;
-import javax.interceptor.Interceptor;
-import javax.ws.rs.Produces;
-
-@Alternative
-@Specializes
-@Priority(Interceptor.Priority.APPLICATION+10)
-@ApplicationScoped
-public class FailsafeContainerExecutionManagerProvider extends FailsafeExecutionManagerProvider implements Extension {
-
- @Resource(name = "DefaultManagedScheduledExecutorService")
- ManagedScheduledExecutorService executor;
-
- @Override
- @Produces
- @ApplicationScoped
- public ExecutionManager createExecutionManager() {
-
- final MicroprofileAnnotationMapper mapper = MicroprofileAnnotationMapper.getInstance();
- final DefaultExecutorServiceProvider executorServiceProvider = new DefaultExecutorServiceProvider(executor);
- final BulkheadManagerImpl bulkheadManager = new BulkheadManagerImpl();
- final FailsafeCircuitBreakerManager circuitBreakerManager = new FailsafeCircuitBreakerManager();
- final FailsafeRetryManager retryManager = new FailsafeRetryManager();
-
- return new FailsafeExecutionManager(
- mapper,
- bulkheadManager,
- circuitBreakerManager,
- retryManager,
- new ExecutionPlanFactory(circuitBreakerManager, retryManager, bulkheadManager, mapper,
- executorServiceProvider),
- executorServiceProvider);
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/f6bc6ca4/tomee/tomee-microprofile/tomee-microprofile-common/src/main/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/tomee-microprofile-common/src/main/resources/META-INF/beans.xml b/tomee/tomee-microprofile/tomee-microprofile-common/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index 1756cff..0000000
--- a/tomee/tomee-microprofile/tomee-microprofile-common/src/main/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-
- 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.
--->
-<beans>
- <alternatives>
- <class>org.apache.tomee.microprofile.faulttolerance.FailsafeContainerExecutionManagerProvider</class>
- </alternatives>
-</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/f6bc6ca4/tomee/tomee-microprofile/tomee-microprofile-common/src/test/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProviderTest.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/tomee-microprofile-common/src/test/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProviderTest.java b/tomee/tomee-microprofile/tomee-microprofile-common/src/test/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProviderTest.java
deleted file mode 100644
index a28330e..0000000
--- a/tomee/tomee-microprofile/tomee-microprofile-common/src/test/java/org/apache/tomee/microprofile/faulttolerance/FailsafeContainerExecutionManagerProviderTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.apache.tomee.microprofile.faulttolerance;
-
-/**
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.
- */
-
-import org.apache.openejb.jee.WebApp;
-import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.testing.Classes;
-import org.apache.openejb.testing.Module;
-import org.apache.safeguard.api.ExecutionManager;
-import org.apache.safeguard.impl.cdi.FailsafeExecutionManagerProvider;
-import org.apache.safeguard.impl.cdi.SafeguardInterceptor;
-import org.eclipse.microprofile.faulttolerance.CircuitBreaker;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import javax.ejb.Singleton;
-import javax.inject.Inject;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(ApplicationComposer.class)
-public class FailsafeContainerExecutionManagerProviderTest {
-
- @Inject
- private FailsafeExecutionManagerProvider manager;
-
- @Inject
- private MyClass myClass;
-
- @Module
- @Classes(value = {FailsafeContainerExecutionManagerProvider.class,
- FailsafeExecutionManagerProvider.class,
- ExecutionManager.class,
- SafeguardInterceptor.class,
- MyClass.class},
- cdi = true)
- public WebApp app() {
- return new WebApp();
- }
-
- @Test
- public void testManagerInjection() throws Exception {
-
- assertEquals("called", myClass.validateInjectedClass());
-
- assertTrue("We must override the original FailsafeExecutionManagerProvider, was:" + manager.getClass(),
- manager instanceof FailsafeContainerExecutionManagerProvider);
- }
-
-
- @Singleton
- public static class MyClass {
-
- @CircuitBreaker
- public String validateInjectedClass() {
- return "called";
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/f6bc6ca4/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
index d7e40d4..d5f1137 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-microprofile-common</artifactId>
+ <artifactId>mp-common</artifactId>
<version>${project.version}</version>
</dependency>