[jboss-cvs] JBossAS SVN: r110434 - in trunk: tomcat/src/resources/standalone and 1 other directories.

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

Author: alesj
Date: 2011-01-24 02:21:14 -0500 (Mon, 24 Jan 2011)
New Revision: 110434

Modified:
   trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml
   trunk/tomcat/src/resources/standalone/scanning-deployers-jboss-beans.xml
   trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/scanning/HackWeldScanningPluginFactory.java
Log:
[JBAS-8828]; add inputs to ScanningDeployer, fix hack.




Modified: trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml	2011-01-24 06:34:07 UTC (rev 110433)
+++ trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml	2011-01-24 07:21:14 UTC (rev 110434)
@@ -192,6 +192,12 @@
         </property>
       </bean>
     </property>
+    <install method="addInput" state="Instantiated">
+       <parameter class="java.lang.String">org.jboss.classloading.spi.visitor.ResourceFilter.recurse</parameter>
+    </install>
+    <install method="addInput" state="Instantiated">
+       <parameter class="java.lang.String">org.jboss.classloading.spi.visitor.ResourceFilter.resource</parameter>
+    </install>
     <incallback method="addFactory" state="Configured" whenRequired="Create" />
     <uncallback method="removeFactory" />
   </bean>

Modified: trunk/tomcat/src/resources/standalone/scanning-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/standalone/scanning-deployers-jboss-beans.xml	2011-01-24 06:34:07 UTC (rev 110433)
+++ trunk/tomcat/src/resources/standalone/scanning-deployers-jboss-beans.xml	2011-01-24 07:21:14 UTC (rev 110434)
@@ -188,6 +188,12 @@
         </property>
       </bean>
     </property>
+    <install method="addInput" state="Instantiated">
+       <parameter class="java.lang.String">org.jboss.classloading.spi.visitor.ResourceFilter.recurse</parameter>
+    </install>
+    <install method="addInput" state="Instantiated">
+       <parameter class="java.lang.String">org.jboss.classloading.spi.visitor.ResourceFilter.resource</parameter>
+    </install>
     <incallback method="addFactory" state="Configured" whenRequired="Create" />
     <uncallback method="removeFactory" />
   </bean>

Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/scanning/HackWeldScanningPluginFactory.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/scanning/HackWeldScanningPluginFactory.java	2011-01-24 06:34:07 UTC (rev 110433)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/scanning/HackWeldScanningPluginFactory.java	2011-01-24 07:21:14 UTC (rev 110434)
@@ -56,7 +56,7 @@
             if (libDir == null || libDir.length() == 0) // take 'lib' even on empty
                libDir = "lib";
             VirtualFile lib = root.getChild(libDir);
-            if (lib != null)
+            if (lib != null && lib.exists())
             {
                @SuppressWarnings("unchecked")
                Collection<VirtualFile> cpFiles = unit.getAttachment(DeployersUtils.WELD_CLASSPATH, Collection.class);
@@ -64,7 +64,7 @@
                {
                   if (lib.equals(cp.getParent()))
                   {
-                     ResourceFilter rf = unit.getAttachment(ResourceFilter.class + ".recurse", ResourceFilter.class);
+                     ResourceFilter rf = unit.getAttachment(ResourceFilter.class.getName() + ".recurse", ResourceFilter.class);
                      // Only remove resource filter if it's default EarLibExclude's
                      if (rf != null && rf.getClass().getName().contains("UrlExclude"))
                      {