[jboss-cvs] JBossAS SVN: r105595 - in branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964: component-matrix and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jun 2 16:22:30 EDT 2010


Author: ALRubinger
Date: 2010-06-02 16:22:29 -0400 (Wed, 02 Jun 2010)
New Revision: 105595

Modified:
   branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/build/build.xml
   branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/component-matrix/pom.xml
   branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/depchain/pom.xml
   branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/embedded/pom.xml
   branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java
   branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/servlet/EmbeddedEjbCallingServlet.java
   branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/testsuite/src/main/org/jboss/test/osgi/simple/SimpleRuntimeTestCase.java
Log:
[JBAS-7964] Update to releases of EJB3 Embeddable and ShrinkWrap

Modified: branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/build/build.xml
===================================================================
--- branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/build/build.xml	2010-06-02 20:11:21 UTC (rev 105594)
+++ branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/build/build.xml	2010-06-02 20:22:29 UTC (rev 105595)
@@ -1991,8 +1991,10 @@
       <fileset refid="org.jboss.ejb3.container:jboss-ejb3-container-spi:jar"/>
       <fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-base:jar"/>
       <fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-naming:jar"/>
-    	<fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-api:jar"/>
-    	<fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-impl-base:jar"/>
+      <fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-api:jar"/>
+      <fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-api-shrinkwrap:jar"/>
+      <fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-impl-base:jar"/>
+      <fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-impl-shrinkwrap:jar"/>
       <fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-spi:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-deployers:jar"/>

Modified: branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/component-matrix/pom.xml
===================================================================
--- branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/component-matrix/pom.xml	2010-06-02 20:11:21 UTC (rev 105594)
+++ branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/component-matrix/pom.xml	2010-06-02 20:22:29 UTC (rev 105595)
@@ -100,7 +100,7 @@
     <version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
     <version.org.jboss.ejb3.bom>0.1.2</version.org.jboss.ejb3.bom>
     <!-- This to move into the EJB3 BOM -->
-    <version.org.jboss.ejb3.embedded>1.0.0-SNAPSHOT</version.org.jboss.ejb3.embedded>
+    <version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
     <version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
     <version.org.jboss.embedded>1.0.0-alpha-3</version.org.jboss.embedded>
     <version.org.jboss.integration>6.0.0.Alpha9</version.org.jboss.integration>
@@ -137,7 +137,7 @@
     <version.org.jboss.security>3.0.0.Beta4</version.org.jboss.security>
     <version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
     <version.org.jboss.service.binding>1.1.0.CR1</version.org.jboss.service.binding>
-    <version.org.jboss.shrinkwrap>1.0.0-SNAPSHOT</version.org.jboss.shrinkwrap>
+    <version.org.jboss.shrinkwrap>1.0.0-alpha-10</version.org.jboss.shrinkwrap>
     <version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
     <version.org.jboss.stdio>1.0.0.CR3</version.org.jboss.stdio>
     <version.org.jboss.threads>2.0.0.CR4</version.org.jboss.threads>
@@ -2373,6 +2373,11 @@
       </dependency>
       <dependency>
         <groupId>org.jboss.ejb3.embedded</groupId>
+        <artifactId>jboss-ejb3-embedded-api-shrinkwrap</artifactId>
+        <version>${version.org.jboss.ejb3.embedded}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.ejb3.embedded</groupId>
         <artifactId>jboss-ejb3-embedded-impl-as</artifactId>
         <version>${version.org.jboss.ejb3.embedded}</version>
       </dependency>
@@ -2382,11 +2387,17 @@
         <version>${version.org.jboss.ejb3.embedded}</version>
       </dependency>
       <dependency>
+       <groupId>org.jboss.ejb3.embedded</groupId>
+        <artifactId>jboss-ejb3-embedded-impl-shrinkwrap</artifactId>
+        <version>${version.org.jboss.ejb3.embedded}</version>
+      </dependency>
+      <dependency>
         <groupId>org.jboss.ejb3.embedded</groupId>
         <artifactId>jboss-ejb3-embedded-spi</artifactId>
         <version>${version.org.jboss.ejb3.embedded}</version>
       </dependency>
 
+
       <dependency>
         <groupId>org.jboss.embedded</groupId>
         <artifactId>jboss-embedded-api</artifactId>

