[jboss-cvs] JBossAS SVN: r105725 - in trunk: tomcat/src/resources/standalone and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 4 10:14:40 EDT 2010
Author: remy.maucherat at jboss.com
Date: 2010-06-04 10:14:40 -0400 (Fri, 04 Jun 2010)
New Revision: 105725
Added:
trunk/tomcat/src/resources/standalone/scanning-deployers-jboss-beans.xml
Modified:
trunk/build/build-web.xml
trunk/build/build.xml
Log:
- Update the web package.
Modified: trunk/build/build-web.xml
===================================================================
--- trunk/build/build-web.xml 2010-06-04 13:46:45 UTC (rev 105724)
+++ trunk/build/build-web.xml 2010-06-04 14:14:40 UTC (rev 105725)
@@ -88,6 +88,7 @@
<mkdir dir="${web.install.root}" />
<copy todir="${web.install.root}">
<fileset dir="${install.root}">
+ <exclude name="boot.log" />
<exclude name="bin/native/**" />
<exclude name="client/**" />
<exclude name="common/lib/antlr.jar" />
@@ -97,6 +98,7 @@
<exclude name="common/lib/bsh.jar" />
<exclude name="common/lib/commons-beanutils.jar" />
<exclude name="common/lib/commons-collections.jar" />
+ <exclude name="common/lib/cxf-*.*" />
<exclude name="common/lib/FastInfoset.jar" />
<exclude name="common/lib/hibernate-annotations.jar" />
<exclude name="common/lib/hibernate-commons-annotations.jar" />
@@ -177,10 +179,12 @@
<exclude name="common/lib/scheduler-plugin.jar" />
<exclude name="common/lib/serializer.jar" />
<exclude name="common/lib/shrinkwrap-*.jar" />
+ <exclude name="common/lib/spring-*.*" />
<exclude name="common/lib/weld-api.jar" />
<exclude name="common/lib/wscommons-policy.jar" />
<exclude name="common/lib/wsdl4j.jar" />
<exclude name="common/lib/xalan.jar" />
+ <exclude name="common/lib/XmlSchema.jar" />
<exclude name="common/lib/xmlsec.jar" />
<exclude name="common/deploy/admin-console.war/**" />
<exclude name="common/deploy/jbossws-console.war/**" />
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-06-04 13:46:45 UTC (rev 105724)
+++ trunk/build/build.xml 2010-06-04 14:14:40 UTC (rev 105725)
@@ -321,13 +321,17 @@
<include name="core-naming-jboss-beans.xml"/>
<include name="jbossweb.deployer/**"/>
<include name="metadata-deployer-jboss-beans.xml"/>
- <include name="scanning-deployers-jboss-beans.xml"/>
<include name="security-deployer-jboss-beans.xml"/>
<include name="jboss-threads.deployer/**"/>
<include name="jboss-logging.deployer/**"/>
<exclude name="jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml"/>
</fileset>
</copy>
+ <copy todir="${install.jbossweb.deployers}">
+ <fileset dir="${tomcat.module.output}/resources/standalone">
+ <include name="scanning-deployers-jboss-beans.xml"/>
+ </fileset>
+ </copy>
<copy todir="${install.jbossweb.deployers}/jbossweb.deployer/META-INF">
<fileset dir="${tomcat.module.output}/resources/standalone">
<include name="war-deployers-jboss-beans.xml"/>
Added: trunk/tomcat/src/resources/standalone/scanning-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/standalone/scanning-deployers-jboss-beans.xml (rev 0)
+++ trunk/tomcat/src/resources/standalone/scanning-deployers-jboss-beans.xml 2010-06-04 14:14:40 UTC (rev 105725)
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Scanning configuration
+ $Id: scanning-deployers-jboss-beans.xml 105723 2010-06-04 13:33:52Z remy.maucherat at jboss.com $
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Generic scanning deployers -->
+
+ <bean name="EarLibExcludeDeployer" class="org.jboss.deployment.EarLibExcludeDeployer"/>
+
+ <bean name="ResourceErrorHandler" class="org.jboss.scanning.plugins.visitor.IgnoreSetErrorHandler">
+ <install method="addIgnored">
+ <parameter>java.lang.NoClassDefFoundError</parameter>
+ </install>
+ <install method="addIgnored">
+ <parameter>java.lang.TypeNotPresentException</parameter>
+ </install>
+ <uninstall method="removeIgnored">
+ <parameter>java.lang.NoClassDefFoundError</parameter>
+ </uninstall>
+ <uninstall method="removeIgnored">
+ <parameter>java.lang.TypeNotPresentException</parameter>
+ </uninstall>
+ </bean>
+
+ <bean name="ResourceUtilDeployer" class="org.jboss.deployment.ResourceUtilSetupDeployer">
+ <constructor>
+ <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter>
+ </constructor>
+ <property name="handler"><inject bean="ResourceErrorHandler"/></property>
+ </bean>
+
+ <bean name="ResourceUtilCleanupDeployer" class="org.jboss.deployment.ResourceUtilCleanupDeployer"/>
+
+ <bean name="JBossMetaDataDUFilter" class="org.jboss.deployment.JBossMetaDataDeploymentUnitFilter"/>
+
+ <bean name="ScanningMetaDataDeployer" class="org.jboss.scanning.deployers.metadata.ScanningMetaDataDeployer"/>
+ <bean name="ScanningMetaDataDUFilter" class="org.jboss.scanning.deployers.filter.ScanningDeploymentUnitFilter"/>
+
+ <bean name="JBossCustomDeployDUFilter" class="org.jboss.deployers.vfs.spi.structure.helpers.VirtualFileDeploymentUnitFilter">
+ <constructor>
+ <parameter>
+ <bean class="org.jboss.vfs.util.FileNameVirtualFileFilter">
+ <constructor>
+ <parameter>
+ <map keyClass="java.lang.String" valueClass="java.util.Set">
+ <entry>
+ <key>deployers/</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jbossweb.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>console-mgr.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jbossws.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jmx-remoting.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jboss-local-jdbc.rar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jboss-xa-jdbc.rar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jms-ra.rar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>mail-ra.rar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>quartz-ra.rar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>jmx-console.war</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>admin-console.war</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>juddi-service.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>xnio-provider.jar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>mod_cluster.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>http-invoker.sar</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>uuid-key-generator.sar</key>
+ <value><null/></value>
+ </entry>
+ <!-- dirs TODO - fix exact names -->
+ <entry>
+ <key>hornetq</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>security</key>
+ <value><null/></value>
+ </entry>
+ <!-- all -->
+ <entry>
+ <key>cluster</key>
+ <value><null/></value>
+ </entry>
+ <entry>
+ <key>snmp-adaptor.sar</key>
+ <value><null/></value>
+ </entry>
+ </map>
+ </parameter>
+ </constructor>
+ </bean>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="DeploymentProvidedDUFilter" class="org.jboss.deployers.vfs.spi.structure.helpers.DeploymentProvidedDeploymentUnitFilter" />
+
+ <!-- Scanning plugin factories -->
+
+ <bean name="AnnScanningPluginFactory" class="org.jboss.scanning.annotations.plugins.AnnotationsScanningPluginFactory"/>
+ <bean name="HierarchyScanningPluginFactory" class="org.jboss.scanning.hierarchy.plugins.HierarchyIndexScanningPluginFactory"/>
+ <!-- bean name="WeldScanningPluginFactory" class="org.jboss.scanning.weld.WeldScanningPluginFactory"/ -->
+
+ <bean name="ScanningDeployer" class="org.jboss.scanning.deployers.ScanningDeployer">
+ <property name="filter">
+ <bean class="org.jboss.deployment.ListDeploymentUnitFilter">
+ <property name="filters">
+ <list>
+ <inject bean="DeploymentProvidedDUFilter" />
+ <inject bean="JBossMetaDataDUFilter"/>
+ <inject bean="ScanningMetaDataDUFilter"/>
+ <inject bean="JBossCustomDeployDUFilter"/>
+ </list>
+ </property>
+ </bean>
+ </property>
+ <incallback method="addFactory" state="Configured" whenRequired="Create" />
+ <uncallback method="removeFactory" />
+ </bean>
+
+ <bean name="ResourcesIndexDeployer" class="org.jboss.deployment.ResourcesIndexDeployer">
+ <property name="disableOptional">true</property>
+ </bean>
+
+ <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.OptAnnotationMetaDataDeployer">
+ <property name="metaDataCompleteIsDefault">false</property>
+ </bean>
+
+</deployment>
More information about the jboss-cvs-commits
mailing list