[jboss-svn-commits] JBoss Common SVN: r4691 - in arquillian/trunk: containers/glassfish-embedded-3/src/main/java/org/jboss/arquillian/container/glassfish/embedded_3 and 53 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 8 04:31:01 EDT 2010
Author: aslak
Date: 2010-07-08 04:30:53 -0400 (Thu, 08 Jul 2010)
New Revision: 4691
Removed:
arquillian/trunk/containers/jbossas-remote-5/src/main/java/org/jboss/arquillian/jbossas/
Modified:
arquillian/trunk/build/pom.xml
arquillian/trunk/containers/glassfish-embedded-3/src/main/java/org/jboss/arquillian/container/glassfish/embedded_3/GlassFishDeploymentAppender.java
arquillian/trunk/containers/glassfish-embedded-3/src/test/java/org/jboss/arquillian/container/glassfish/embedded_3/GlassFishEmbeddedContainerTestCase.java
arquillian/trunk/containers/glassfish-remote-3/src/test/java/org/jboss/arquillian/container/glassfish/remote_3/GlassFishJSR88RemoteContainerEARTestCase.java
arquillian/trunk/containers/glassfish-remote-3/src/test/java/org/jboss/arquillian/container/glassfish/remote_3/GlassFishJSR88RemoteContainerWARTestCase.java
arquillian/trunk/containers/jbossas-embedded-6/src/main/java/org/jboss/arquillian/container/jbossas/embedded_6/JBossASDeploymentAppender.java
arquillian/trunk/containers/jbossas-embedded-6/src/test/java/org/jboss/arquillian/container/jbossas/embedded_6/JBossASEmbeddedIntegrationTestCase.java
arquillian/trunk/containers/jbossas-managed-5.1/src/main/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASDeploymentAppender.java
arquillian/trunk/containers/jbossas-managed-6/src/main/java/org/jboss/arquillian/container/jbossas/managed_6/JBossASDeploymentAppender.java
arquillian/trunk/containers/jbossas-remote-5.1/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_1/JBossASDeploymentAppender.java
arquillian/trunk/containers/jbossas-remote-5/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_0/JBossASDeploymentAppender.java
arquillian/trunk/containers/jbossas-remote-6/src/main/java/org/jboss/arquillian/container/jbossas/remote_6/JBossASDeploymentAppender.java
arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/CompositeConfiguration.java
arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedDeploymentAppender.java
arquillian/trunk/containers/jetty-embedded-6.1/src/test/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedClientTestCase.java
arquillian/trunk/containers/jetty-embedded-6.1/src/test/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedInContainerTestCase.java
arquillian/trunk/containers/jsr88-remote-1.2/src/main/java/org/jboss/arquillian/container/jsr88/remote_1_2/EE5DeploymentAppender.java
arquillian/trunk/containers/jsr88-remote-1.2/src/main/java/org/jboss/arquillian/container/jsr88/remote_1_2/EE6DeploymentAppender.java
arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88ModuleTypeMapperTestCase.java
arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainerEARTestCase.java
arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainerWARTestCase.java
arquillian/trunk/containers/openejb-embedded-3.1/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBIntegrationTestCase.java
arquillian/trunk/containers/openejb-embedded-3.1/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBArquillianContextTestCase.java
arquillian/trunk/containers/openejb-embedded-3.1/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBAuthenticatedJndiContextTestCase.java
arquillian/trunk/containers/openwebbeans-embedded-1/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/ShrinkWrapMetaDataDiscovery.java
arquillian/trunk/containers/openwebbeans-embedded-1/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansIntegrationTestCase.java
arquillian/trunk/containers/osgi-embedded-4.2/src/test/java/org/jboss/arquillian/container/osgi/embedded_4_2/OSGiEmbeddedFrameworkTestCase.java
arquillian/trunk/containers/reloaded-embedded-1/src/test/java/org/jboss/arquillian/container/reloaded/embedded_1/ReloadedIntegrationTestCase.java
arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedDeploymentAppender.java
arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedClientTestCase.java
arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedInContainerTestCase.java
arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationConversationScopeTestCase.java
arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationEARTestCase.java
arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationJARTestCase.java
arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationSessionScopeTestCase.java
arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationWARTestCase.java
arquillian/trunk/containers/weld-se-embedded-1/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
arquillian/trunk/containers/weld-se-embedded-1/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldEmbeddedIntegrationTestCase.java
arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/InjectionTestCase.java
arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/conversation/ConversationScopeTestCase.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/ejb31/NoInterfaceEJBTestCase.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/junit/src/test/java/com/acme/web/LocalRunServletTestCase.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/random/RandomTestCase.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/extensions/performance/src/test/java/org/jboss/arquillian/performance/cdi/WorkHardCdiTestCase.java
arquillian/trunk/frameworks/jsfunit/src/main/java/org/jboss/arquillian/framework/jsfunit/JSFUnitArchiveAppender.java
arquillian/trunk/frameworks/jsfunit/src/test/java/org/jboss/arquillian/framework/jsfunit/JSFUnitTestCase.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ArquillianDeploymentAppender.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ToolingDeploymentFormatter.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/ToolingDeploymentFormatterTestCase.java
arquillian/trunk/protocols/servlet-ee5/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java
arquillian/trunk/protocols/servlet-ee5/src/main/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackager.java
arquillian/trunk/protocols/servlet-ee5/src/test/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackagerTestCase.java
arquillian/trunk/protocols/servlet-ee6/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java
arquillian/trunk/protocols/servlet-ee6/src/main/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackager.java
arquillian/trunk/protocols/servlet-ee6/src/test/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackagerTestCase.java
arquillian/trunk/tests/deployment/src/test/java/org/jboss/weld/deployments/DeploymentTest.java
Log:
ARQ-206 Updated to ShrinkWrap Alpha-10.
- *Asset changed package to api.asset.X
- ShrinkWrap.create swapped argument order
Modified: arquillian/trunk/build/pom.xml
===================================================================
--- arquillian/trunk/build/pom.xml 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/build/pom.xml 2010-07-08 08:30:53 UTC (rev 4691)
@@ -35,7 +35,7 @@
<version.junit_junit>4.6</version.junit_junit>
<version.mockito_all>1.8.3</version.mockito_all>
<version.osgi>4.2.0</version.osgi>
- <version.shrinkwrap_shrinkwrap>1.0.0-alpha-9</version.shrinkwrap_shrinkwrap>
+ <version.shrinkwrap_shrinkwrap>1.0.0-alpha-10</version.shrinkwrap_shrinkwrap>
<version.testng_testng>5.12.1</version.testng_testng>
</properties>
Modified: arquillian/trunk/containers/glassfish-embedded-3/src/main/java/org/jboss/arquillian/container/glassfish/embedded_3/GlassFishDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-3/src/main/java/org/jboss/arquillian/container/glassfish/embedded_3/GlassFishDeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/glassfish-embedded-3/src/main/java/org/jboss/arquillian/container/glassfish/embedded_3/GlassFishDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -38,7 +38,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-glassfish-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-glassfish-testenrichers.jar")
.addPackages(
true,
EJBInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/glassfish-embedded-3/src/test/java/org/jboss/arquillian/container/glassfish/embedded_3/GlassFishEmbeddedContainerTestCase.java
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-3/src/test/java/org/jboss/arquillian/container/glassfish/embedded_3/GlassFishEmbeddedContainerTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/glassfish-embedded-3/src/test/java/org/jboss/arquillian/container/glassfish/embedded_3/GlassFishEmbeddedContainerTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -54,7 +54,7 @@
@Deployment
public static WebArchive getDeployment()
{
- final WebArchive war = ShrinkWrap.create("test.war", WebArchive.class).addClass(TestServlet.class);
+ final WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war").addClass(TestServlet.class);
log.info(war.toString(true));
return war;
}
Modified: arquillian/trunk/containers/glassfish-remote-3/src/test/java/org/jboss/arquillian/container/glassfish/remote_3/GlassFishJSR88RemoteContainerEARTestCase.java
===================================================================
--- arquillian/trunk/containers/glassfish-remote-3/src/test/java/org/jboss/arquillian/container/glassfish/remote_3/GlassFishJSR88RemoteContainerEARTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/glassfish-remote-3/src/test/java/org/jboss/arquillian/container/glassfish/remote_3/GlassFishJSR88RemoteContainerEARTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -62,11 +62,11 @@
public static Archive<?> getTestArchive()
{
ArchivePath root = ArchivePaths.create("/");
- final WebArchive war = ShrinkWrap.create("test.war", WebArchive.class)
+ final WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(GreeterServlet.class);
- final JavaArchive ejb = ShrinkWrap.create("test.jar", JavaArchive.class)
+ final JavaArchive ejb = ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClass(Greeter.class);
- final EnterpriseArchive ear = ShrinkWrap.create("test.ear", EnterpriseArchive.class)
+ final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "test.ear")
.setApplicationXML("application.xml")
.add(war, root)
.add(ejb, root);
Modified: arquillian/trunk/containers/glassfish-remote-3/src/test/java/org/jboss/arquillian/container/glassfish/remote_3/GlassFishJSR88RemoteContainerWARTestCase.java
===================================================================
--- arquillian/trunk/containers/glassfish-remote-3/src/test/java/org/jboss/arquillian/container/glassfish/remote_3/GlassFishJSR88RemoteContainerWARTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/glassfish-remote-3/src/test/java/org/jboss/arquillian/container/glassfish/remote_3/GlassFishJSR88RemoteContainerWARTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -57,7 +57,7 @@
@Deployment
public static Archive<?> getTestArchive()
{
- final WebArchive war = ShrinkWrap.create("test.war", WebArchive.class)
+ final WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(GreeterServlet.class, Greeter.class);
log.info(war.toString(true));
return war;
Modified: arquillian/trunk/containers/jbossas-embedded-6/src/main/java/org/jboss/arquillian/container/jbossas/embedded_6/JBossASDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jbossas-embedded-6/src/main/java/org/jboss/arquillian/container/jbossas/embedded_6/JBossASDeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jbossas-embedded-6/src/main/java/org/jboss/arquillian/container/jbossas/embedded_6/JBossASDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -42,7 +42,7 @@
*/
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-jboss-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-jboss-testenrichers.jar")
.addPackages(
true,
EJBInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/jbossas-embedded-6/src/test/java/org/jboss/arquillian/container/jbossas/embedded_6/JBossASEmbeddedIntegrationTestCase.java
===================================================================
--- arquillian/trunk/containers/jbossas-embedded-6/src/test/java/org/jboss/arquillian/container/jbossas/embedded_6/JBossASEmbeddedIntegrationTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jbossas-embedded-6/src/test/java/org/jboss/arquillian/container/jbossas/embedded_6/JBossASEmbeddedIntegrationTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -40,7 +40,7 @@
@Deployment
public static JavaArchive createDeployment() throws Exception
{
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClasses(
JBossASEmbeddedIntegrationTestCase.class,
MyEjb.class);
Modified: arquillian/trunk/containers/jbossas-managed-5.1/src/main/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jbossas-managed-5.1/src/main/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASDeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jbossas-managed-5.1/src/main/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -38,7 +38,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-jboss-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-jboss-testenrichers.jar")
.addPackages(
true,
EJBInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/jbossas-managed-6/src/main/java/org/jboss/arquillian/container/jbossas/managed_6/JBossASDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jbossas-managed-6/src/main/java/org/jboss/arquillian/container/jbossas/managed_6/JBossASDeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jbossas-managed-6/src/main/java/org/jboss/arquillian/container/jbossas/managed_6/JBossASDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -39,7 +39,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-jboss-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-jboss-testenrichers.jar")
.addPackages(
true,
EJBInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/jbossas-remote-5/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_0/JBossASDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jbossas-remote-5/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_0/JBossASDeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jbossas-remote-5/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_0/JBossASDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -38,7 +38,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-jboss-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-jboss-testenrichers.jar")
.addPackages(
true,
EJBInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/jbossas-remote-5.1/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_1/JBossASDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jbossas-remote-5.1/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_1/JBossASDeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jbossas-remote-5.1/src/main/java/org/jboss/arquillian/container/jbossas/remote_5_1/JBossASDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -38,7 +38,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-jboss-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-jboss-testenrichers.jar")
.addPackages(
true,
EJBInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/jbossas-remote-6/src/main/java/org/jboss/arquillian/container/jbossas/remote_6/JBossASDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jbossas-remote-6/src/main/java/org/jboss/arquillian/container/jbossas/remote_6/JBossASDeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jbossas-remote-6/src/main/java/org/jboss/arquillian/container/jbossas/remote_6/JBossASDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -39,7 +39,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-jboss-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-jboss-testenrichers.jar")
.addPackages(
true,
EJBInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/CompositeConfiguration.java
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/CompositeConfiguration.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/CompositeConfiguration.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -17,6 +17,8 @@
*/
public class CompositeConfiguration extends Configuration
{
+ private static final long serialVersionUID = 1L;
+
@Override
public void configureWebApp() throws Exception
{
Modified: arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedDeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jetty-embedded-6.1/src/main/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -36,7 +36,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-jetty-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-jetty-testenrichers.jar")
.addPackages(
false,
CDIInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/jetty-embedded-6.1/src/test/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedClientTestCase.java
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6.1/src/test/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedClientTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jetty-embedded-6.1/src/test/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedClientTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -51,7 +51,7 @@
@Deployment
public static WebArchive getTestArchive()
{
- final WebArchive war = ShrinkWrap.create("client-test.war", WebArchive.class)
+ final WebArchive war = ShrinkWrap.create(WebArchive.class, "client-test.war")
.addClass(TestServlet.class)
.setWebXML("client-web.xml");
log.info(war.toString(true));
Modified: arquillian/trunk/containers/jetty-embedded-6.1/src/test/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedInContainerTestCase.java
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6.1/src/test/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedInContainerTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jetty-embedded-6.1/src/test/java/org/jboss/arquillian/container/jetty/embedded_6_1/JettyEmbeddedInContainerTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -18,6 +18,7 @@
import java.sql.Connection;
import java.util.logging.Logger;
+
import javax.annotation.Resource;
import javax.inject.Inject;
import javax.sql.DataSource;
@@ -25,8 +26,8 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -48,7 +49,7 @@
@Deployment
public static WebArchive getTestArchive()
{
- final WebArchive war = ShrinkWrap.create("in-container-test.war", WebArchive.class)
+ final WebArchive war = ShrinkWrap.create(WebArchive.class, "in-container-test.war")
.addClass(TestBean.class)
// adding the configuration class silences the logged exception when building the configuration on the server-side, but shouldn't be necessary
//.addClass(JettyEmbeddedConfiguration.class)
Modified: arquillian/trunk/containers/jsr88-remote-1.2/src/main/java/org/jboss/arquillian/container/jsr88/remote_1_2/EE5DeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jsr88-remote-1.2/src/main/java/org/jboss/arquillian/container/jsr88/remote_1_2/EE5DeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jsr88-remote-1.2/src/main/java/org/jboss/arquillian/container/jsr88/remote_1_2/EE5DeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -35,7 +35,7 @@
{
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-ee5-container-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-ee5-container-testenrichers.jar")
.addPackages(
true,
EJBInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/jsr88-remote-1.2/src/main/java/org/jboss/arquillian/container/jsr88/remote_1_2/EE6DeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/jsr88-remote-1.2/src/main/java/org/jboss/arquillian/container/jsr88/remote_1_2/EE6DeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jsr88-remote-1.2/src/main/java/org/jboss/arquillian/container/jsr88/remote_1_2/EE6DeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -36,7 +36,7 @@
{
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-ee6-container-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-ee6-container-testenrichers.jar")
.addPackages(
true,
EJBInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88ModuleTypeMapperTestCase.java
===================================================================
--- arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88ModuleTypeMapperTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88ModuleTypeMapperTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -39,28 +39,28 @@
@Test
public void testWARModuleType()
{
- Archive<?> archive = ShrinkWrap.create("test.war", WebArchive.class);
+ Archive<?> archive = ShrinkWrap.create(WebArchive.class, "test.war");
assertSame(ModuleType.WAR, getMapper().getModuleType(archive));
}
@Test
public void testEARModuleType()
{
- Archive<?> archive = ShrinkWrap.create("test.ear", EnterpriseArchive.class);
+ Archive<?> archive = ShrinkWrap.create(EnterpriseArchive.class, "test.ear");
assertSame(ModuleType.EAR, getMapper().getModuleType(archive));
}
@Test
public void testEJBModuleType()
{
- Archive<?> archive = ShrinkWrap.create("test.jar", JavaArchive.class);
+ Archive<?> archive = ShrinkWrap.create(JavaArchive.class ,"test.jar");
assertSame(ModuleType.EJB, getMapper().getModuleType(archive));
}
@Test
public void testRARModuleType()
{
- Archive<?> archive = ShrinkWrap.create("test.rar", ResourceAdapterArchive.class);
+ Archive<?> archive = ShrinkWrap.create(ResourceAdapterArchive.class, "test.rar");
assertSame(ModuleType.RAR, getMapper().getModuleType(archive));
}
@@ -68,9 +68,9 @@
public void testSequentialUsage()
{
JSR88ModuleTypeMapper mapper = getMapper();
- Archive<?> rar = ShrinkWrap.create("test.rar", ResourceAdapterArchive.class);
+ Archive<?> rar = ShrinkWrap.create(ResourceAdapterArchive.class ,"test.rar");
assertSame(ModuleType.RAR, mapper.getModuleType(rar));
- Archive<?> war = ShrinkWrap.create("test.war", WebArchive.class);
+ Archive<?> war = ShrinkWrap.create(WebArchive.class ,"test.war");
assertSame(ModuleType.WAR, mapper.getModuleType(war));
}
Modified: arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainerEARTestCase.java
===================================================================
--- arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainerEARTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainerEARTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -63,11 +63,11 @@
public static Archive<?> getTestArchive()
{
ArchivePath root = ArchivePaths.create("/");
- final WebArchive war = ShrinkWrap.create("test.war", WebArchive.class)
+ final WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(GreeterServlet.class);
- final JavaArchive ejb = ShrinkWrap.create("test.jar", JavaArchive.class)
+ final JavaArchive ejb = ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClass(Greeter.class);
- final EnterpriseArchive ear = ShrinkWrap.create("test.ear", EnterpriseArchive.class)
+ final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "test.ear")
.setApplicationXML("application.xml")
.add(war, root)
.add(ejb, root);
Modified: arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainerWARTestCase.java
===================================================================
--- arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainerWARTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainerWARTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -58,7 +58,7 @@
@Deployment
public static Archive<?> getTestArchive()
{
- final WebArchive war = ShrinkWrap.create("test.war", WebArchive.class)
+ final WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(GreeterServlet.class, Greeter.class)
.setWebXML("web.xml");
log.info(war.toString(true));
Modified: arquillian/trunk/containers/openejb-embedded-3.1/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBIntegrationTestCase.java
===================================================================
--- arquillian/trunk/containers/openejb-embedded-3.1/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBIntegrationTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/openejb-embedded-3.1/src/test/java/org/jboss/arquillian/container/openejb/embedded_3_1/OpenEJBIntegrationTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -60,7 +60,7 @@
@Deployment
public static JavaArchive createDeployment()
{
- return ShrinkWrap.create("slsb.jar", JavaArchive.class).addClasses(EchoLocalBusiness.class, EchoBean.class);
+ return ShrinkWrap.create(JavaArchive.class, "slsb.jar").addClasses(EchoLocalBusiness.class, EchoBean.class);
}
/**
Modified: arquillian/trunk/containers/openejb-embedded-3.1/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBArquillianContextTestCase.java
===================================================================
--- arquillian/trunk/containers/openejb-embedded-3.1/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBArquillianContextTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/openejb-embedded-3.1/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBArquillianContextTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -83,7 +83,7 @@
@Deployment
public static JavaArchive createDeployment()
{
- return ShrinkWrap.create("slsb.jar", JavaArchive.class).addClasses(EchoLocalBusiness.class, EchoBean.class);
+ return ShrinkWrap.create(JavaArchive.class, "slsb.jar").addClasses(EchoLocalBusiness.class, EchoBean.class);
}
/**
Modified: arquillian/trunk/containers/openejb-embedded-3.1/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBAuthenticatedJndiContextTestCase.java
===================================================================
--- arquillian/trunk/containers/openejb-embedded-3.1/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBAuthenticatedJndiContextTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/openejb-embedded-3.1/src/test/java/org/jboss/arquillian/prototyping/context/OpenEJBAuthenticatedJndiContextTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -81,7 +81,7 @@
@Deployment
public static JavaArchive createDeployment()
{
- return ShrinkWrap.create("slsb.jar", JavaArchive.class).addClasses(EchoLocalBusiness.class, EchoBean.class);
+ return ShrinkWrap.create(JavaArchive.class, "slsb.jar").addClasses(EchoLocalBusiness.class, EchoBean.class);
}
/**
Modified: arquillian/trunk/containers/openwebbeans-embedded-1/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/ShrinkWrapMetaDataDiscovery.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded-1/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/ShrinkWrapMetaDataDiscovery.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/openwebbeans-embedded-1/src/main/java/org/jboss/arquillian/container/openwebbeans/embedded_1/ShrinkWrapMetaDataDiscovery.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -26,7 +26,6 @@
import org.apache.webbeans.spi.deployer.AbstractMetaDataDiscovery;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.Filters;
import org.jboss.shrinkwrap.api.Node;
import org.jboss.shrinkwrap.impl.base.asset.ClassAsset;
Modified: arquillian/trunk/containers/openwebbeans-embedded-1/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansIntegrationTestCase.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded-1/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansIntegrationTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/openwebbeans-embedded-1/src/test/java/org/jboss/arquillian/container/openwebbeans/embedded_1/OpenWebBeansIntegrationTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -25,8 +25,8 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,7 +43,7 @@
@Deployment
public static JavaArchive createdeployment()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClasses(
OpenWebBeansIntegrationTestCase.class,
MyBean.class)
Modified: arquillian/trunk/containers/osgi-embedded-4.2/src/test/java/org/jboss/arquillian/container/osgi/embedded_4_2/OSGiEmbeddedFrameworkTestCase.java
===================================================================
--- arquillian/trunk/containers/osgi-embedded-4.2/src/test/java/org/jboss/arquillian/container/osgi/embedded_4_2/OSGiEmbeddedFrameworkTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/osgi-embedded-4.2/src/test/java/org/jboss/arquillian/container/osgi/embedded_4_2/OSGiEmbeddedFrameworkTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -17,6 +17,7 @@
package org.jboss.arquillian.container.osgi.embedded_4_2;
import static org.junit.Assert.assertEquals;
+
import static org.junit.Assert.assertNotNull;
import java.io.InputStream;
@@ -26,8 +27,8 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.osgi.testing.OSGiManifestBuilder;
-import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: arquillian/trunk/containers/reloaded-embedded-1/src/test/java/org/jboss/arquillian/container/reloaded/embedded_1/ReloadedIntegrationTestCase.java
===================================================================
--- arquillian/trunk/containers/reloaded-embedded-1/src/test/java/org/jboss/arquillian/container/reloaded/embedded_1/ReloadedIntegrationTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/reloaded-embedded-1/src/test/java/org/jboss/arquillian/container/reloaded/embedded_1/ReloadedIntegrationTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -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.Asset;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.Asset;
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 = ShrinkWrap.create("pojo.jar", JavaArchive.class).addClass(LifecyclePojo.class).add(
+ final JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "pojo.jar").addClass(LifecyclePojo.class).add(
deploymentXmlAsset, ArchivePaths.create("pojo-jboss-beans.xml"));
log.info(testJar.toString(true));
return testJar;
Modified: arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedDeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -36,7 +36,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-tomcat-testenrichers.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-tomcat-testenrichers.jar")
.addPackages(
false,
// CDIInjectionEnricher.class.getPackage(),
Modified: arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedClientTestCase.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedClientTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedClientTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -65,7 +65,7 @@
*/
@Deployment
public static WebArchive createDeployment() {
- return ShrinkWrap.create("test.war", WebArchive.class).addClasses(
+ return ShrinkWrap.create(WebArchive.class, "test.war").addClasses(
HelloWorldServlet.class).addWebResource(
HelloWorldServlet.class.getPackage(), "web.xml", "web.xml");
}
Modified: arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedInContainerTestCase.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedInContainerTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedInContainerTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -63,7 +63,7 @@
*/
@Deployment
public static WebArchive createTestArchive() {
- return ShrinkWrap.create("test.war", WebArchive.class)
+ return ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(HelloWorldServlet.class)
.addWebResource(HelloWorldServlet.class.getPackage(), "in-container-web.xml", "web.xml");
}
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/main/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -39,9 +39,9 @@
import org.jboss.arquillian.container.weld.ee.embedded_1_1.mock.MockEjbDescriptor;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.Filters;
import org.jboss.shrinkwrap.api.Node;
+import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.impl.base.AssignableBase;
import org.jboss.shrinkwrap.impl.base.Validate;
import org.jboss.shrinkwrap.impl.base.asset.ArchiveAsset;
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationConversationScopeTestCase.java
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationConversationScopeTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationConversationScopeTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -26,8 +26,8 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -45,7 +45,7 @@
@Deployment
public static JavaArchive createdeployment()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClasses(
WeldEmbeddedIntegrationConversationScopeTestCase.class,
TalkingChicken.class)
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationEARTestCase.java
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationEARTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationEARTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -25,9 +25,9 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,9 +43,9 @@
@Deployment
public static EnterpriseArchive createdeployment()
{
- return ShrinkWrap.create("test.ear", EnterpriseArchive.class)
+ return ShrinkWrap.create(EnterpriseArchive.class, "test.ear")
.addModule(
- ShrinkWrap.create("test.war", WebArchive.class)
+ ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(
WeldEmbeddedIntegrationWARTestCase.class,
MyBean.class)
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationJARTestCase.java
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationJARTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationJARTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -25,8 +25,8 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,7 +42,7 @@
@Deployment
public static JavaArchive createdeployment()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClasses(
WeldEmbeddedIntegrationJARTestCase.class,
MyBean.class)
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationSessionScopeTestCase.java
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationSessionScopeTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationSessionScopeTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -25,8 +25,8 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,7 +44,7 @@
@Deployment
public static JavaArchive createdeployment()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClasses(
WeldEmbeddedIntegrationSessionScopeTestCase.class,
Chicken.class)
Modified: arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationWARTestCase.java
===================================================================
--- arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationWARTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/weld-ee-embedded-1.1/src/test/java/org/jboss/arquillian/container/weld/ee/embedded_1_1/WeldEmbeddedIntegrationWARTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -25,8 +25,8 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,7 +42,7 @@
@Deployment
public static WebArchive createdeployment()
{
- return ShrinkWrap.create("test.war", WebArchive.class)
+ return ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(
WeldEmbeddedIntegrationWARTestCase.class,
MyBean.class)
Modified: arquillian/trunk/containers/weld-se-embedded-1/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java
===================================================================
--- arquillian/trunk/containers/weld-se-embedded-1/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/weld-se-embedded-1/src/main/java/org/jboss/arquillian/container/weld/se/embedded_1/shrinkwrap/ShrinkwrapBeanDeploymentArchiveImpl.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -30,9 +30,9 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.Filters;
import org.jboss.shrinkwrap.api.Node;
+import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.impl.base.AssignableBase;
import org.jboss.shrinkwrap.impl.base.Validate;
import org.jboss.shrinkwrap.impl.base.asset.ClassAsset;
Modified: arquillian/trunk/containers/weld-se-embedded-1/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldEmbeddedIntegrationTestCase.java
===================================================================
--- arquillian/trunk/containers/weld-se-embedded-1/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldEmbeddedIntegrationTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/containers/weld-se-embedded-1/src/test/java/org/jboss/arquillian/container/weld/se/embedded_1/WeldEmbeddedIntegrationTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -25,8 +25,8 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,7 +42,7 @@
@Deployment
public static JavaArchive createdeployment()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClasses(
WeldEmbeddedIntegrationTestCase.class,
MyBean.class)
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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/InjectionTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -23,8 +23,8 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,7 +43,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClasses(
GreetingManager.class,
GreetingManagerBean.class)
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/conversation/ConversationScopeTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/conversation/ConversationScopeTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/conversation/ConversationScopeTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -23,8 +23,8 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,7 +41,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClass(LongRunningBean.class)
.addManifestResource(
new ByteArrayAsset("<beans/>".getBytes()),
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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -37,7 +37,7 @@
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/cdi/random/RandomTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -22,8 +22,8 @@
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -39,7 +39,7 @@
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/InjectionTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -37,7 +37,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -18,7 +18,7 @@
@Deployment
public static JavaArchive createTestArchive() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClasses(TemperatureConverter.class, TemperatureConverterBean.class);
}
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/ejb31/NoInterfaceEJBTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/ejb31/NoInterfaceEJBTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/ejb31/NoInterfaceEJBTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -40,7 +40,7 @@
@Deployment
public static JavaArchive createDeployment()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClass(NoInterfaceEJB.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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/jms/InjectionTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -47,7 +47,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/resource/InjectionTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -38,7 +38,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class);
+ return ShrinkWrap.create(JavaArchive.class, "test.jar");
}
@Resource(mappedName = "java:/Mail") Session mailSession;
Modified: arquillian/trunk/examples/junit/src/test/java/com/acme/web/LocalRunServletTestCase.java
===================================================================
--- arquillian/trunk/examples/junit/src/test/java/com/acme/web/LocalRunServletTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/junit/src/test/java/com/acme/web/LocalRunServletTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -45,7 +45,7 @@
@Deployment
public static WebArchive createDeployment()
{
- return ShrinkWrap.create("test.war", WebArchive.class)
+ return ShrinkWrap.create(WebArchive.class, "test.war")
.addClass(TestServlet.class);
}
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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/InjectionTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -23,8 +23,8 @@
import org.jboss.arquillian.testng.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -42,7 +42,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -32,7 +32,7 @@
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addPackage(
Synchronous.class.getPackage()
)
Modified: arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/random/RandomTestCase.java
===================================================================
--- arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/random/RandomTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/random/RandomTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -18,13 +18,12 @@
import javax.inject.Inject;
-
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.testng.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -38,7 +37,7 @@
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addPackage(
Random.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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/cdi/translate/TranslateTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -22,8 +22,8 @@
import org.jboss.arquillian.testng.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -31,7 +31,7 @@
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/InjectionTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -36,7 +36,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/ejb/TemperatureConverterTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -17,7 +17,7 @@
@Deployment
public static JavaArchive createTestArchive() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/jms/InjectionTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -46,7 +46,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/jpa/UserRepositoryTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -39,7 +39,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "test.jar")
.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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/examples/testng/src/test/java/com/acme/resource/InjectionTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -37,7 +37,7 @@
{
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class);
+ return ShrinkWrap.create(JavaArchive.class, "test.jar");
}
@Resource(mappedName = "java:/Mail") Session mailSession;
Modified: arquillian/trunk/extensions/performance/src/test/java/org/jboss/arquillian/performance/cdi/WorkHardCdiTestCase.java
===================================================================
--- arquillian/trunk/extensions/performance/src/test/java/org/jboss/arquillian/performance/cdi/WorkHardCdiTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/extensions/performance/src/test/java/org/jboss/arquillian/performance/cdi/WorkHardCdiTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -4,12 +4,12 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.performance.annotation.Performance;
import org.jboss.arquillian.performance.annotation.PerformanceTest;
-import org.jboss.arquillian.performance.annotation.Performance;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -21,7 +21,7 @@
@Deployment
public static JavaArchive createDeployment() {
- return ShrinkWrap.create("test.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class ,"test.jar")
.addPackage(
WorkHard.class.getPackage()
)
Modified: arquillian/trunk/frameworks/jsfunit/src/main/java/org/jboss/arquillian/framework/jsfunit/JSFUnitArchiveAppender.java
===================================================================
--- arquillian/trunk/frameworks/jsfunit/src/main/java/org/jboss/arquillian/framework/jsfunit/JSFUnitArchiveAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/frameworks/jsfunit/src/main/java/org/jboss/arquillian/framework/jsfunit/JSFUnitArchiveAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -35,7 +35,7 @@
*/
public Archive<?> createAuxiliaryArchive()
{
- return ShrinkWrap.create("arquillian-jsfunit.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "arquillian-jsfunit.jar")
.addClass(JSFUnitCleanupTestTreadFilter.class)
.addPackages(
true,
Modified: arquillian/trunk/frameworks/jsfunit/src/test/java/org/jboss/arquillian/framework/jsfunit/JSFUnitTestCase.java
===================================================================
--- arquillian/trunk/frameworks/jsfunit/src/test/java/org/jboss/arquillian/framework/jsfunit/JSFUnitTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/frameworks/jsfunit/src/test/java/org/jboss/arquillian/framework/jsfunit/JSFUnitTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -23,8 +23,8 @@
import org.jboss.jsfunit.jsfsession.JSFSession;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,7 +41,7 @@
@Deployment
public static WebArchive createDeployment()
{
- return ShrinkWrap.create("test.war", WebArchive.class)
+ return ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(
RequestScopeBean.class,
ScopeAwareBean.class)
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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ArquillianDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -34,7 +34,7 @@
public Archive<?> createAuxiliaryArchive()
{
- JavaArchive archive = ShrinkWrap.create("arquillian-core.jar", JavaArchive.class)
+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class ,"arquillian-core.jar")
.addPackages(
true,
//Package.getPackage("org.jboss.arquillian.api"), // TODO: figure out why this does not work..
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ToolingDeploymentFormatter.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ToolingDeploymentFormatter.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/ToolingDeploymentFormatter.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -22,14 +22,14 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.Node;
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.asset.FileAsset;
+import org.jboss.shrinkwrap.api.asset.UrlAsset;
import org.jboss.shrinkwrap.api.formatter.Formatter;
import org.jboss.shrinkwrap.impl.base.asset.ArchiveAsset;
import org.jboss.shrinkwrap.impl.base.asset.ClassAsset;
import org.jboss.shrinkwrap.impl.base.asset.ClassLoaderAsset;
-import org.jboss.shrinkwrap.impl.base.asset.FileAsset;
-import org.jboss.shrinkwrap.impl.base.asset.UrlAsset;
/**
* ToolingDeploymentFormatter
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-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/DeploymentAnnotationArchiveGeneratorTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -85,7 +85,7 @@
@Deployment
public Archive<?> test()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class);
+ return ShrinkWrap.create(JavaArchive.class, "test.jar");
}
}
@@ -95,7 +95,7 @@
@Deployment
public Object test()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class);
+ return ShrinkWrap.create(JavaArchive.class, "test.jar");
}
}
@@ -105,7 +105,7 @@
@Deployment
public static JavaArchive test()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class);
+ return ShrinkWrap.create(JavaArchive.class, "test.jar");
}
}
@@ -115,7 +115,7 @@
@Deployment
public static ResourceAdapterArchive test()
{
- return ShrinkWrap.create("test.jar", ResourceAdapterArchive.class);
+ return ShrinkWrap.create(ResourceAdapterArchive.class, "test.jar");
}
}
}
Modified: arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/ToolingDeploymentFormatterTestCase.java
===================================================================
--- arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/ToolingDeploymentFormatterTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/impl-base/src/test/java/org/jboss/arquillian/impl/ToolingDeploymentFormatterTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -39,14 +39,14 @@
@Test
public void shouldBeAbleToExportArchive() throws Exception
{
- String content = ShrinkWrap.create("test.jar", WebArchive.class)
+ String content = ShrinkWrap.create(WebArchive.class, "test.jar")
.addResource(new File("src/test/resources/arquillian.xml"), ArchivePaths.create("resource.xml"))
.addResource("arquillian.xml", ArchivePaths.create("resource2.xml"))
.addResource(new File("src/test/resources/arquillian.xml").toURI().toURL(), ArchivePaths.create("resource3.xml"))
.addClass(ToolingDeploymentFormatterTestCase.class)
.addServiceProvider(ServiceLoader.class, DynamicServiceLoader.class)
.addLibrary(
- ShrinkWrap.create("test.jar", JavaArchive.class)
+ ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClass(ToolingDeploymentFormatter.class)
)
.toString(new ToolingDeploymentFormatter(getClass()));
Modified: arquillian/trunk/protocols/servlet-ee5/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java
===================================================================
--- arquillian/trunk/protocols/servlet-ee5/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/protocols/servlet-ee5/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -35,7 +35,7 @@
public Archive<?> createAuxiliaryArchive()
{
- WebArchive archive = ShrinkWrap.create("arquillian-protocol.war", WebArchive.class)
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, "arquillian-protocol.war")
.setWebXML("org/jboss/arquillian/protocol/servlet/web.xml")
.addClasses(
SecurityActions.class,
Modified: arquillian/trunk/protocols/servlet-ee5/src/main/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackager.java
===================================================================
--- arquillian/trunk/protocols/servlet-ee5/src/main/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackager.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/protocols/servlet-ee5/src/main/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackager.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -71,7 +71,7 @@
private Archive<?> handleArchive(JavaArchive applicationArchive, Collection<Archive<?>> auxiliaryArchives, WebArchive protocol)
{
- return ShrinkWrap.create("test.ear", EnterpriseArchive.class)
+ return ShrinkWrap.create(EnterpriseArchive.class, "test.ear")
.addModule(applicationArchive)
.addModule(protocol)
.addLibraries(auxiliaryArchives.toArray(new Archive[0]));
Modified: arquillian/trunk/protocols/servlet-ee5/src/test/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackagerTestCase.java
===================================================================
--- arquillian/trunk/protocols/servlet-ee5/src/test/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackagerTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/protocols/servlet-ee5/src/test/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackagerTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -45,7 +45,7 @@
{
Archive<?> archive = new ServletProtocolDeploymentPackager().generateDeployment(
new TestDeployment(
- ShrinkWrap.create("applicationArchive.jar", JavaArchive.class),
+ ShrinkWrap.create(JavaArchive.class, "applicationArchive.jar"),
createAuxiliaryArchives()));
Assert.assertTrue(
@@ -71,7 +71,7 @@
{
new ServletProtocolDeploymentPackager().generateDeployment(
new TestDeployment(
- ShrinkWrap.create("applicationArchive.war", WebArchive.class),
+ ShrinkWrap.create(WebArchive.class, "applicationArchive.war"),
createAuxiliaryArchives()));
}
@@ -81,7 +81,7 @@
{
Archive<?> archive = new ServletProtocolDeploymentPackager().generateDeployment(
new TestDeployment(
- ShrinkWrap.create("applicationArchive.ear", EnterpriseArchive.class),
+ ShrinkWrap.create(EnterpriseArchive.class, "applicationArchive.ear"),
createAuxiliaryArchives()));
Assert.assertTrue(
@@ -100,8 +100,8 @@
private Collection<Archive<?>> createAuxiliaryArchives()
{
List<Archive<?>> archives = new ArrayList<Archive<?>>();
- archives.add(ShrinkWrap.create("auxiliaryArchive1.jar", WebArchive.class));
- archives.add(ShrinkWrap.create("auxiliaryArchive2.jar", JavaArchive.class));
+ archives.add(ShrinkWrap.create(JavaArchive.class, "auxiliaryArchive1.jar"));
+ archives.add(ShrinkWrap.create(JavaArchive.class, "auxiliaryArchive2.jar"));
return archives;
}
Modified: arquillian/trunk/protocols/servlet-ee6/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java
===================================================================
--- arquillian/trunk/protocols/servlet-ee6/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/protocols/servlet-ee6/src/main/java/org/jboss/arquillian/protocol/servlet/ProtocolDeploymentAppender.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -37,7 +37,7 @@
*/
public Archive<?> createAuxiliaryArchive()
{
- return ShrinkWrap.create("arquillian-protocol.jar", JavaArchive.class)
+ return ShrinkWrap.create(JavaArchive.class, "arquillian-protocol.jar")
.addClasses(
SecurityActions.class,
ServletTestRunner.class)
Modified: arquillian/trunk/protocols/servlet-ee6/src/main/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackager.java
===================================================================
--- arquillian/trunk/protocols/servlet-ee6/src/main/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackager.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/protocols/servlet-ee6/src/main/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackager.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -73,7 +73,7 @@
private Archive<?> handleArchive(JavaArchive applicationArchive, Collection<Archive<?>> auxiliaryArchives, Archive<?> protocol)
{
- return ShrinkWrap.create("test.war", WebArchive.class)
+ return ShrinkWrap.create(WebArchive.class, "test.war")
.addLibraries(applicationArchive, protocol)
.addLibraries(auxiliaryArchives.toArray(new Archive[0]));
}
@@ -87,7 +87,7 @@
else
{
applicationArchive.addModule(
- ShrinkWrap.create("test.war", WebArchive.class)
+ ShrinkWrap.create(WebArchive.class, "test.war")
.addLibrary(protocol))
.addLibraries(
auxiliaryArchives.toArray(new Archive<?>[0]));
Modified: arquillian/trunk/protocols/servlet-ee6/src/test/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackagerTestCase.java
===================================================================
--- arquillian/trunk/protocols/servlet-ee6/src/test/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackagerTestCase.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/protocols/servlet-ee6/src/test/java/org/jboss/arquillian/protocol/servlet/ServletProtocolDeploymentPackagerTestCase.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -45,7 +45,7 @@
{
Archive<?> archive = new ServletProtocolDeploymentPackager().generateDeployment(
new TestDeployment(
- ShrinkWrap.create("applicationArchive.jar", JavaArchive.class),
+ ShrinkWrap.create(JavaArchive.class, "applicationArchive.jar"),
createAuxiliaryArchives()));
Assert.assertTrue(
@@ -70,7 +70,7 @@
{
Archive<?> archive = new ServletProtocolDeploymentPackager().generateDeployment(
new TestDeployment(
- ShrinkWrap.create("applicationArchive.war", WebArchive.class),
+ ShrinkWrap.create(WebArchive.class, "applicationArchive.war"),
createAuxiliaryArchives()));
Assert.assertTrue(
@@ -95,7 +95,7 @@
{
Archive<?> archive = new ServletProtocolDeploymentPackager().generateDeployment(
new TestDeployment(
- ShrinkWrap.create("applicationArchive.ear", EnterpriseArchive.class),
+ ShrinkWrap.create(EnterpriseArchive.class, "applicationArchive.ear"),
createAuxiliaryArchives()));
Assert.assertTrue(
@@ -117,9 +117,9 @@
{
Archive<?> archive = new ServletProtocolDeploymentPackager().generateDeployment(
new TestDeployment(
- ShrinkWrap.create("applicationArchive.ear", EnterpriseArchive.class)
+ ShrinkWrap.create(EnterpriseArchive.class, "applicationArchive.ear")
.addModule(
- ShrinkWrap.create("test.war", WebArchive.class)
+ ShrinkWrap.create(WebArchive.class, "test.war")
.addClass(Test.class)),
createAuxiliaryArchives()));
@@ -146,8 +146,8 @@
private Collection<Archive<?>> createAuxiliaryArchives()
{
List<Archive<?>> archives = new ArrayList<Archive<?>>();
- archives.add(ShrinkWrap.create("auxiliaryArchive1.jar", JavaArchive.class));
- archives.add(ShrinkWrap.create("auxiliaryArchive2.jar", JavaArchive.class));
+ archives.add(ShrinkWrap.create(JavaArchive.class, "auxiliaryArchive1.jar"));
+ archives.add(ShrinkWrap.create(JavaArchive.class, "auxiliaryArchive2.jar"));
return archives;
}
Modified: arquillian/trunk/tests/deployment/src/test/java/org/jboss/weld/deployments/DeploymentTest.java
===================================================================
--- arquillian/trunk/tests/deployment/src/test/java/org/jboss/weld/deployments/DeploymentTest.java 2010-07-07 18:52:11 UTC (rev 4690)
+++ arquillian/trunk/tests/deployment/src/test/java/org/jboss/weld/deployments/DeploymentTest.java 2010-07-08 08:30:53 UTC (rev 4691)
@@ -10,10 +10,10 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ByteArrayAsset;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
public class DeploymentTest
{
@@ -28,17 +28,17 @@
protected static JavaArchive createCDIArchive(String name, Class<?>... classes)
{
- return ShrinkWrap.create(name, JavaArchive.class).addClasses(classes).addClass(DeploymentTest.class).addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml");
+ return ShrinkWrap.create(JavaArchive.class, name).addClasses(classes).addClass(DeploymentTest.class).addManifestResource(new ByteArrayAsset(new byte[0]), "beans.xml");
}
protected static WebArchive createWebArchive(Archive<?>... archives)
{
- return ShrinkWrap.create("test.war", WebArchive.class).addLibraries(archives).addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml");
+ return ShrinkWrap.create(WebArchive.class, "test.war").addLibraries(archives).addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml");
}
protected static EnterpriseArchive createEnterpriseArchive(Archive<?>... archives)
{
- return ShrinkWrap.create("test.ear", EnterpriseArchive.class).addLibraries(archives);
+ return ShrinkWrap.create(EnterpriseArchive.class, "test.ear").addLibraries(archives);
}
@SuppressWarnings("unchecked")
More information about the jboss-svn-commits
mailing list