Modified: branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/depchain/pom.xml
===================================================================
--- branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/depchain/pom.xml	2010-06-02 20:11:21 UTC (rev 105594)
+++ branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/depchain/pom.xml	2010-06-02 20:22:29 UTC (rev 105595)
@@ -549,6 +549,20 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3.embedded</groupId>
+      <artifactId>jboss-ejb3-embedded-api-shrinkwrap</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+        </exclusion>
+       <exclusion>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging-log4j</artifactId>
+       </exclusion>
+     </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3.embedded</groupId>
       <artifactId>jboss-ejb3-embedded-impl-as</artifactId>
       <exclusions>
         <exclusion>
@@ -577,6 +591,20 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.ejb3.embedded</groupId>
+      <artifactId>jboss-ejb3-embedded-impl-shrinkwrap</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-spi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging-log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.ejb3.embedded</groupId>
       <artifactId>jboss-ejb3-embedded-spi</artifactId>
       <exclusions>
         <exclusion>

Modified: branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/embedded/pom.xml
===================================================================
--- branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/embedded/pom.xml	2010-06-02 20:11:21 UTC (rev 105594)
+++ branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/embedded/pom.xml	2010-06-02 20:22:29 UTC (rev 105595)
@@ -3,7 +3,6 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <!-- Parent -->
-  <!-- Do not depend on jboss-as-parent or component-matrix; we cannot inherit depMgt here so we assure the build is working right for consumers outside AS -->
   <parent>
     <groupId>org.jboss.jbossas</groupId>
     <artifactId>jboss-as-parent</artifactId>

Modified: branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java
===================================================================
--- branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java	2010-06-02 20:11:21 UTC (rev 105594)
+++ branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java	2010-06-02 20:22:29 UTC (rev 105595)
@@ -264,7 +264,7 @@
 
       // Make a deployment
       final String name = "slsb.jar";
-      final JavaArchive archive = ShrinkWrap.create(name, JavaArchive.class).addClasses(OutputBean.class,
+      final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, name).addClasses(OutputBean.class,
             OutputLocalBusiness.class);
       log.info(archive.toString(true));
       // Deploy
@@ -306,7 +306,7 @@
       final String appName = "testServletJsp";
       final String name = appName + ".war";
       final Class<?> servletClass = JspForwardingServlet.class;
-      final WebArchive archive = ShrinkWrap.create(name, WebArchive.class);
+      final WebArchive archive = ShrinkWrap.create(WebArchive.class, name);
       final ArchivePath targetPathWebXml = ArchivePaths.create("web.xml");
       archive.addWebResource(PATH_ACTUAL_SERVLET_FORWARDING_TO_JSP_WEB_XML, targetPathWebXml).addResource(PATH_JSP)
             .addClass(servletClass);
@@ -368,7 +368,7 @@
       final String appName = "embeddedEjbCallingServlet";
       final String name = appName + ".war";
       final Class<?> servletClass = EmbeddedEjbCallingServlet.class;
-      final WebArchive archive = ShrinkWrap.create(name, WebArchive.class);
+      final WebArchive archive = ShrinkWrap.create(WebArchive.class, name);
       final ArchivePath targetPathWebXml = ArchivePaths.create("web.xml");
       archive.addWebResource(PATH_ACTUAL_SERVLET_EMBEDDED_EJB_WEB_XML, targetPathWebXml).addClass(servletClass);
       log.info(archive.toString(true));
@@ -424,7 +424,7 @@
 
       // Create a virtual archive for the MDB deployment
       final String name = "jms-mdb-test.jar";
-      final JavaArchive archive = ShrinkWrap.create(name, JavaArchive.class);
+      final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, name);
       final ArchivePath queuesTargetPath = ArchivePaths.create(FILENAME_QUEUE_SERVICE_XML);
       archive.addClass(MessageStoringMdb.class).addResource(PATH_QUEUE_SERVICE_XML, queuesTargetPath);
 
@@ -489,7 +489,7 @@
       final String name = "datasource-entity-test.jar";
       final ArchivePath targetDsPath = ArchivePaths.create(FILENAME_EMBEDDED_DS);
       final ArchivePath targetPersistencePath = ArchivePaths.create(PATH_DESTINATION_PERSISTENCE_XML);
-      final JavaArchive archive = ShrinkWrap.create(name, JavaArchive.class);
+      final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, name);
       archive.addClasses(Jbossian.class, JbossianRegistrarLocalBusiness.class, JbossianRegistrarBean.class)
             .addResource(PATH_RESOURCE_DS_XML_EMBEDDED, targetDsPath).addManifestResource(
                   PATH_RESOURCE_PERSISTENCE_XML_EMBEDDED, targetPersistencePath);
