[jboss-cvs] JBossAS SVN: r107491 - in branches/weld-ejb3-int: component-matrix and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Aug 6 23:55:51 EDT 2010 

Author: marius.bogoevici
Date: 2010-08-06 23:55:50 -0400 (Fri, 06 Aug 2010)
New Revision: 107491

Modified:
   branches/weld-ejb3-int/build/build.xml
   branches/weld-ejb3-int/component-matrix/pom.xml
   branches/weld-ejb3-int/ejb3/pom.xml
   branches/weld-ejb3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3Deployer.java
   branches/weld-ejb3-int/weld-int/ejb/pom.xml
Log:
some fixes to weld integration and integrating with the Ejb3Deployer


Modified: branches/weld-ejb3-int/build/build.xml
===================================================================
--- branches/weld-ejb3-int/build/build.xml	2010-08-06 22:09:50 UTC (rev 107490)
+++ branches/weld-ejb3-int/build/build.xml	2010-08-07 03:55:50 UTC (rev 107491)
@@ -746,6 +746,8 @@
 	      <include name="ejb3-deployers-jboss-beans.xml"/>
 	      <include name="ejb3-nointerface-jboss-beans.xml"/>
 	      <include name="ejb3-metadata-deployers-jboss-beans.xml"/>
+	      <include name="ejb3-instantiator-deployer-jboss-beans.xml"/>
+	      <include name="ejb3-bean-instantiator-jboss-beans.xml"/>
 		  <include name="jboss-ejb3-singleton-deployer-jboss-beans.xml"/>
       </fileset>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-timerservice-deployer:jar"/>
@@ -2131,6 +2133,9 @@
       <fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-impl:jar"/>
       <fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-proxy-impl:jar"/>
       <fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-spi:jar"/>
+      <fileset refid="org.jboss.ejb3.instantiator:jboss-ejb3-instantiator-deployer:jar"/>
+      <fileset refid="org.jboss.ejb3.instantiator:jboss-ejb3-instantiator-impl:jar"/>
+      <fileset refid="org.jboss.ejb3.instantiator:jboss-ejb3-instantiator-spi:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar"/>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar"/>

Modified: branches/weld-ejb3-int/component-matrix/pom.xml
===================================================================
--- branches/weld-ejb3-int/component-matrix/pom.xml	2010-08-06 22:09:50 UTC (rev 107490)
+++ branches/weld-ejb3-int/component-matrix/pom.xml	2010-08-07 03:55:50 UTC (rev 107491)
@@ -106,7 +106,7 @@
     <version.org.jboss.cluster.server.core>1.0.0.Alpha2</version.org.jboss.cluster.server.core>
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.2.0.Alpha6</version.org.jboss.deployers>
-    <version.org.jboss.ejb3.depchain>1.0.0-alpha-1</version.org.jboss.ejb3.depchain>
+    <version.org.jboss.ejb3.depchain>1.0.0-SNAPSHOT</version.org.jboss.ejb3.depchain>
     <!-- This to move into the EJB3 BOM -->
     <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>

Modified: branches/weld-ejb3-int/ejb3/pom.xml
===================================================================
--- branches/weld-ejb3-int/ejb3/pom.xml	2010-08-06 22:09:50 UTC (rev 107490)
+++ branches/weld-ejb3-int/ejb3/pom.xml	2010-08-07 03:55:50 UTC (rev 107491)
@@ -106,6 +106,16 @@
 				<include name="META-INF/jboss-ejb3-singleton-deployer-jboss-beans.xml" />
 			</patternset>
 		</unjar>
+        <unjar src="${maven.dependency.org.jboss.ejb3.instantiator.jboss-ejb3-instantiator-deployer.jar.path}" dest="target/resources">
+			<patternset>
+				<include name="META-INF/ejb3-instantiator-deployer-jboss-beans.xml" />
+			</patternset>
+		</unjar>
+        <unjar src="${maven.dependency.org.jboss.ejb3.instantiator.jboss-ejb3-instantiator-impl.jar.path}" dest="target/resources">
+			<patternset>
+				<include name="META-INF/ejb3-bean-instantiator-jboss-beans.xml" />
+			</patternset>
+		</unjar>
         <unjar src="${maven.dependency.org.jboss.ejb3.singleton.jboss-ejb3-singleton-aop-impl.jar.path}" dest="target/resources">
 			<patternset>
 				<include name="META-INF/singleton-container-aop.xml" />
@@ -142,6 +152,9 @@
 			   <include name="ejb3-nointerface-jboss-beans.xml" />
 			   <include name="ejb3-metadata-deployers-jboss-beans.xml" />
 			   <include name="jboss-ejb3-singleton-deployer-jboss-beans.xml" />
+			   <include name="ejb3-instantiator-deployer-jboss-beans.xml" />
+			   <include name="ejb3-bean-instantiator-jboss-beans.xml" />
+
 		   </fileset>
 		   <fileset dir="target/resources/deployers/META-INF">
 			   <include name="ejb3-deployers-jboss-beans.xml" />
@@ -391,6 +404,17 @@
       <groupId>org.jboss.ejb3.vfs</groupId>
       <artifactId>jboss-ejb3-vfs-spi</artifactId>
     </dependency>
+
+     <dependency>
+      <groupId>org.jboss.ejb3.instantiator</groupId>
+      <artifactId>jboss-ejb3-instantiator-deployer</artifactId>
+    </dependency>
+
+      <!-- not sure if this is needed but right now I am just skimming -->
+       <dependency>
+      <groupId>org.jboss.ejb3.instantiator</groupId>
+      <artifactId>jboss-ejb3-instantiator-impl</artifactId>
+    </dependency>
     
     <dependency>
       <groupId>org.jboss.ejb3.vfs</groupId>

Modified: branches/weld-ejb3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- branches/weld-ejb3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3Deployer.java	2010-08-06 22:09:50 UTC (rev 107490)
+++ branches/weld-ejb3-int/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3Deployer.java	2010-08-07 03:55:50 UTC (rev 107491)
@@ -89,6 +89,7 @@
 	   // we also want post processed metadata for processing.
 	   // Using addInput ensures ordering http://www.jboss.org/index.html?module=bb&op=viewtopic&t=156725
       addInput(AttachmentNames.PROCESSED_METADATA);
+      addRequiredInput(org.jboss.ejb3.instantiator.spi.AttachmentNames.NAME_BEAN_INSTANCE_INSTANTIATOR);
       // TODO: should we really output this
       setOutput(Ejb3Deployment.class);
       // JBossASKernel install output

Modified: branches/weld-ejb3-int/weld-int/ejb/pom.xml
===================================================================
--- branches/weld-ejb3-int/weld-int/ejb/pom.xml	2010-08-06 22:09:50 UTC (rev 107490)
+++ branches/weld-ejb3-int/weld-int/ejb/pom.xml	2010-08-07 03:55:50 UTC (rev 107491)
@@ -23,6 +23,11 @@
     </dependency>
 
     <dependency>
+      <groupId>org.jboss.ejb3.instantiator</groupId>
+      <artifactId>jboss-ejb3-instantiator-spi</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-common</artifactId>
       <scope>provided</scope>

More information about the jboss-cvs-commits mailing list