[jboss-cvs] JBossAS SVN: r107068 - in trunk/weld-int: assembly/src/main/assembly/resources/META-INF and 1 other directories.

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

Author: marius.bogoevici
Date: 2010-07-23 14:45:08 -0400 (Fri, 23 Jul 2010)
New Revision: 107068

Added:
   trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/cl/WeldMcExtensionsIntegrationDeployer.java
Modified:
   trunk/weld-int/assembly/src/main/assembly/assembly.xml
   trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml
Log:
JBAS-8249 (partial) - add Mc Weld Extensions through an integration deployer

Modified: trunk/weld-int/assembly/src/main/assembly/assembly.xml
===================================================================
--- trunk/weld-int/assembly/src/main/assembly/assembly.xml	2010-07-23 18:18:42 UTC (rev 107067)
+++ trunk/weld-int/assembly/src/main/assembly/assembly.xml	2010-07-23 18:45:08 UTC (rev 107068)
@@ -30,8 +30,7 @@
             <include>org.jboss.jbossas:weld-int-ejb</include>
             <include>org.jboss.jbossas:weld-int-deployer</include>
             <include>org.jboss.jbossas:weld-int-deployer-mc-int</include>
-            <include>org.jboss.kernel:jboss-weld-int</include>
-            
+
             <include>org.jboss.interceptor:jboss-interceptor</include>
          </includes>
       </dependencySet>
@@ -41,7 +40,9 @@
          <outputDirectory>lib-int</outputDirectory>
          <includes>
             <include>org.jboss.weld:weld-core</include>
-            <include>org.jboss.jbossas:weld-int-webtier</include>            
+            <include>org.jboss.jbossas:weld-int-webtier</include>
+            <include>org.jboss.kernel:jboss-weld-int</include>
+
          </includes>
       </dependencySet>
    </dependencySets>

Modified: trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml
===================================================================
--- trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml	2010-07-23 18:18:42 UTC (rev 107067)
+++ trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml	2010-07-23 18:45:08 UTC (rev 107068)
@@ -38,6 +38,8 @@
   <!-- Responsible for pushing Weld onto the application classpath -->
   <bean name="WeldCoreIntegrationDeployer" class="org.jboss.weld.integration.deployer.cl.WeldCoreIntegrationDeployer"/>
 
+  <bean name="WeldMcExtensionsIntegrationDeployer" class="org.jboss.weld.integration.deployer.cl.WeldMcExtensionsIntegrationDeployer"/>
+
   <!-- Responsible for inserting the Weld EJB interceptor -->
   <bean name="PostEjbJarMetadataDeployer" class="org.jboss.weld.integration.deployer.metadata.WeldEjbInterceptorMetadataDeployer"/>
   

Copied: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/cl/WeldMcExtensionsIntegrationDeployer.java (from rev 107054, trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/cl/WeldCoreIntegrationDeployer.java)
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/cl/WeldMcExtensionsIntegrationDeployer.java	                        (rev 0)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/cl/WeldMcExtensionsIntegrationDeployer.java	2010-07-23 18:45:08 UTC (rev 107068)
@@ -0,0 +1,34 @@
+package org.jboss.weld.integration.deployer.cl;
+
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.weld.integration.deployer.DeployersUtils;
+import org.jboss.weld.integration.deployer.ext.JBossWeldMetaData;
+
+/**
+ * Web Beans  core integration deployer.
+ *
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
+ */
+public class WeldMcExtensionsIntegrationDeployer extends WeldUrlIntegrationDeployer<JBossWeldMetaData>
+{
+   public WeldMcExtensionsIntegrationDeployer()
+   {
+      super(JBossWeldMetaData.class);
+      setTopLevelOnly(true); // only top level, as that's where Bootstrap bean is gonna be
+      setInputs(DeployersUtils.WELD_FILES);
+      setIntegrationURLs(getURLs());
+   }
+
+   @Override // we override this, as we want any beans.xml
+   protected boolean isIntegrationDeployment(VFSDeploymentUnit unit)
+   {
+      return DeployersUtils.checkForWeldFiles(unit);
+   }
+
+   @Override
+   protected String getShortLibName()
+   {
+      return "jboss-weld-int.jar";
+   }
+}
\ No newline at end of file