[jboss-cvs] JBossAS SVN: r93441 - in projects/embedded/trunk: core/src/main/java/org/jboss/embedded/core/server and 2 other directories.

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

Author: ALRubinger
Date: 2009-09-12 18:45:50 -0400 (Sat, 12 Sep 2009)
New Revision: 93441

Modified:
   projects/embedded/trunk/build/pom.xml
   projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java
   projects/embedded/trunk/testsuite-full-dep/pom.xml
   projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/ServerTestCase.java
Log:
[EMB-47] Refactor EMB to new org.jboss.shrinkwrap namespace

Modified: projects/embedded/trunk/build/pom.xml
===================================================================
--- projects/embedded/trunk/build/pom.xml	2009-09-12 22:16:18 UTC (rev 93440)
+++ projects/embedded/trunk/build/pom.xml	2009-09-12 22:45:50 UTC (rev 93441)
@@ -29,7 +29,7 @@
   
     <!-- Versioning -->
     <version.junit_junit>4.6</version.junit_junit>
-    <version.org.jboss.declarchive_declarchive.impl.vfs>0.1.0-SNAPSHOT</version.org.jboss.declarchive_declarchive.impl.vfs>
+    <version.org.jboss.shrinkwrap_shrinkwrap.impl.vfs>0.1.0-SNAPSHOT</version.org.jboss.shrinkwrap_shrinkwrap.impl.vfs>
     <version.org.jboss.tmpdpl_tmpdpl.impl.vdf>0.1.0-SNAPSHOT</version.org.jboss.tmpdpl_tmpdpl.impl.vdf>
   
   </properties>
@@ -151,9 +151,9 @@
       </dependency>
 
       <dependency>
-        <groupId>org.jboss.declarchive</groupId>
-        <artifactId>declarchive-impl-vfs</artifactId>
-        <version>${version.org.jboss.declarchive_declarchive.impl.vfs}</version>
+        <groupId>org.jboss.shrinkwrap</groupId>
+        <artifactId>shrinkwrap-impl-vfs</artifactId>
+        <version>${version.org.jboss.shrinkwrap_shrinkwrap.impl.vfs}</version>
       </dependency>
       
       <!-- 

Modified: projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java
===================================================================
--- projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java	2009-09-12 22:16:18 UTC (rev 93440)
+++ projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java	2009-09-12 22:45:50 UTC (rev 93441)
@@ -32,7 +32,6 @@
 import org.jboss.bootstrap.spi.as.config.JBossASServerConfig;
 import org.jboss.bootstrap.spi.lifecycle.LifecycleEventHandler;
 import org.jboss.bootstrap.spi.lifecycle.LifecycleState;
-import org.jboss.declarchive.api.Archive;
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.deployers.client.spi.Deployment;
@@ -43,6 +42,7 @@
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.logging.Logger;
+import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.tmpdpl.api.container.DeploymentException;
 import org.jboss.tmpdpl.api.deployable.Deployable;
 import org.jboss.tmpdpl.impl.vdf.VfsVdfDeployableImpl;
@@ -263,7 +263,7 @@
    }
 
    /**
-    * @see org.jboss.tmpdpl.api.container.Container#deploy(org.jboss.declarchive.api.Archive[])
+    * @see org.jboss.tmpdpl.api.container.Container#deploy(org.jboss.shrinkwrap.api.Archive[])
     */
    @Override
    public void deploy(final Archive<?>... archives) throws DeploymentException, IllegalArgumentException
@@ -276,7 +276,7 @@
    }
 
    /**
-    * @see org.jboss.tmpdpl.api.container.Container#undeploy(org.jboss.declarchive.api.Archive[])
+    * @see org.jboss.tmpdpl.api.container.Container#undeploy(org.jboss.shrinkwrap.api.Archive[])
     */
    @Override
    public void undeploy(final Archive<?>... archives) throws DeploymentException, IllegalArgumentException

Modified: projects/embedded/trunk/testsuite-full-dep/pom.xml
===================================================================
--- projects/embedded/trunk/testsuite-full-dep/pom.xml	2009-09-12 22:16:18 UTC (rev 93440)
+++ projects/embedded/trunk/testsuite-full-dep/pom.xml	2009-09-12 22:45:50 UTC (rev 93441)
@@ -42,8 +42,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jboss.declarchive</groupId>
-      <artifactId>declarchive-impl-vfs</artifactId>
+      <groupId>org.jboss.shrinkwrap</groupId>
+      <artifactId>shrinkwrap-impl-vfs</artifactId>
       <scope>test</scope>
     </dependency>
 

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-12 22:16:18 UTC (rev 93440)
+++ projects/embedded/trunk/testsuite-full-dep/src/test/java/org/jboss/ServerTestCase.java	2009-09-12 22:45:50 UTC (rev 93441)
@@ -53,13 +53,6 @@
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
 import org.jboss.bootstrap.spi.lifecycle.LifecycleState;
-import org.jboss.declarchive.api.Path;
-import org.jboss.declarchive.api.spec.JavaArchive;
-import org.jboss.declarchive.api.spec.WebArchive;
-import org.jboss.declarchive.impl.base.MemoryMapArchiveImpl;
-import org.jboss.declarchive.impl.base.path.BasicPath;
-import org.jboss.declarchive.impl.base.spec.JavaArchiveImpl;
-import org.jboss.declarchive.impl.base.spec.WebArchiveImpl;
 import org.jboss.embedded.core.server.JBossASEmbeddedServer;
 import org.jboss.embedded.core.server.JBossASEmbeddedServerImpl;
 import org.jboss.embedded.testsuite.fulldep.ejb3.entity.Jbossian;
@@ -70,6 +63,13 @@
 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.Path;
+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;