[jboss-cvs] JBossAS SVN: r90535 - in trunk: cluster/src/resources/jgroups and 4 other directories.

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

Author: smarlow at redhat.com
Date: 2009-06-23 14:12:19 -0400 (Tue, 23 Jun 2009)
New Revision: 90535

Added:
   trunk/cluster/src/resources/jboss-cache-manager.sar/META-INF/jboss-scanning.xml
   trunk/cluster/src/resources/jgroups/jboss-scanning.xml
   trunk/tomcat/src/resources/jboss-scanning.xml
   trunk/varia/src/resources/services/invoker/httpha/jboss-scanning.xml
Modified:
   trunk/tomcat/build.xml
   trunk/tomcat/pom.xml
   trunk/varia/build-sars.xml
   trunk/varia/build.xml
Log:
JBAS-7030 Avoid unnecessary class scanning for annotations during startup

Added: trunk/cluster/src/resources/jboss-cache-manager.sar/META-INF/jboss-scanning.xml
===================================================================
--- trunk/cluster/src/resources/jboss-cache-manager.sar/META-INF/jboss-scanning.xml	                        (rev 0)
+++ trunk/cluster/src/resources/jboss-cache-manager.sar/META-INF/jboss-scanning.xml	2009-06-23 18:12:19 UTC (rev 90535)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+<!-- Purpose:  Disable scanning for annotations in contained deployment. -->
+</scanning>

Added: trunk/cluster/src/resources/jgroups/jboss-scanning.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/jboss-scanning.xml	                        (rev 0)
+++ trunk/cluster/src/resources/jgroups/jboss-scanning.xml	2009-06-23 18:12:19 UTC (rev 90535)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+<!-- Purpose:  Disable scanning for annotations in contained deployment. -->
+</scanning>

Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml	2009-06-23 17:55:03 UTC (rev 90534)
+++ trunk/tomcat/build.xml	2009-06-23 18:12:19 UTC (rev 90535)
@@ -264,7 +264,9 @@
           file="${build.resources}/jboss-beans.xml"/>
     <copy tofile="${build.deploy}/jbossweb.sar/META-INF/jboss-structure.xml"
           file="${build.resources}/jboss-structure-sar.xml"/>
-        
+    <copy tofile="${build.deploy}/jbossweb.sar/META-INF/jboss-scanning.xml"
+          file="${build.resources}/jboss-scanning.xml"/>
+
     <copy file="${build.resources}/context.xml"
       todir="${build.deploy}/jbossweb.sar"/>
     <copy file="${build.resources}/server.xml"

Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml	2009-06-23 17:55:03 UTC (rev 90534)
+++ trunk/tomcat/pom.xml	2009-06-23 18:12:19 UTC (rev 90535)
@@ -105,6 +105,8 @@
                       file="${output.resources}/jboss-beans.xml"/>
                 <copy tofile="${output.deploy}/jbossweb.sar/META-INF/jboss-structure.xml"
                       file="${output.resources}/jboss-structure-sar.xml"/>
+                <copy tofile="${output.deploy}/jbossweb.sar/META-INF/jboss-scanning.xml"
+                      file="${output.resources}/jboss-scanning.xml"/>
                     
                 <property name="thirdparty.dir" location="../thirdparty"/>
                 

Added: trunk/tomcat/src/resources/jboss-scanning.xml
===================================================================
--- trunk/tomcat/src/resources/jboss-scanning.xml	                        (rev 0)
+++ trunk/tomcat/src/resources/jboss-scanning.xml	2009-06-23 18:12:19 UTC (rev 90535)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+<!-- Purpose:  Disable scanning for annotations in contained deployment. -->
+</scanning>

Modified: trunk/varia/build-sars.xml
===================================================================
--- trunk/varia/build-sars.xml	2009-06-23 17:55:03 UTC (rev 90534)
+++ trunk/varia/build-sars.xml	2009-06-23 18:12:19 UTC (rev 90535)
@@ -104,6 +104,7 @@
         <zipfileset dir="${build.resources}/services/invoker/httpha"
          prefix="invoker.war/WEB-INF">
            <include name="jboss-web.xml" />
+           <include name="jboss-scanning.xml" />
            <include name="web.xml" />
          </zipfileset>
         <zipfileset dir="${build.classes}" prefix="invoker.war/WEB-INF/classes">
@@ -112,6 +113,7 @@
         <zipfileset dir="${build.resources}/services/invoker/httpha"
            prefix="META-INF">
            <include name="jboss-service.xml" />
+           <include name="jboss-scanning.xml" />
         </zipfileset>
      </zip>
 
@@ -181,4 +183,4 @@
 
   </target>
 
-</project>
\ No newline at end of file
+</project>

Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml	2009-06-23 17:55:03 UTC (rev 90534)
+++ trunk/varia/build.xml	2009-06-23 18:12:19 UTC (rev 90535)
@@ -479,6 +479,7 @@
         <zipfileset dir="${build.resources}/services/invoker/httpha"
          prefix="invoker.war/WEB-INF">
            <include name="jboss-web.xml" />
+           <include name="jboss-scanning.xml" />
            <include name="web.xml" />
          </zipfileset>
         <zipfileset dir="${build.classes}" prefix="invoker.war/WEB-INF/classes">
@@ -487,6 +488,7 @@
         <zipfileset dir="${build.resources}/services/invoker/httpha"
            prefix="META-INF">
            <include name="jboss-service.xml" />
+           <include name="jboss-scanning.xml" />
         </zipfileset>
      </zip>
 

Added: trunk/varia/src/resources/services/invoker/httpha/jboss-scanning.xml
===================================================================
--- trunk/varia/src/resources/services/invoker/httpha/jboss-scanning.xml	                        (rev 0)
+++ trunk/varia/src/resources/services/invoker/httpha/jboss-scanning.xml	2009-06-23 18:12:19 UTC (rev 90535)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+<!-- Purpose:  Disable scanning for annotations in contained deployment. -->
+</scanning>