[jboss-cvs] JBossAS SVN: r104642 - in projects/ejb3/components/embedded/trunk: impl-as and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 10 19:01:03 EDT 2010
Author: ALRubinger
Date: 2010-05-10 19:01:02 -0400 (Mon, 10 May 2010)
New Revision: 104642
Modified:
projects/ejb3/components/embedded/trunk/build/pom.xml
projects/ejb3/components/embedded/trunk/impl-as/pom.xml
projects/ejb3/components/embedded/trunk/impl-as/src/test/java/org/jboss/ejb3/embedded/impl/as/EmbeddedEJBContainerExistingMCServerIntegrationUnitTest.java
projects/ejb3/components/embedded/trunk/impl-base/pom.xml
projects/ejb3/components/embedded/trunk/impl-base/src/main/java/org/jboss/ejb3/embedded/impl/base/JBossEJBContainerBase.java
projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/JBossEJBContainerBaseUnitTest.java
Log:
[EJBTHREE-2083] Update to ShrinkWrapDeployer from ShrinkWrap extension module
Modified: projects/ejb3/components/embedded/trunk/build/pom.xml
===================================================================
--- projects/ejb3/components/embedded/trunk/build/pom.xml 2010-05-10 22:51:56 UTC (rev 104641)
+++ projects/ejb3/components/embedded/trunk/build/pom.xml 2010-05-10 23:01:02 UTC (rev 104642)
@@ -28,11 +28,11 @@
<!-- Versioning -->
<version.junit_junit>4.7</version.junit_junit>
- <version.org.jboss.reloaded_jboss.reloaded.vdf.bootstrap.minimal>0.1.2</version.org.jboss.reloaded_jboss.reloaded.vdf.bootstrap.minimal>
+ <version.org.jboss.reloaded_jboss.reloaded.vdf.bootstrap.minimal>0.1.3-SNAPSHOT</version.org.jboss.reloaded_jboss.reloaded.vdf.bootstrap.minimal>
<version.org.jboss.kernel>2.2.0.Alpha9</version.org.jboss.kernel>
<version.org.jboss.spec.javax.ejb_jboss-ejb-api_3.1_spec>1.0.0.Beta2</version.org.jboss.spec.javax.ejb_jboss-ejb-api_3.1_spec>
<version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
- <version.org.jboss.shrinkwrap>1.0.0-alpha-9</version.org.jboss.shrinkwrap>
+ <version.org.jboss.shrinkwrap>1.0.0-SNAPSHOT</version.org.jboss.shrinkwrap>
<version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
</properties>
@@ -181,6 +181,11 @@
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-vdf</artifactId>
+ <version>${version.org.jboss.shrinkwrap}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-extension-vfs3</artifactId>
<version>${version.org.jboss.shrinkwrap}</version>
</dependency>
Modified: projects/ejb3/components/embedded/trunk/impl-as/pom.xml
===================================================================
--- projects/ejb3/components/embedded/trunk/impl-as/pom.xml 2010-05-10 22:51:56 UTC (rev 104641)
+++ projects/ejb3/components/embedded/trunk/impl-as/pom.xml 2010-05-10 23:01:02 UTC (rev 104642)
@@ -51,5 +51,11 @@
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-vdf</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: projects/ejb3/components/embedded/trunk/impl-as/src/test/java/org/jboss/ejb3/embedded/impl/as/EmbeddedEJBContainerExistingMCServerIntegrationUnitTest.java
===================================================================
--- projects/ejb3/components/embedded/trunk/impl-as/src/test/java/org/jboss/ejb3/embedded/impl/as/EmbeddedEJBContainerExistingMCServerIntegrationUnitTest.java 2010-05-10 22:51:56 UTC (rev 104641)
+++ projects/ejb3/components/embedded/trunk/impl-as/src/test/java/org/jboss/ejb3/embedded/impl/as/EmbeddedEJBContainerExistingMCServerIntegrationUnitTest.java 2010-05-10 23:01:02 UTC (rev 104642)
@@ -40,8 +40,8 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.reloaded.api.ReloadedDescriptors;
-import org.jboss.reloaded.shrinkwrap.api.ShrinkWrapDeployer;
import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.vdf.api.ShrinkWrapDeployer;
import org.jboss.vfs.VFS;
import org.junit.AfterClass;
import org.junit.Assert;
Modified: projects/ejb3/components/embedded/trunk/impl-base/pom.xml
===================================================================
--- projects/ejb3/components/embedded/trunk/impl-base/pom.xml 2010-05-10 22:51:56 UTC (rev 104641)
+++ projects/ejb3/components/embedded/trunk/impl-base/pom.xml 2010-05-10 23:01:02 UTC (rev 104642)
@@ -74,8 +74,13 @@
<artifactId>shrinkwrap-extension-vfs3</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-extension-vdf</artifactId>
+ <scope>provided</scope>
+ </dependency>
- <!-- JBoss Threads (only needed for as long as we've got ShrinkWrapDeployer in use) -->
+ <!-- JBoss Threads (needed for as long as we've got ShrinkWrapDeployer in use) -->
<dependency>
<groupId>org.jboss.threads</groupId>
<artifactId>jboss-threads</artifactId>
Modified: projects/ejb3/components/embedded/trunk/impl-base/src/main/java/org/jboss/ejb3/embedded/impl/base/JBossEJBContainerBase.java
===================================================================
--- projects/ejb3/components/embedded/trunk/impl-base/src/main/java/org/jboss/ejb3/embedded/impl/base/JBossEJBContainerBase.java 2010-05-10 22:51:56 UTC (rev 104641)
+++ projects/ejb3/components/embedded/trunk/impl-base/src/main/java/org/jboss/ejb3/embedded/impl/base/JBossEJBContainerBase.java 2010-05-10 23:01:02 UTC (rev 104642)
@@ -46,8 +46,8 @@
import org.jboss.ejb3.embedded.impl.base.scanner.ClassPathEjbJarScanner;
import org.jboss.kernel.Kernel;
import org.jboss.logging.Logger;
-import org.jboss.reloaded.shrinkwrap.api.ShrinkWrapDeployer;
import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.vdf.api.ShrinkWrapDeployer;
import org.jboss.vfs.VFS;
import org.jboss.vfs.VirtualFile;
Modified: projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/JBossEJBContainerBaseUnitTest.java
===================================================================
--- projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/JBossEJBContainerBaseUnitTest.java 2010-05-10 22:51:56 UTC (rev 104641)
+++ projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/JBossEJBContainerBaseUnitTest.java 2010-05-10 23:01:02 UTC (rev 104642)
@@ -35,6 +35,7 @@
import junit.framework.TestCase;
import org.jboss.bootstrap.api.descriptor.BootstrapDescriptor;
+import org.jboss.bootstrap.api.descriptor.UrlBootstrapDescriptor;
import org.jboss.bootstrap.api.mc.server.MCServer;
import org.jboss.bootstrap.api.mc.server.MCServerFactory;
import org.jboss.dependency.spi.ControllerContext;
@@ -42,11 +43,10 @@
import org.jboss.ejb3.embedded.api.JBossEJBContainer;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.reloaded.api.ReloadedDescriptors;
-import org.jboss.reloaded.shrinkwrap.api.ShrinkWrapDeployer;
-import org.jboss.reloaded.shrinkwrap.api.ShrinkWrapReloadedDescriptors;
import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.vdf.api.ShrinkWrapDeployer;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -96,8 +96,8 @@
descriptors.add(ReloadedDescriptors.getClassLoadingDescriptor());
descriptors.add(ReloadedDescriptors.getVdfDescriptor());
descriptors.add(ReloadedDescriptors.getThreadsDescriptor());
- descriptors.add(ShrinkWrapReloadedDescriptors.getTempFileProviderDescriptor());
- descriptors.add(ShrinkWrapReloadedDescriptors.getShrinkWrapDeployerDescriptor());
+ descriptors.add(new UrlBootstrapDescriptor(Thread.currentThread().getContextClassLoader().getResource(
+ "shrinkwrap-deployer-jboss-beans.xml")));
// Start
server.start();
More information about the jboss-cvs-commits
mailing list