[jboss-cvs] JBossAS SVN: r93558 - projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss.

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

Author: ALRubinger
Date: 2009-09-15 15:42:01 -0400 (Tue, 15 Sep 2009)
New Revision: 93558

Modified:
   projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/ServerTestCase.java
Log:
[EMB-47] Use archive factories in ServerTestCase

Modified: projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/ServerTestCase.java
===================================================================
--- projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/ServerTestCase.java	2009-09-15 19:27:37 UTC (rev 93557)
+++ projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/ServerTestCase.java	2009-09-15 19:42:01 UTC (rev 93558)
@@ -63,13 +63,12 @@
 import org.jboss.embedded.testsuite.fulldep.ejb3.slsb.OutputLocalBusiness;
 import org.jboss.embedded.testsuite.fulldep.servlet.JspForwardingServlet;
 import org.jboss.logging.Logger;
+import org.jboss.shrinkwrap.api.JavaArchiveFactory;
 import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.WebArchiveFactory;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.MemoryMapArchiveImpl;
 import org.jboss.shrinkwrap.impl.base.path.BasicPath;
-import org.jboss.shrinkwrap.impl.base.spec.JavaArchiveImpl;
-import org.jboss.shrinkwrap.impl.base.spec.WebArchiveImpl;
 import org.jboss.tmpdpl.api.deployable.Deployable;
 import org.jboss.tmpdpl.api.deployable.VfsVdfDeployableFactory;
 import org.junit.AfterClass;
@@ -252,8 +251,8 @@
 
       // Make a deployment
       final String name = "slsb.jar";
-      final JavaArchive archive = new JavaArchiveImpl(new MemoryMapArchiveImpl(name)).addClasses(OutputBean.class,
-            OutputLocalBusiness.class); //TODO Use factory when available
+      final JavaArchive archive = JavaArchiveFactory.create(name).addClasses(OutputBean.class,
+            OutputLocalBusiness.class);
       log.info(archive.toString(true));
       final Deployable deployable = VfsVdfDeployableFactory.createDeployable(archive);
 
@@ -294,7 +293,7 @@
       final String appName = "testServletJsp";
       final String name = appName + ".war";
       final Class<?> servletClass = JspForwardingServlet.class;
-      final WebArchive archive = new WebArchiveImpl(new MemoryMapArchiveImpl(name)); // TODO Use factory when avail
+      final WebArchive archive = WebArchiveFactory.create(name);
       archive.addWebResource(targetPathWebXml, PATH_ACTUAL_WEB_XML).addResource(PATH_JSP).addClass(servletClass);
       log.info(archive.toString(true));
 
@@ -348,7 +347,7 @@
 
       // Create a virtual archive for the MDB deployment
       final String name = "jms-mdb-test.jar";
-      final JavaArchive archive = new JavaArchiveImpl(new MemoryMapArchiveImpl(name)); // TODO Use factory when available
+      final JavaArchive archive = JavaArchiveFactory.create(name);
       final Path queuesTargetPath = new BasicPath(FILENAME_QUEUE_SERVICE_XML);
       archive.addClass(MessageStoringMdb.class).addResource(queuesTargetPath, PATH_QUEUE_SERVICE_XML);
 
@@ -391,13 +390,6 @@
 
    }
 
-   /*
-    * This one isn't ready yet:
-    * 
-    * 1) Hibernate isn't scanning the virtual archive's classes for @Entity
-    *  (so we explicitly put it there in persistence.xml)
-    * 2) Permgen / OOM problems, even on huge heap.  Why? 
-    */
    /**
     * Tests deployment of a JCA DataSource and EJB3 Entity Bean (JPA)
     * 
@@ -416,7 +408,7 @@
       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 = new JavaArchiveImpl(new MemoryMapArchiveImpl(name)); // TODO Use factory when available
+      final JavaArchive archive = JavaArchiveFactory.create(name);
       archive.addClasses(Jbossian.class, JbossianRegistrarLocalBusiness.class, JbossianRegistrarBean.class)
             .addResource(targetDsPath, PATH_RESOURCE_DS_XML_EMBEDDED).addManifestResource(targetPersistencePath,
                   PATH_RESOURCE_PERSISTENCE_XML_EMBEDDED);