@@ -548,7 +548,7 @@
       // Make a deployment
       final String appName = "webservice";
       final String name = appName + ".war";
-      final WebArchive archive = ShrinkWrap.create(name, WebArchive.class);
+      final WebArchive archive = ShrinkWrap.create(WebArchive.class, name);
       final String targetPathWebXml = "web.xml";
       archive.addWebResource(PATH_ACTUAL_WEB_XML_WS, targetPathWebXml).addClass(
             org.jboss.jbossas.embedded.testsuite.ws.EmbeddedWs.class);

Modified: branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/servlet/EmbeddedEjbCallingServlet.java
===================================================================
--- branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/servlet/EmbeddedEjbCallingServlet.java	2010-06-02 20:11:21 UTC (rev 105594)
+++ branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/servlet/EmbeddedEjbCallingServlet.java	2010-06-02 20:22:29 UTC (rev 105595)
@@ -34,7 +34,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.jboss.ejb3.embedded.api.JBossEJBContainer;
+import org.jboss.ejb3.embedded.api.shrinkwrap.ShrinkWrapEJBContainer;
+import org.jboss.ejb3.embedded.impl.shrinkwrap.ShrinkWrapEJBContainerImpl;
+import org.jboss.ejb3.embedded.spi.JBossEJBContainerProvider;
 import org.jboss.jbossas.embedded.testsuite.ejb3.slsb.OutputBean;
 import org.jboss.jbossas.embedded.testsuite.ejb3.slsb.OutputLocalBusiness;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -91,14 +93,16 @@
       // Create the EJB Container
       final Map<String, String> ejbContainerProps = new HashMap<String, String>();
       ejbContainerProps.put(EJBContainer.MODULES, ""); // Deploy no modules and do no scanning by default
-      final JBossEJBContainer ejbContainer = (JBossEJBContainer) EJBContainer.createEJBContainer(ejbContainerProps);
+      final JBossEJBContainerProvider ejbContainer = (JBossEJBContainerProvider) EJBContainer
+            .createEJBContainer(ejbContainerProps);
+      final ShrinkWrapEJBContainer shrinkwrapEjbContainer = new ShrinkWrapEJBContainerImpl(ejbContainer);
 
       // Define the EJB JAR
-      final JavaArchive archive = ShrinkWrap.create("outputSlsb.jar", JavaArchive.class).addClasses(OutputBean.class,
+      final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "outputSlsb.jar").addClasses(OutputBean.class,
             OutputLocalBusiness.class);
 
       // Deploy the JAR
-      ejbContainer.deploy(archive);
+      shrinkwrapEjbContainer.deploy(archive);
 
       // Look up the EJB
       final Context context = ejbContainer.getContext();
@@ -116,7 +120,7 @@
       final String value = bean.getOutput();
 
       // Undeploy
-      ejbContainer.undeploy(archive);
+      shrinkwrapEjbContainer.undeploy(archive);
 
       // Shut down EJBContainer
       ejbContainer.close();

Modified: branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/testsuite/src/main/org/jboss/test/osgi/simple/SimpleRuntimeTestCase.java
===================================================================
--- branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/testsuite/src/main/org/jboss/test/osgi/simple/SimpleRuntimeTestCase.java	2010-06-02 20:11:21 UTC (rev 105594)
+++ branches/TEMP_EJB3_EMBEDDABLE_JBAS-7964/testsuite/src/main/org/jboss/test/osgi/simple/SimpleRuntimeTestCase.java	2010-06-02 20:22:29 UTC (rev 105595)
@@ -29,8 +29,8 @@
 import org.jboss.osgi.testing.OSGiManifestBuilder;
 import org.jboss.osgi.testing.OSGiRuntime;
 import org.jboss.osgi.testing.OSGiRuntimeTest;
-import org.jboss.shrinkwrap.api.Archives;
-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.junit.Test;
 import org.osgi.framework.Bundle;
@@ -47,7 +47,7 @@
    public void testSimpleBundle() throws Exception
    {
       // Build the bundle with shrinkwrap
-      final JavaArchive archive = Archives.create("example-simple", JavaArchive.class);
+      final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "example-simple");
       archive.setManifest(new Asset()
       {
          public InputStream openStream()
@@ -81,4 +81,4 @@
          runtime.shutdown();
       }
    }
-}
\ No newline at end of file
+}




More information about the jboss-cvs-commits mailing list