Author: rmannibucau
Date: Thu Nov 1 18:46:02 2012
New Revision: 1404720
URL: http://svn.apache.org/viewvc?rev=1404720&view=rev
Log:
TOMEE-511 TOMEE-512 TOMEE-513 arquillian/shrinwrap version updates
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ExceptionInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-openejb-transaction-provider/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/exception/DeploymentExceptionErrorTest.java
openejb/trunk/openejb/arquillian/pom.xml
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java?rev=1404720&r1=1404719&r2=1404720&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
Thu Nov 1 18:46:02 2012
@@ -26,7 +26,6 @@ import org.jboss.arquillian.container.sp
import org.jboss.arquillian.core.spi.LoadableExtension;
import org.jboss.arquillian.test.spi.TestEnricher;
import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider;
-import
org.jboss.arquillian.transaction.impl.container.TransactionRemoteExtension;
import org.jboss.arquillian.transaction.spi.provider.TransactionProvider;
import java.util.Enumeration;
@@ -71,9 +70,6 @@ public class OpenEJBExtension implements
.service(TransactionProvider.class,
OpenEJBTransactionProvider.class)
.observer(TestObserver.class)
.observer(DeploymentExceptionObserver.class);
-
- // small hack since this extension can't be loaded in embedded
mode by default
- new TransactionRemoteExtension().register(extensionBuilder);
}
}
}
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ExceptionInjectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ExceptionInjectionTest.java?rev=1404720&r1=1404719&r2=1404720&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ExceptionInjectionTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/ExceptionInjectionTest.java
Thu Nov 1 18:46:02 2012
@@ -50,8 +50,8 @@ public class ExceptionInjectionTest {
public static WebArchive war() {
return ShrinkWrap.create(WebArchive.class)
.addAsWebInfResource(new
StringAsset(Descriptors.create(BeansDescriptor.class)
- .createInterceptors()
- .clazz("i.dont.exist.so.i.ll.make.the.deployment.fail")
+ .getOrCreateInterceptors()
+
.clazz("i.dont.exist.so.i.ll.make.the.deployment.fail")
.up()
.exportAsString()), ArchivePaths.create("beans.xml"));
}
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-transaction-provider/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-transaction-provider/pom.xml?rev=1404720&r1=1404719&r2=1404720&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-openejb-transaction-provider/pom.xml
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-openejb-transaction-provider/pom.xml
Thu Nov 1 18:46:02 2012
@@ -39,7 +39,8 @@
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-transaction-impl-base</artifactId>
- <version>1.0.0.Alpha1</version>
+ <version>1.0.0.Alpha2</version>
</dependency>
</dependencies>
</project>
+
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java?rev=1404720&r1=1404719&r2=1404720&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/main/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEExtension.java
Thu Nov 1 18:46:02 2012
@@ -26,8 +26,6 @@ import org.jboss.arquillian.container.sp
import org.jboss.arquillian.core.spi.LoadableExtension;
import org.jboss.arquillian.test.spi.TestEnricher;
import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider;
-import org.jboss.arquillian.transaction.impl.client.TransactionExtension;
-import
org.jboss.arquillian.transaction.impl.container.TransactionRemoteExtension;
import org.jboss.arquillian.transaction.spi.provider.TransactionProvider;
public class EmbeddedTomEEExtension implements LoadableExtension {
@@ -41,8 +39,6 @@ public class EmbeddedTomEEExtension impl
.service(TestEnricher.class, TomEEInjectionEnricher.class)
.service(TransactionProvider.class,
OpenEJBTransactionProvider.class)
.service(ResourceProvider.class,
DeploymentExceptionProvider.class);
-
- new TransactionRemoteExtension().register(builder);
}
}
}
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/exception/DeploymentExceptionErrorTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/exception/DeploymentExceptionErrorTest.java?rev=1404720&r1=1404719&r2=1404720&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/exception/DeploymentExceptionErrorTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/exception/DeploymentExceptionErrorTest.java
Thu Nov 1 18:46:02 2012
@@ -46,7 +46,7 @@ public class DeploymentExceptionErrorTes
public static WebArchive war() {
return ShrinkWrap.create(WebArchive.class)
.addAsWebInfResource(new
StringAsset(Descriptors.create(BeansDescriptor.class)
- .createInterceptors()
+ .getOrCreateInterceptors()
.clazz("i.dont.exist.so.i.ll.make.the.deployment.fail")
.up()
.exportAsString()),
ArchivePaths.create("beans.xml"));
Modified: openejb/trunk/openejb/arquillian/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/pom.xml?rev=1404720&r1=1404719&r2=1404720&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/pom.xml Thu Nov 1 18:46:02 2012
@@ -32,8 +32,8 @@
<name>OpenEJB :: Arquillian Adaptors Parent</name>
<properties>
- <version.arquillian>1.0.2.Final</version.arquillian>
-
<version.shrinkwrap.descriptor>2.0.0-alpha-3</version.shrinkwrap.descriptor>
+ <version.arquillian>1.0.3.Final</version.arquillian>
+
<version.shrinkwrap.descriptor>2.0.0-alpha-4</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.0.1</version.shrinkwrap.shrinkwrap>
</properties>
