You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/03/26 18:52:38 UTC
[1/2] tomee git commit: ensuring openejb transaction is not mandatory
and we can use arquillian jta impl with remote adapter
Repository: tomee
Updated Branches:
refs/heads/master a5088393d -> 439d80e66
ensuring openejb transaction is not mandatory and we can use arquillian jta impl with remote adapter
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6e86a658
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6e86a658
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6e86a658
Branch: refs/heads/master
Commit: 6e86a658a7d313960cb96016d454dde76518db65
Parents: a508839
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Sat Mar 26 18:50:09 2016 +0100
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Sat Mar 26 18:50:09 2016 +0100
----------------------------------------------------------------------
.../remote/RemoteTomEEEJBEnricherArchiveAppender.java | 11 ++++++++---
.../arquillian/remote/RemoteTomEERemoteExtension.java | 12 +++++++++---
2 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e86a658/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEEJBEnricherArchiveAppender.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEEJBEnricherArchiveAppender.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEEJBEnricherArchiveAppender.java
index 0437b3b..e2fdccf 100644
--- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEEJBEnricherArchiveAppender.java
+++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEEEJBEnricherArchiveAppender.java
@@ -20,7 +20,6 @@ package org.apache.tomee.arquillian.remote;
import org.apache.openejb.arquillian.common.TomEEInjectionEnricher;
import org.apache.openejb.arquillian.common.enrichment.OpenEJBEnricher;
import org.apache.openejb.arquillian.common.mockito.MockitoEnricher;
-import org.apache.openejb.arquillian.transaction.OpenEJBTransactionProvider;
import org.jboss.arquillian.container.test.spi.RemoteLoadableExtension;
import org.jboss.arquillian.container.test.spi.client.deployment.AuxiliaryArchiveAppender;
import org.jboss.shrinkwrap.api.Archive;
@@ -30,9 +29,15 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive;
public class RemoteTomEEEJBEnricherArchiveAppender implements AuxiliaryArchiveAppender {
@Override
public Archive<?> createAuxiliaryArchive() {
- return ShrinkWrap.create(JavaArchive.class, "arquillian-tomee-archive-appender.jar")
- .addClasses(RemoteTomEEObserver.class, RemoteTomEERemoteExtension.class, OpenEJBTransactionProvider.class)
+ final JavaArchive javaArchive = ShrinkWrap.create(JavaArchive.class, "arquillian-tomee-archive-appender.jar")
+ .addClasses(RemoteTomEEObserver.class, RemoteTomEERemoteExtension.class)
.addClasses(OpenEJBEnricher.class, TomEEInjectionEnricher.class, MockitoEnricher.class)
.addAsServiceProvider(RemoteLoadableExtension.class, RemoteTomEERemoteExtension.class);
+ try {
+ javaArchive.addClass(Thread.currentThread().getContextClassLoader().loadClass("org.apache.openejb.arquillian.transaction.OpenEJBTransactionProvider"));
+ } catch (final Throwable t) {
+ // skip, not mandatory
+ }
+ return javaArchive;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/6e86a658/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEERemoteExtension.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEERemoteExtension.java b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEERemoteExtension.java
index cb1184f..b262303 100644
--- a/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEERemoteExtension.java
+++ b/arquillian/arquillian-tomee-remote/src/main/java/org/apache/tomee/arquillian/remote/RemoteTomEERemoteExtension.java
@@ -18,7 +18,6 @@
package org.apache.tomee.arquillian.remote;
import org.apache.openejb.arquillian.common.TomEEInjectionEnricher;
-import org.apache.openejb.arquillian.transaction.OpenEJBTransactionProvider;
import org.jboss.arquillian.container.test.spi.RemoteLoadableExtension;
import org.jboss.arquillian.test.spi.TestEnricher;
import org.jboss.arquillian.transaction.spi.provider.TransactionProvider;
@@ -28,7 +27,14 @@ public class RemoteTomEERemoteExtension implements RemoteLoadableExtension {
@Override
public void register(final ExtensionBuilder builder) {
builder.observer(RemoteTomEEObserver.class)
- .service(TestEnricher.class, TomEEInjectionEnricher.class)
- .service(TransactionProvider.class, OpenEJBTransactionProvider.class);
+ .service(TestEnricher.class, TomEEInjectionEnricher.class);
+
+ try {
+ builder.service(TransactionProvider.class,
+ (Class<? extends TransactionProvider>) Thread.currentThread().getContextClassLoader()
+ .loadClass("org.apache.openejb.arquillian.transaction.OpenEJBTransactionProvider"));
+ } catch (final Throwable t) {
+ // skip, not mandatory
+ }
}
}
[2/2] tomee git commit: optional OpenEJBTransactionProvider for tomee
embedded as well
Posted by rm...@apache.org.
optional OpenEJBTransactionProvider for tomee embedded as well
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/439d80e6
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/439d80e6
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/439d80e6
Branch: refs/heads/master
Commit: 439d80e66d423b5b6f497fe66d30650c589edae4
Parents: 6e86a65
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Sat Mar 26 18:51:58 2016 +0100
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Sat Mar 26 18:51:58 2016 +0100
----------------------------------------------------------------------
.../arquillian/embedded/EmbeddedTomEEExtension.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/439d80e6/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java b/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
index 90cc7f9..d36008d 100644
--- a/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
+++ b/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
@@ -23,7 +23,6 @@ import org.apache.openejb.arquillian.common.TestObserver;
import org.apache.openejb.arquillian.common.TomEEInjectionEnricher;
import org.apache.openejb.arquillian.common.deployment.DeploymentExceptionObserver;
import org.apache.openejb.arquillian.common.deployment.DeploymentExceptionProvider;
-import org.apache.openejb.arquillian.transaction.OpenEJBTransactionProvider;
import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
import org.jboss.arquillian.core.spi.LoadableExtension;
import org.jboss.arquillian.test.spi.TestEnricher;
@@ -41,8 +40,15 @@ public class EmbeddedTomEEExtension implements LoadableExtension {
.observer(RemoteInitialContextObserver.class)
.observer(TestObserver.class)
.service(TestEnricher.class, TomEEInjectionEnricher.class)
- .service(TransactionProvider.class, OpenEJBTransactionProvider.class)
.service(ResourceProvider.class, DeploymentExceptionProvider.class);
+
+ try {
+ builder.service(TransactionProvider.class,
+ (Class<? extends TransactionProvider>) Thread.currentThread().getContextClassLoader()
+ .loadClass("org.apache.openejb.arquillian.transaction.OpenEJBTransactionProvider"));
+ } catch (final Throwable t) {
+ // skip, not mandatory
+ }
}
}
}