[jboss-cvs] JBossAS SVN: r96389 - in projects/embedded/trunk: testsuite/src/test/java/org/jboss/embedded/testsuite and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-11-15 20:41:43 -0500 (Sun, 15 Nov 2009)
New Revision: 96389

Modified:
   projects/embedded/trunk/build/pom.xml
   projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerTestCase.java
Log:
[EMB-62] Update EmbeddedAS dependency upon ShrinkWrap to 1.0.0-alpha-2

Modified: projects/embedded/trunk/build/pom.xml
===================================================================
--- projects/embedded/trunk/build/pom.xml	2009-11-16 01:12:35 UTC (rev 96388)
+++ projects/embedded/trunk/build/pom.xml	2009-11-16 01:41:43 UTC (rev 96389)
@@ -30,7 +30,7 @@
     <version.junit_junit>4.6</version.junit_junit>
     <version.org.jboss.bootstrap_jboss.bootstrap.impl.emeddded>2.0.0-SNAPSHOT</version.org.jboss.bootstrap_jboss.bootstrap.impl.emeddded>
     <version.org.jboss.jbossas>5.2.0-SNAPSHOT</version.org.jboss.jbossas>
-    <version.org.jboss.shrinkwrap_shrinkwrap.impl.base>1.0.0-alpha-1</version.org.jboss.shrinkwrap_shrinkwrap.impl.base>
+    <version.org.jboss.shrinkwrap>1.0.0-alpha-2</version.org.jboss.shrinkwrap>
     <version.org.jboss.tmpdpl_tmpdpl.api>0.1.1-SNAPSHOT</version.org.jboss.tmpdpl_tmpdpl.api>
     <version.org.jboss.tmpdpl_tmpdpl.api.shrinkwrap>0.1.1-SNAPSHOT</version.org.jboss.tmpdpl_tmpdpl.api.shrinkwrap>
     <version.org.jboss.tmpdpl_tmpdpl.impl.vdf>0.1.1-SNAPSHOT</version.org.jboss.tmpdpl_tmpdpl.impl.vdf>
@@ -153,9 +153,19 @@
       <!-- ShrinkWrap (Declarative Archives) -->
       <dependency>
         <groupId>org.jboss.shrinkwrap</groupId>
+        <artifactId>shrinkwrap-api</artifactId>
+        <version>${version.org.jboss.shrinkwrap}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.shrinkwrap</groupId>
         <artifactId>shrinkwrap-impl-base</artifactId>
-        <version>${version.org.jboss.shrinkwrap_shrinkwrap.impl.base}</version>
+        <version>${version.org.jboss.shrinkwrap}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jboss.shrinkwrap</groupId>
+        <artifactId>shrinkwrap-spi</artifactId>
+        <version>${version.org.jboss.shrinkwrap}</version>
+      </dependency>
       
       <!-- Deployable Containers (groupId and artifactId will change) -->
       <dependency>

Modified: projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerTestCase.java
===================================================================
--- projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerTestCase.java	2009-11-16 01:12:35 UTC (rev 96388)
+++ projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerTestCase.java	2009-11-16 01:41:43 UTC (rev 96389)
@@ -62,11 +62,10 @@
 import org.jboss.embedded.testsuite.ejb3.slsb.OutputBean;
 import org.jboss.embedded.testsuite.ejb3.slsb.OutputLocalBusiness;
 import org.jboss.embedded.testsuite.servlet.JspForwardingServlet;
+import org.jboss.shrinkwrap.api.Archives;
 import org.jboss.shrinkwrap.api.Path;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.JavaArchiveFactory;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchiveFactory;
 import org.jboss.shrinkwrap.impl.base.path.BasicPath;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -230,7 +229,7 @@
 
       // Make a deployment
       final String name = "slsb.jar";
-      final JavaArchive archive = JavaArchiveFactory.create(name).addClasses(OutputBean.class,
+      final JavaArchive archive = Archives.create(name, JavaArchive.class).addClasses(OutputBean.class,
             OutputLocalBusiness.class);
       log.info(archive.toString(true));
       // Deploy
@@ -267,9 +266,9 @@
       final String appName = "testServletJsp";
       final String name = appName + ".war";
       final Class<?> servletClass = JspForwardingServlet.class;
-      final WebArchive archive = WebArchiveFactory.create(name);
+      final WebArchive archive = Archives.create(name, WebArchive.class);
       final Path targetPathWebXml = new BasicPath("web.xml");
-      archive.addWebResource(targetPathWebXml, PATH_ACTUAL_WEB_XML).addResource(PATH_JSP).addClass(servletClass);
+      archive.addWebResource(PATH_ACTUAL_WEB_XML, targetPathWebXml).addResource(PATH_JSP).addClass(servletClass);
       log.info(archive.toString(true));
 
       // Deploy
@@ -322,9 +321,9 @@
 
       // Create a virtual archive for the MDB deployment
       final String name = "jms-mdb-test.jar";
-      final JavaArchive archive = JavaArchiveFactory.create(name);
+      final JavaArchive archive = Archives.create(name, JavaArchive.class);
       final Path queuesTargetPath = new BasicPath(FILENAME_QUEUE_SERVICE_XML);
-      archive.addClass(MessageStoringMdb.class).addResource(queuesTargetPath, PATH_QUEUE_SERVICE_XML);
+      archive.addClass(MessageStoringMdb.class).addResource(PATH_QUEUE_SERVICE_XML, queuesTargetPath);
 
       // Deploy
       log.info(archive.toString(true));
@@ -382,10 +381,9 @@
       final String name = "datasource-entity-test.jar";
       final Path targetDsPath = new BasicPath(FILENAME_EMBEDDED_DS); //TODO Use factory when available
       final Path targetPersistencePath = new BasicPath(PATH_DESTINATION_PERSISTENCE_XML); //TODO Use factory when available
-      final JavaArchive archive = JavaArchiveFactory.create(name);
+      final JavaArchive archive = Archives.create(name, JavaArchive.class);
       archive.addClasses(Jbossian.class, JbossianRegistrarLocalBusiness.class, JbossianRegistrarBean.class)
-            .addResource(targetDsPath, PATH_RESOURCE_DS_XML_EMBEDDED).addManifestResource(targetPersistencePath,
-                  PATH_RESOURCE_PERSISTENCE_XML_EMBEDDED);
+            .addResource(PATH_RESOURCE_DS_XML_EMBEDDED, targetDsPath).addManifestResource(PATH_RESOURCE_PERSISTENCE_XML_EMBEDDED, targetPersistencePath);
 
       // Deploy
       log.info(archive.toString(true));