[jboss-cvs] JBossAS SVN: r105497 - in projects/ejb3/components/embedded/trunk: impl-base/src/main/java/org/jboss/ejb3/embedded/impl/base and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 1 13:05:33 EDT 2010
Author: ALRubinger
Date: 2010-06-01 13:05:33 -0400 (Tue, 01 Jun 2010)
New Revision: 105497
Modified:
projects/ejb3/components/embedded/trunk/impl-as/src/main/java/org/jboss/ejb3/embedded/impl/as/JBossASEmbeddedEJBContainer.java
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
projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/scanner/ClassPathEjbJarScannerUnitTest.java
projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/scanner/filter/BundleSymbolicNameExclusionFilterUnitTest.java
Log:
[EJBTHREE-2083] Update alongside latest ShrinkWrap SNAPSHOT changes
Modified: projects/ejb3/components/embedded/trunk/impl-as/src/main/java/org/jboss/ejb3/embedded/impl/as/JBossASEmbeddedEJBContainer.java
===================================================================
--- projects/ejb3/components/embedded/trunk/impl-as/src/main/java/org/jboss/ejb3/embedded/impl/as/JBossASEmbeddedEJBContainer.java 2010-06-01 16:36:51 UTC (rev 105496)
+++ projects/ejb3/components/embedded/trunk/impl-as/src/main/java/org/jboss/ejb3/embedded/impl/as/JBossASEmbeddedEJBContainer.java 2010-06-01 17:05:33 UTC (rev 105497)
@@ -36,7 +36,7 @@
public JBossASEmbeddedEJBContainer(final Map<?, ?> properties, final String[] modules)
{
- super(properties, modules, EmbeddedEJBContainerASAdaptor.getMCServer());
+ super(properties, EmbeddedEJBContainerASAdaptor.getMCServer(), modules);
}
@Override
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-06-01 16:36:51 UTC (rev 105496)
+++ projects/ejb3/components/embedded/trunk/impl-base/src/main/java/org/jboss/ejb3/embedded/impl/base/JBossEJBContainerBase.java 2010-06-01 17:05:33 UTC (rev 105497)
@@ -71,11 +71,6 @@
*/
private static final Logger log = Logger.getLogger(JBossEJBContainerBase.class);
- /**
- * Name in MC under which the {@link MainDeployer} is bound
- */
- private static final String MC_BIND_NAME_MAIN_DEPLOYER = "MainDeployer";
-
//-------------------------------------------------------------------------------------||
// Instance Members -------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
@@ -105,38 +100,39 @@
// Constructor ------------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
- protected JBossEJBContainerBase(final Map<?, ?> properties, final String[] modules, final MCBasedServer<?, ?> server)
+ protected JBossEJBContainerBase(final Map<?, ?> properties, final MCBasedServer<?, ?> server, final String[] modules)
{
// Precondition checks
if (server == null)
{
throw new IllegalArgumentException("MC Server must be specified");
}
-
- // Obtain MainDeployer
+ // Get Kernel
final Kernel kernel = server.getKernel();
- final MainDeployer deployer = (MainDeployer) kernel.getController().getInstalledContext(
- MC_BIND_NAME_MAIN_DEPLOYER).getTarget();
- assert deployer != null : "Main Deployer found in the Kernel was null";
// Obtain ShrinkWrapDeployer
final ShrinkWrapDeployer shrinkWrapDeployer = (ShrinkWrapDeployer) kernel.getController().getContextByClass(
ShrinkWrapDeployer.class).getTarget();
assert shrinkWrapDeployer != null : "ShrinkWrapDeployer found in Kernel was null";
+ // Obtain MainDeployer
+ final MainDeployer mainDeployer = (MainDeployer) kernel.getController().getContextByClass(MainDeployer.class)
+ .getTarget();
+ assert mainDeployer != null : "MainDeployer found in Kernel was null";
+
log.info("Started JBoss Embedded " + EJBContainer.class.getSimpleName());
log.info("Modules for deployment: " + Arrays.asList(modules));
// Set
this.mcServer = server;
- this.deployer = deployer;
+ this.deployer = mainDeployer;
this.deployments = new HashSet<Deployment>();
this.shrinkWrapDeployer = shrinkWrapDeployer;
}
protected JBossEJBContainerBase(final Map<?, ?> properties, final MCServer server)
{
- this(properties, ClassPathEjbJarScanner.getEjbJars(), server);
+ this(properties, server, ClassPathEjbJarScanner.getEjbJars());
}
//-------------------------------------------------------------------------------------||
@@ -147,7 +143,7 @@
* Deploys the specified {@link Deployment}s into the Container
*
* @param deployments One or more {@link Deployment}s to process
- * @throws DeploymentException If an error occured in deployment
+ * @throws DeploymentException If an error occurred in deployment
* @throws IllegalArgumentException If at least one {@link Deployment} was not specified
*/
protected void deploy(final Deployment... deployments) throws EJBDeploymentException, IllegalArgumentException
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-06-01 16:36:51 UTC (rev 105496)
+++ projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/JBossEJBContainerBaseUnitTest.java 2010-06-01 17:05:33 UTC (rev 105497)
@@ -22,8 +22,6 @@
package org.jboss.ejb3.embedded.impl.base;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
@@ -43,8 +41,8 @@
import org.jboss.ejb3.embedded.api.JBossEJBContainer;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.reloaded.api.ReloadedDescriptors;
-import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.vdf.api.ShrinkWrapDeployer;
import org.junit.AfterClass;
@@ -110,8 +108,8 @@
@Before
public void createEJBContainer()
{
- ejbContainer = new TestJBossEJBContainer(new HashMap<Object, Object>(), new String[]
- {}, server);
+ ejbContainer = new TestJBossEJBContainer(new HashMap<Object, Object>(), server, new String[]
+ {});
}
/**
@@ -141,17 +139,13 @@
public void shrinkWrapDeployment()
{
// Create a test archive which installs a POJO into MC
- final JavaArchive archive = ShrinkWrap.create("pojo.jar", JavaArchive.class).addClasses(Pojo.class).addResource(
- new Asset()
- {
- @Override
- public InputStream openStream()
- {
- return new ByteArrayInputStream(
- ("<?xml version=\"1.0\" encoding=\"UTF-8\"?><deployment xmlns=\"urn:jboss:bean-deployer:2.0\"><bean name=\"Pojo\" class=\""
- + Pojo.class.getName() + "\" /></deployment>").getBytes());
- }
- }, "pojo-jboss-beans.xml");
+ final JavaArchive archive = ShrinkWrap
+ .create(JavaArchive.class)
+ .addClasses(Pojo.class)
+ .addResource(
+ new StringAsset(
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?><deployment xmlns=\"urn:jboss:bean-deployer:2.0\"><bean name=\"Pojo\" class=\""
+ + Pojo.class.getName() + "\" /></deployment>"), "pojo-jboss-beans.xml");
// Deploy it
try
@@ -193,7 +187,7 @@
{
// Install the naming server into MC
- final JavaArchive namingServer = ShrinkWrap.create("namingServer.jar", JavaArchive.class).addResource(
+ final JavaArchive namingServer = ShrinkWrap.create(JavaArchive.class, "namingServer.jar").addResource(
"naming-server-jboss-beans.xml");
ejbContainer.deploy(namingServer);
@@ -228,9 +222,9 @@
private static class TestJBossEJBContainer extends JBossEJBContainerBase
{
- TestJBossEJBContainer(final Map<?, ?> properties, final String[] modules, final MCServer server)
+ TestJBossEJBContainer(final Map<?, ?> properties, final MCServer server, final String[] modules)
{
- super(properties, modules, server);
+ super(properties, server, modules);
}
/**
Modified: projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/scanner/ClassPathEjbJarScannerUnitTest.java
===================================================================
--- projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/scanner/ClassPathEjbJarScannerUnitTest.java 2010-06-01 16:36:51 UTC (rev 105496)
+++ projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/scanner/ClassPathEjbJarScannerUnitTest.java 2010-06-01 17:05:33 UTC (rev 105497)
@@ -37,10 +37,9 @@
import javax.ejb.Stateful;
import javax.ejb.Stateless;
-import org.jboss.ejb3.embedded.impl.base.scanner.ClassPathEjbJarScanner;
import org.jboss.logging.Logger;
-import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -74,40 +73,15 @@
private static final String SYS_PROP_KEY_CLASS_PATH = "java.class.path";
/**
- * EJB JAR containing @Stateless
+ * The ClassPath entries expected to be reported as modules
*/
- private static final String NAME_JAR_SLSB = "slsb.jar";
+ private static final Collection<String> expectedEjbJarClassPathEntries = new ArrayList<String>();
/**
- * EJB JAR containing @Stateful
+ * Name of a JAR containing a POJO deployment
*/
- private static final String NAME_JAR_SFSB = "sfsb.jar";
-
- /**
- * EJB JAR containing @Singleton
- */
- private static final String NAME_JAR_SINGLETON = "singleton.jar";
-
- /**
- * EJB JAR containing @MessageDriven
- */
- private static final String NAME_JAR_MDB = "mdb.jar";
-
- /**
- * EJB JAR containing a POJO with no descriptor (should not be detected as an EJB Module)
- */
private static final String NAME_JAR_POJO = "pojo.jar";
- /**
- * EJB JAR containing a POJO with a descriptor
- */
- private static final String NAME_JAR_POJO_WITH_DESCRIPTOR = "descriptor.jar";
-
- /**
- * The ClassPath entries expected to be reported as modules
- */
- private static final Collection<String> expectedEjbJarClassPathEntries = new ArrayList<String>();
-
//-------------------------------------------------------------------------------------||
// Lifecycle --------------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
@@ -122,22 +96,21 @@
// Create a bunch of test Archives
final Collection<JavaArchive> archives = new ArrayList<JavaArchive>();
- archives.add(ShrinkWrap.create(NAME_JAR_SLSB, JavaArchive.class).addClass(Slsb.class));
- archives.add(ShrinkWrap.create(NAME_JAR_SFSB, JavaArchive.class).addClass(Sfsb.class));
- archives.add(ShrinkWrap.create(NAME_JAR_SINGLETON, JavaArchive.class).addClass(Singleton1.class));
- archives.add(ShrinkWrap.create(NAME_JAR_MDB, JavaArchive.class).addClass(Mdb.class));
- archives.add(ShrinkWrap.create(NAME_JAR_POJO, JavaArchive.class).addClass(Pojo.class));
- archives.add(ShrinkWrap.create(NAME_JAR_POJO_WITH_DESCRIPTOR, JavaArchive.class).addClass(Pojo.class)
- .addManifestResource(new Asset()
- {
+ archives.add(ShrinkWrap.create(JavaArchive.class).addClass(Slsb.class));
+ archives.add(ShrinkWrap.create(JavaArchive.class).addClass(Sfsb.class));
+ archives.add(ShrinkWrap.create(JavaArchive.class).addClass(Singleton1.class));
+ archives.add(ShrinkWrap.create(JavaArchive.class).addClass(Mdb.class));
+ archives.add(ShrinkWrap.create(JavaArchive.class, NAME_JAR_POJO).addClass(Pojo.class));
+ archives.add(ShrinkWrap.create(JavaArchive.class).addClass(Pojo.class).addManifestResource(new Asset()
+ {
- @Override
- public InputStream openStream()
- {
- return new ByteArrayInputStream(new byte[]
- {});
- }
- }, "ejb-jar.xml"));
+ @Override
+ public InputStream openStream()
+ {
+ return new ByteArrayInputStream(new byte[]
+ {});
+ }
+ }, "ejb-jar.xml"));
// Flush these out to disk in both JAR and Exploded format
final URL shrinkwrapOutputUrl = new URL(ClassPathEjbJarScannerUnitTest.class.getProtectionDomain()
Modified: projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/scanner/filter/BundleSymbolicNameExclusionFilterUnitTest.java
===================================================================
--- projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/scanner/filter/BundleSymbolicNameExclusionFilterUnitTest.java 2010-06-01 16:36:51 UTC (rev 105496)
+++ projects/ejb3/components/embedded/trunk/impl-base/src/test/java/org/jboss/ejb3/embedded/impl/base/scanner/filter/BundleSymbolicNameExclusionFilterUnitTest.java 2010-06-01 17:05:33 UTC (rev 105497)
@@ -33,8 +33,8 @@
import org.jboss.ejb3.embedded.spi.scanner.filter.ExclusionFilter;
import org.jboss.logging.Logger;
-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.jboss.shrinkwrap.vfs3.ArchiveFileSystem;
import org.jboss.vfs.TempFileProvider;
@@ -173,7 +173,7 @@
assert filterConfig != null : "filterConfig must be specified";
// Create the archive
- final JavaArchive archive = ShrinkWrap.create("manifest.jar", JavaArchive.class).addManifestResource(new Asset()
+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "manifest.jar").addManifestResource(new Asset()
{
@Override
More information about the jboss-cvs-commits
mailing list