[jboss-svn-commits] JBoss Common SVN: r4316 - in arquillian/trunk: containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish and 24 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Apr 21 19:13:48 EDT 2010
Author: ALRubinger
Date: 2010-04-21 19:13:45 -0400 (Wed, 21 Apr 2010)
New Revision: 4316
Modified:
arquillian/trunk/build/pom.xml
arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/GlassFishDeploymentAppender.java
arquillian/trunk/containers/jbossas-remote-51/src/main/java/org/jboss/arquillian/jboss/JbossDeploymentAppender.java
arquillian/trunk/containers/jbossas-remote-60/src/main/java/org/jboss/arquillian/jboss/JbossDeploymentAppender.java
arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/OpenEJBIntegrationTestCase.java
arquillian/trunk/containers/reloaded/src/test/java/org/jboss/arquillian/container/reloaded/ReloadedIntegrationTestCase.java
arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/InjectionTestCase.java
arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java
arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/random/RandomTestCase.java
arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/InjectionTestCase.java
arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java
arquillian/trunk/examples/junit/src/test/java/com/acme/jms/InjectionTestCase.java
arquillian/trunk/examples/junit/src/test/java/com/acme/resource/InjectionTestCase.java
arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/InjectionTestCase.java
arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java
arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java
arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/InjectionTestCase.java
arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java
arquillian/trunk/examples/testng/src/test/java/com/acme/jms/InjectionTestCase.java
arquillian/trunk/examples/testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java
arquillian/trunk/examples/testng/src/test/java/com/acme/resource/InjectionTestCase.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ArquillianDeploymentAppender.java
arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/DeploymentAnnotationArchiveGeneratorTestCase.java
arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ArchiveGeneratorTestCase.java
arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ContainerDeployerTestCase.java
arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ContainerUndeployerTestCase.java
arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitDeploymentAppender.java
arquillian/trunk/packagers/javaee/src/main/java/org/jboss/arquillian/packager/javaee/EEDeploymentPackager.java
arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java
arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java
Log:
[ARQ-112] Update Arquillian dependency on ShrinkWrap to 1.0.0-alpha-9
Modified: arquillian/trunk/build/pom.xml
===================================================================
--- arquillian/trunk/build/pom.xml 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/build/pom.xml 2010-04-21 23:13:45 UTC (rev 4316)
@@ -29,7 +29,7 @@
<!-- Versioning -->
<version.junit_junit>4.6</version.junit_junit>
<version.testng_testng>5.10</version.testng_testng>
- <version.shrinkwrap_shrinkwrap>1.0.0-alpha-7</version.shrinkwrap_shrinkwrap>
+ <version.shrinkwrap_shrinkwrap>1.0.0-alpha-9</version.shrinkwrap_shrinkwrap>
<version.jboss_embedded>1.0.0-alpha-1</version.jboss_embedded>
<version.javaee_api>6.0</version.javaee_api>
<version.jetty_jetty>6.1.9</version.jetty_jetty>
Modified: arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/GlassFishDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/GlassFishDeploymentAppender.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/GlassFishDeploymentAppender.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -22,7 +22,7 @@
import org.jboss.arquillian.testenricher.ejb.EJBInjectionEnricher;
import org.jboss.arquillian.testenricher.resource.ResourceInjectionEnricher;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
/**
@@ -38,7 +38,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = Archives.create("arquillian-glassfish-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create("arquillian-glassfish-testenrichers.jar", JavaArchive.class)
.addPackages(
true,
EJBInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/jbossas-remote-51/src/main/java/org/jboss/arquillian/jboss/JbossDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jbossas-remote-51/src/main/java/org/jboss/arquillian/jboss/JbossDeploymentAppender.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/containers/jbossas-remote-51/src/main/java/org/jboss/arquillian/jboss/JbossDeploymentAppender.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -21,7 +21,7 @@
import org.jboss.arquillian.testenricher.ejb.EJBInjectionEnricher;
import org.jboss.arquillian.testenricher.resource.ResourceInjectionEnricher;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
/**
@@ -38,7 +38,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = Archives.create("arquillian-jboss-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create("arquillian-jboss-testenrichers.jar", JavaArchive.class)
.addPackages(
true,
EJBInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/jbossas-remote-60/src/main/java/org/jboss/arquillian/jboss/JbossDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jbossas-remote-60/src/main/java/org/jboss/arquillian/jboss/JbossDeploymentAppender.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/containers/jbossas-remote-60/src/main/java/org/jboss/arquillian/jboss/JbossDeploymentAppender.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -22,7 +22,7 @@
import org.jboss.arquillian.testenricher.ejb.EJBInjectionEnricher;
import org.jboss.arquillian.testenricher.resource.ResourceInjectionEnricher;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
/**
@@ -39,7 +39,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = Archives.create("arquillian-jboss-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create("arquillian-jboss-testenrichers.jar", JavaArchive.class)
.addPackages(
true,
EJBInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/OpenEJBIntegrationTestCase.java
===================================================================
--- arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/OpenEJBIntegrationTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/containers/openejb/src/test/java/org/jboss/arquillian/openejb/OpenEJBIntegrationTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -24,7 +24,7 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.openejb.ejb.EchoBean;
import org.jboss.arquillian.openejb.ejb.EchoLocalBusiness;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
import org.junit.Test;
@@ -60,7 +60,7 @@
@Deployment
public static JavaArchive createDeployment()
{
- return Archives.create("slsb.jar", JavaArchive.class).addClasses(EchoLocalBusiness.class, EchoBean.class);
+ return ShrinkWrap.create("slsb.jar", JavaArchive.class).addClasses(EchoLocalBusiness.class, EchoBean.class);
}
/**
Modified: arquillian/trunk/containers/reloaded/src/test/java/org/jboss/arquillian/container/reloaded/ReloadedIntegrationTestCase.java
===================================================================
--- arquillian/trunk/containers/reloaded/src/test/java/org/jboss/arquillian/container/reloaded/ReloadedIntegrationTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/containers/reloaded/src/test/java/org/jboss/arquillian/container/reloaded/ReloadedIntegrationTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -25,8 +25,8 @@
import org.jboss.beans.metadata.api.annotations.Inject;
import org.jboss.bootstrap.api.mc.server.MCServer;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.Asset;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
import org.junit.Test;
@@ -70,7 +70,7 @@
+ LifecyclePojo.class.getName() + "\" /></deployment>").getBytes());
}
};
- final JavaArchive testJar = Archives.create("pojo.jar", JavaArchive.class).addClass(LifecyclePojo.class).add(
+ final JavaArchive testJar = ShrinkWrap.create("pojo.jar", JavaArchive.class).addClass(LifecyclePojo.class).add(
deploymentXmlAsset, ArchivePaths.create("pojo-jboss-beans.xml"));
log.info(testJar.toString(true));
return testJar;
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/InjectionTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/InjectionTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/InjectionTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -22,7 +22,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
@@ -43,7 +43,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addClasses(
GreetingManager.class,
GreetingManagerBean.class)
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -21,7 +21,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
import org.junit.Test;
@@ -38,7 +38,7 @@
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addPackage(
Synchronous.class.getPackage()
)
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/random/RandomTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/random/RandomTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/random/RandomTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -21,7 +21,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
@@ -39,7 +39,7 @@
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addPackage(
Random.class.getPackage()
)
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/InjectionTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/InjectionTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/InjectionTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -18,10 +18,9 @@
import javax.ejb.EJB;
-
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
import org.junit.Test;
@@ -38,7 +37,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addClasses(
GreetingManager.class,
GreetingManagerBean.class);
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -3,7 +3,7 @@
import javax.ejb.EJB;
import org.jboss.arquillian.api.Deployment;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
import org.junit.Test;
@@ -18,7 +18,7 @@
@Deployment
public static JavaArchive createTestArchive() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addClasses(TemperatureConverter.class, TemperatureConverterBean.class);
}
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/jms/InjectionTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/jms/InjectionTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/jms/InjectionTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -27,7 +27,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
import org.junit.Test;
@@ -47,7 +47,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addClasses(
MessageEcho.class,
QueueRequestor.class);
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/resource/InjectionTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/resource/InjectionTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/resource/InjectionTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -21,7 +21,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
import org.junit.Test;
@@ -38,7 +38,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class);
+ return ShrinkWrap.create("test.jar", JavaArchive.class);
}
@Resource(mappedName = "java:/Mail") Session mailSession;
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/InjectionTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/InjectionTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/InjectionTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -22,7 +22,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.testng.Assert;
@@ -42,7 +42,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addClasses(
GreetingManager.class,
GreetingManagerBean.class)
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -21,7 +21,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -36,7 +36,7 @@
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addPackage(
Synchronous.class.getPackage()
)
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -21,7 +21,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.testng.Assert;
@@ -31,7 +31,7 @@
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addPackage(
TranslateController.class.getPackage())
.addManifestResource(
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/InjectionTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/InjectionTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/InjectionTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -20,7 +20,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -36,7 +36,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addClasses(
GreetingManager.class,
GreetingManagerBean.class);
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -4,7 +4,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -17,7 +17,7 @@
@Deployment
public static JavaArchive createTestArchive() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addClasses(TemperatureConverter.class, TemperatureConverterBean.class);
}
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/jms/InjectionTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/jms/InjectionTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/jms/InjectionTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -27,7 +27,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -46,7 +46,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addClasses(
MessageEcho.class,
QueueRequestor.class);
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -23,7 +23,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -39,7 +39,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
.addPackage(
User.class.getPackage())
.addManifestResource(
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/resource/InjectionTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/resource/InjectionTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/resource/InjectionTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -21,7 +21,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -37,7 +37,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return Archives.create("test.jar", JavaArchive.class);
+ return ShrinkWrap.create("test.jar", JavaArchive.class);
}
@Resource(mappedName = "java:/Mail") Session mailSession;
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ArquillianDeploymentAppender.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ArquillianDeploymentAppender.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ArquillianDeploymentAppender.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -19,7 +19,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.spi.AuxiliaryArchiveAppender;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
/**
@@ -34,7 +34,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = Archives.create("arquillian-core.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create("arquillian-core.jar", JavaArchive.class)
.addPackages(
true,
//Package.getPackage("org.jboss.arquillian.api"), // TODO: figure out why this does not work..
Modified: arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/DeploymentAnnotationArchiveGeneratorTestCase.java
===================================================================
--- arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/DeploymentAnnotationArchiveGeneratorTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/DeploymentAnnotationArchiveGeneratorTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -18,7 +18,7 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
@@ -63,7 +63,7 @@
@SuppressWarnings("unused")
@Deployment
public Archive<?> test() {
- return Archives.create("test.jar", JavaArchive.class);
+ return ShrinkWrap.create("test.jar", JavaArchive.class);
}
}
@@ -72,7 +72,7 @@
@SuppressWarnings("unused")
@Deployment
public Object test() {
- return Archives.create("test.jar", JavaArchive.class);
+ return ShrinkWrap.create("test.jar", JavaArchive.class);
}
}
@@ -81,7 +81,7 @@
@SuppressWarnings("unused")
@Deployment
public static JavaArchive test() {
- return Archives.create("test.jar", JavaArchive.class);
+ return ShrinkWrap.create("test.jar", JavaArchive.class);
}
}
}
Modified: arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ArchiveGeneratorTestCase.java
===================================================================
--- arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ArchiveGeneratorTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ArchiveGeneratorTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -22,10 +22,9 @@
import org.jboss.arquillian.impl.context.ClassContext;
import org.jboss.arquillian.impl.context.SuiteContext;
import org.jboss.arquillian.impl.event.type.ClassEvent;
-import org.jboss.arquillian.impl.handler.ArchiveGenerator;
import org.jboss.arquillian.spi.ServiceLoader;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -61,7 +60,7 @@
@Test
public void shouldGenerateArchive() throws Exception
{
- final Archive<?> deployment = Archives.create("test.jar", JavaArchive.class);
+ final Archive<?> deployment = ShrinkWrap.create("test.jar", JavaArchive.class);
Mockito.when(generator.generate(getClass())).thenAnswer(new Answer<Archive<?>>()
{
Modified: arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ContainerDeployerTestCase.java
===================================================================
--- arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ContainerDeployerTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ContainerDeployerTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -21,12 +21,11 @@
import org.jboss.arquillian.impl.context.ClassContext;
import org.jboss.arquillian.impl.context.SuiteContext;
import org.jboss.arquillian.impl.event.type.ClassEvent;
-import org.jboss.arquillian.impl.handler.ContainerDeployer;
import org.jboss.arquillian.spi.ContainerMethodExecutor;
import org.jboss.arquillian.spi.DeployableContainer;
import org.jboss.arquillian.spi.ServiceLoader;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -74,7 +73,7 @@
@Test
public void shouldExportContainerMethodExecutor() throws Exception
{
- Archive<?> deployment = Archives.create("test.jar", JavaArchive.class);
+ Archive<?> deployment = ShrinkWrap.create("test.jar", JavaArchive.class);
Mockito.when(container.deploy(deployment)).thenReturn(executor);
Modified: arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ContainerUndeployerTestCase.java
===================================================================
--- arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ContainerUndeployerTestCase.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/handler/ContainerUndeployerTestCase.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -19,11 +19,10 @@
import org.jboss.arquillian.impl.context.ClassContext;
import org.jboss.arquillian.impl.context.SuiteContext;
import org.jboss.arquillian.impl.event.type.ClassEvent;
-import org.jboss.arquillian.impl.handler.ContainerUndeployer;
import org.jboss.arquillian.spi.DeployableContainer;
import org.jboss.arquillian.spi.ServiceLoader;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -69,7 +68,7 @@
@Test
public void shouldUndeployArchive() throws Exception
{
- Archive<?> deployment = Archives.create("test.jar", JavaArchive.class);
+ Archive<?> deployment = ShrinkWrap.create("test.jar", JavaArchive.class);
ClassContext context = new ClassContext(new SuiteContext(serviceLoader));
context.add(DeployableContainer.class, container);
Modified: arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitDeploymentAppender.java
===================================================================
--- arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitDeploymentAppender.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/junit/src/main/java/org/jboss/arquillian/junit/JUnitDeploymentAppender.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -19,7 +19,7 @@
import org.jboss.arquillian.spi.AuxiliaryArchiveAppender;
import org.jboss.arquillian.spi.TestRunner;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
/**
@@ -35,7 +35,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = Archives.create("arquillian-junit.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create("arquillian-junit.jar", JavaArchive.class)
.addPackages(
true,
Package.getPackage("org.junit"),
Modified: arquillian/trunk/packagers/javaee/src/main/java/org/jboss/arquillian/packager/javaee/EEDeploymentPackager.java
===================================================================
--- arquillian/trunk/packagers/javaee/src/main/java/org/jboss/arquillian/packager/javaee/EEDeploymentPackager.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/packagers/javaee/src/main/java/org/jboss/arquillian/packager/javaee/EEDeploymentPackager.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -20,7 +20,7 @@
import org.jboss.arquillian.spi.DeploymentPackager;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -35,7 +35,7 @@
public Archive<?> generateDeployment(Archive<?> applicationArchive, Collection<Archive<?>> auxiliaryArchives)
{
- EnterpriseArchive fullDeployment = Archives.create("test.ear", EnterpriseArchive.class)
+ EnterpriseArchive fullDeployment = ShrinkWrap.create("test.ear", EnterpriseArchive.class)
.addModule(applicationArchive);
for (Archive<?> moduleArchive : auxiliaryArchives)
Modified: arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java
===================================================================
--- arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -18,7 +18,7 @@
import org.jboss.arquillian.spi.AuxiliaryArchiveAppender;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.WebArchive;
/**
@@ -35,7 +35,7 @@
public Archive<?> createAuxiliaryArchive()
{
- WebArchive archive = Archives.create("arquillian-protocol.war", WebArchive.class)
+ WebArchive archive = ShrinkWrap.create("arquillian-protocol.war", WebArchive.class)
.setWebXML("org/jboss/arquillian/protocol/servlet/web.xml")
.addClasses(
SecurityActions.class,
Modified: arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java
===================================================================
--- arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java 2010-04-21 22:48:11 UTC (rev 4315)
+++ arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java 2010-04-21 23:13:45 UTC (rev 4316)
@@ -19,7 +19,7 @@
import org.jboss.arquillian.spi.AuxiliaryArchiveAppender;
import org.jboss.arquillian.spi.TestRunner;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.testng.TestNG;
import org.testng.annotations.Test;
@@ -46,7 +46,7 @@
public Archive<?> createAuxiliaryArchive()
{
- return Archives.create("arquillian-testng.jar", JavaArchive.class)
+ return ShrinkWrap.create("arquillian-testng.jar", JavaArchive.class)
.addPackages(
true,
Test.class.getPackage(),
More information about the jboss-svn-commits
mailing list