[jboss-cvs] JBossAS SVN: r76955 - in trunk: connector/src/resources/deployers and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 11 16:01:04 EDT 2008
Author: alesj
Date: 2008-08-11 16:01:03 -0400 (Mon, 11 Aug 2008)
New Revision: 76955
Added:
trunk/server/src/main/org/jboss/deployment/OptAnnotationMetaDataDeployer.java
Modified:
trunk/component-matrix/pom.xml
trunk/connector/src/resources/deployers/jca-deployers-jboss-beans.xml
trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml
trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml
trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml
trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml
trunk/embedded/src/main/resources/javase/deployers/security-deployer-beans.xml
trunk/server/src/etc/conf/default/deployers.xml
trunk/server/src/etc/deployers/ear-deployer-jboss-beans.xml
trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
trunk/server/src/main/org/jboss/deployment/AltAnnotationMetaDataDeployer.java
trunk/server/src/main/org/jboss/deployment/EARStructure.java
trunk/spring-int/src/main/org/jboss/spring/io/VFSResource.java
trunk/system/src/main/org/jboss/system/server/profile/basic/MetaDataAwareProfile.java
trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
trunk/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml
trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
Log:
[JBAS-5848], [JBAS-5804], [JBAS-5807]
Upgrading MC modules.
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/component-matrix/pom.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -39,19 +39,20 @@
<version.jboss.jbossws-spi>1.0.5.CR1</version.jboss.jbossws-spi>
<version.jboss.messaging>1.4.1.CR1</version.jboss.messaging>
<version.jboss.web>2.1.1.CR5</version.jboss.web>
- <version.org.jboss.aop>2.0.0.CR13</version.org.jboss.aop>
+ <version.org.jboss.aop>2.0.0.CR15</version.org.jboss.aop>
<version.org.jboss.ejb3>0.1.10</version.org.jboss.ejb3>
<version.org.jboss.jpa>0.1.1</version.org.jboss.jpa>
- <version.org.jboss.mdr>2.0.0.Beta15</version.org.jboss.mdr>
- <version.org.jboss.vfs>2.0.0.Beta20</version.org.jboss.vfs>
- <version.org.jboss.cl>2.0.0.Beta12</version.org.jboss.cl>
+ <version.org.jboss.reflect>2.0.0.Beta13</version.org.jboss.reflect>
+ <version.org.jboss.mdr>2.0.0.Beta16</version.org.jboss.mdr>
+ <version.org.jboss.vfs>2.0.0.Beta21</version.org.jboss.vfs>
+ <version.org.jboss.cl>2.0.0.Beta13</version.org.jboss.cl>
<version.org.jboss.cluster>1.1.0.CR4</version.org.jboss.cluster>
- <version.org.jboss.deployers>2.0.0.Beta18</version.org.jboss.deployers>
+ <version.org.jboss.deployers>2.0.0.Beta20</version.org.jboss.deployers>
<version.org.jboss.integration>5.0.0.CR2</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.0.CR12</version.org.jboss.jbossxb>
<version.org.jboss.man>2.0.0.Beta15</version.org.jboss.man>
<version.org.jboss.metadata>1.0.0.Beta35</version.org.jboss.metadata>
- <version.org.jboss.microcontainer>2.0.0.Beta16</version.org.jboss.microcontainer>
+ <version.org.jboss.microcontainer>2.0.0.Beta17</version.org.jboss.microcontainer>
<version.org.jboss.security>2.0.2.CR6</version.org.jboss.security>
<version.oswego-concurrent.concurrent>1.3.4-jboss-update1</version.oswego-concurrent.concurrent>
<version.suffix.org.jboss.javaee>.CR1</version.suffix.org.jboss.javaee>
@@ -1089,7 +1090,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-reflect</artifactId>
- <version>2.0.0.Beta12</version>
+ <version>${version.org.jboss.reflect}</version>
</dependency>
<dependency>
Modified: trunk/connector/src/resources/deployers/jca-deployers-jboss-beans.xml
===================================================================
--- trunk/connector/src/resources/deployers/jca-deployers-jboss-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/connector/src/resources/deployers/jca-deployers-jboss-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -11,13 +11,11 @@
<!-- RAR Deployment -->
<bean name="RARParserDeployer" class="org.jboss.resource.deployers.RARParserDeployer">
<property name="metaDataRepository"><inject bean="JCAMetaDataRepository"/></property>
- <property name="type">rar</property>
</bean>
<bean name="RARDeployer" class="org.jboss.resource.deployers.RARDeployer">
<property name="workManagerName">jboss.jca:service=WorkManager</property>
<property name="XATerminatorName">jboss:service=TransactionManager</property>
- <property name="type">rar</property>
</bean>
@@ -29,7 +27,6 @@
<bean name="ConnectionFactoryDeployer" class="org.jboss.system.deployers.ServiceXSLDeployer">
<property name="suffix">-ds.xml</property>
<property name="XSLPath">stylesheets/ConnectionFactoryTemplate.xsl</property>
- <property name="type">jca-ds</property>
</bean>
-->
@@ -72,7 +69,6 @@
<inject bean="MetaDataTypeMappingBuilder"/>
</list>
</property>
- <property name="type">jca-ds</property>
</bean>
<bean name="DSDeploymentTemplateInfoFactory"
Modified: trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -8,28 +8,28 @@
<bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
<bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
- <install bean="ManagedDeploymentCreator" method="addVersionedAttachmentType">
- <parameter>
- <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
- </parameter>
- <parameter>
- <value>ejb3x</value>
- </parameter>
- <parameter>
- <value>3.*</value>
- </parameter>
- <parameter>
- <value>getEjbVersion</value>
- </parameter>
- </install>
- <uninstall bean="ManagedDeploymentCreator" method="removeVersionedAttachmentType">
- <parameter>
- <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
- </parameter>
- <parameter>
- <value>ejb3x</value>
- </parameter>
- </uninstall>
+ <install bean="ManagedDeploymentCreator" method="addVersionedAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+ </parameter>
+ <parameter>
+ <value>ejb3x</value>
+ </parameter>
+ <parameter>
+ <value>3.*</value>
+ </parameter>
+ <parameter>
+ <value>getEjbVersion</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeVersionedAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+ </parameter>
+ <parameter>
+ <value>ejb3x</value>
+ </parameter>
+ </uninstall>
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="defaultPersistenceProperties"><inject bean="DefaultPersistenceProperties" property="properties"/></property>
@@ -139,32 +139,31 @@
</bean>
<bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
- <property name="type">car</property>
<!-- TODO: check depends -->
<depends>AspectLibrary</depends>
</bean>
<bean name="JBossClientParsingDeployer" class="org.jboss.ejb3.deployers.JBossClientParsingDeployer">
<depends>AppClientParsingDeployer</depends>
- </bean>
- <bean name="MergedJBossClientMetaDataDeployer" class="org.jboss.ejb3.deployers.MergedJBossClientMetaDataDeployer">
- <depends>AppClientParsingDeployer</depends>
- </bean>
+ </bean>
+ <bean name="MergedJBossClientMetaDataDeployer" class="org.jboss.ejb3.deployers.MergedJBossClientMetaDataDeployer">
+ <depends>AppClientParsingDeployer</depends>
+ </bean>
<bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
- <install bean="ManagedDeploymentCreator" method="addAttachmentType">
- <parameter>
- <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
- </parameter>
- <parameter>
- <value>car</value>
- </parameter>
- </install>
- <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
- <parameter>
- <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
- </parameter>
- </uninstall>
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
+ </parameter>
+ <parameter>
+ <value>car</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
+ </parameter>
+ </uninstall>
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<!-- TODO: check depends -->
@@ -280,19 +279,19 @@
<!-- Persistence Unit deployers -->
<bean name="PersistenceUnitParsingDeployer" class="org.jboss.ejb3.deployers.PersistenceUnitParsingDeployer">
- <install bean="ManagedDeploymentCreator" method="addAttachmentType">
- <parameter>
- <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
- </parameter>
- <parameter>
- <value>par</value>
- </parameter>
- </install>
- <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
- <parameter>
- <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
- </parameter>
- </uninstall>
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+ </parameter>
+ <parameter>
+ <value>par</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.jpa.spec.PersistenceMetaData</value>
+ </parameter>
+ </uninstall>
</bean>
</deployment>
Modified: trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/embedded/src/main/resources/javase/conf/bootstrap-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -115,28 +115,18 @@
</bean>
<!-- POJO Deployment -->
- <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
- <property name="type">beans</property>
- </bean>
- <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer">
- <property name="type">beans</property>
- </bean>
+ <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"/>
+ <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"/>
<bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
<constructor><parameter><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
- <property name="type">beans</property>
</bean>
<!-- JMX Deployment -->
- <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer">
- <property name="type">sar</property>
- </bean>
+ <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer"/>
<bean name="ServiceClassLoaderDeployer" class="org.jboss.embedded.ClassLoaderDeployer"/>
- <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer">
- <property name="type">sar</property>
- </bean>
+ <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer"/>
<bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
<constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
- <property name="type">sar</property>
</bean>
<!-- A filter for excluding files from the scanner -->
Modified: trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/embedded/src/main/resources/javase/deployers/aspect-deployer-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -47,7 +47,6 @@
<!-- Aspect Deployment -->
<bean name="AspectDeployer" class="org.jboss.aop.deployers.AspectDeployer">
- <property name="type">aop</property>
<property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
</bean>
Modified: trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -6,12 +6,10 @@
<!-- ejb-jar.xml parsing deployer -->
<bean name="Ejb2ParsingDeployer" class="org.jboss.deployment.EjbParsingDeployer">
- <property name="type">ejb2x</property>
<property name="useSchemaValidation">false</property>
<property name="relativeOrder">3000</property>
</bean>
<bean name="JBossEjb2ParsingDeployer" class="org.jboss.deployment.JBossEjbParsingDeployer">
- <property name="type">ejb2x</property>
<property name="relativeOrder">3001</property>
<property name="useSchemaValidation">false</property>
<property name="ignoreMissingStandardJBossXml">true</property>
Modified: trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -10,7 +10,6 @@
<bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
<bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
- <property name="type">ejb3x</property>
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="defaultPersistenceProperties"><inject bean="DefaultPersistenceProperties" property="properties"/></property>
@@ -121,13 +120,11 @@
</bean>
<bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
- <property name="type">car</property>
<!-- TODO: check depends -->
<depends>AspectLibrary</depends>
</bean>
<bean name="JBossClientParsingDeployer" class="org.jboss.ejb3.deployers.JBossClientParsingDeployer">
- <property name="type">car</property>
<depends>AppClientParsingDeployer</depends>
</bean>
@@ -136,7 +133,6 @@
</bean>
<bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
- <property name="type">car</property>
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<!-- TODO: check depends -->
@@ -252,8 +248,6 @@
<bean name="JNDIKernelRegistryPlugin" class="org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin"/>
<!-- Persistence Unit deployers -->
- <bean name="PersistenceUnitParsingDeployer" class="org.jboss.ejb3.deployers.PersistenceUnitParsingDeployer">
- <property name="type">car</property>
- </bean>
+ <bean name="PersistenceUnitParsingDeployer" class="org.jboss.ejb3.deployers.PersistenceUnitParsingDeployer"/>
</deployment>
Modified: trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/embedded/src/main/resources/javase/deployers/jca-deployers-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -11,13 +11,11 @@
<!-- RAR Deployment -->
<bean name="RARParserDeployer" class="org.jboss.resource.deployers.RARParserDeployer">
<property name="metaDataRepository"><inject bean="JCAMetaDataRepository"/></property>
- <property name="type">rar</property>
</bean>
<bean name="RARDeployer" class="org.jboss.resource.deployers.RARDeployer">
<property name="workManagerName">jboss.jca:service=WorkManager</property>
<property name="XATerminatorName">jboss:service=TransactionManager</property>
- <property name="type">rar</property>
</bean>
@@ -27,7 +25,6 @@
<bean name="ConnectionFactoryDeployer" class="org.jboss.system.deployers.ServiceXSLDeployer">
<property name="suffix">-ds.xml</property>
<property name="XSLPath">stylesheets/ConnectionFactoryTemplate.xsl</property>
- <property name="type">jca-ds</property>
</bean>
-->
@@ -44,7 +41,6 @@
<bean name="ManagedConnectionFactoryParserDeployer" class="org.jboss.resource.deployers.ManagedConnectionFactoryParserDeployer">
<property name="repository"><inject bean="JCAMetaDataRepository"></inject></property>
<property name="suffix">-ds.xml</property>
- <property name="type">jca-ds</property>
</bean>
@@ -59,7 +55,6 @@
<inject bean="MetaDataTypeMappingBuilder"/>
</list>
</property>
- <property name="type">jca-ds</property>
</bean>
<!-- The template for creating a datasource -->
Modified: trunk/embedded/src/main/resources/javase/deployers/security-deployer-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/security-deployer-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/embedded/src/main/resources/javase/deployers/security-deployer-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -5,7 +5,6 @@
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="SecurityDeployer" class="org.jboss.deployment.security.SecurityDeployer">
- <property name="type">security</property>
<property name="ignoreSuffixes">
<set elementClass="java.lang.String">
<value>xml</value>
Modified: trunk/server/src/etc/conf/default/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/default/deployers.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/server/src/etc/conf/default/deployers.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -127,7 +127,6 @@
<!-- AOP deployment -->
<bean name="AspectAppParsingDeployer" class="org.jboss.aop.asintegration.jboss5.AspectAppParsingDeployer"/>
<bean name="AspectDeployer" class="org.jboss.aop.deployers.AspectDeployer">
- <property name="type">aop</property>
<property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
</bean>
@@ -206,6 +205,7 @@
</property>
</bean>
<bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/>
+ <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
<bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
<property name="classLoading"><inject bean="ClassLoading"/></property>
</bean>
Modified: trunk/server/src/etc/deployers/ear-deployer-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/ear-deployer-jboss-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/server/src/etc/deployers/ear-deployer-jboss-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -12,7 +12,6 @@
<!-- application.xml parsing deployer -->
<bean name="AppParsingDeployer" class="org.jboss.deployment.AppParsingDeployer">
- <property name="type">ear</property>
<!-- TODO JBAS-4193 property name="useValidation">false</property -->
</bean>
<!-- Implicit ear contents identifying deployer for ears without
@@ -23,7 +22,6 @@
<parameter><inject bean="AppParsingDeployer" property="relativeOrder"/></parameter>
</constructor>
- <property name="type">ear</property>
<!-- Does the deployment have to end in .ear to process it -->
<property name="requiresEarSuffix">true</property>
</bean>
@@ -42,7 +40,6 @@
<value>org.jboss.metadata.ear.jboss.JBossAppMetaData</value>
</parameter>
</uninstall>
- <property name="type">ear</property>
<!-- A flag indicating if ear deployments should have their own scoped
class loader to isolate their classes from other deployments.
-->
Modified: trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -11,20 +11,19 @@
-->
<bean name="ReferenceMetaDataResolverDeployer" class="org.jboss.deployment.MappedReferenceMetaDataResolverDeployer"/>
- <!-- Generic scanning deployer - using javassist to do lookup
- <bean name="GenScanDeployer" class="org.jboss.deployers.plugins.annotations.GenericAnnotationDeployer">
- <property name="output">org.jboss.deployers.spi.annotations.AnnotationEnvironment</property>
- </bean>
+ <!-- Generic scanning deployer - using javassist to do lookup -->
+
+ <bean name="GenScanDeployer" class="org.jboss.deployers.vfs.plugins.annotations.AnnotationEnvironmentDeployer"/>
- <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.AltAnnotationMetaDataDeployer">
+ <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.OptAnnotationMetaDataDeployer">
<property name="metaDataCompleteIsDefault">false</property>
</bean>
- -->
- <!-- Extract annotations into a standard metadata view -->
+ <!-- Extract annotations into a standard metadata view
<bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.AnnotationMetaDataDeployer">
<property name="metaDataCompleteIsDefault">false</property>
</bean>
+ -->
<!-- The schema location to JBossXB binding class mappings. We specify the dtd/xsd name
of the schema as the location to work with legacy dtd as well as namespace based
Modified: trunk/server/src/main/org/jboss/deployment/AltAnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/AltAnnotationMetaDataDeployer.java 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/server/src/main/org/jboss/deployment/AltAnnotationMetaDataDeployer.java 2008-08-11 20:01:03 UTC (rev 76955)
@@ -70,12 +70,11 @@
import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
import org.jboss.deployers.spi.annotations.Element;
-import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.virtual.VirtualFile;
/**
- * A PRE_REAL deployer which generates metadata from annotations.
+ * A POST_CLASSLOADER deployer which generates metadata from annotations.
* Alternative option to its super class.
*
* @author Ales.Justin at jboss.org
@@ -89,7 +88,6 @@
public AltAnnotationMetaDataDeployer()
{
super();
- setStage(DeploymentStages.PRE_REAL);
setInput(AnnotationEnvironment.class);
// add annotations AnnotationMetaDataDeployer scans
addAnnotationClass(Stateful.class);
@@ -142,7 +140,12 @@
Set<Class<?>> classes = new HashSet<Class<?>>();
for(Class<? extends Annotation> annotation : annotationOnClass)
- classes.addAll(env.classIsAnnotatedWith(annotation));
+ {
+ Class<Annotation> annotationClass = (Class<Annotation>)annotation;
+ Set<Element<Annotation, Class<?>>> elements = env.classIsAnnotatedWith(annotationClass);
+ for(Element<Annotation, Class<?>> elt : elements)
+ classes.add(elt.getOwner());
+ }
for(Class<? extends Annotation> annotation : annotationOnMethod)
{
Class<Annotation> annotationClass = (Class<Annotation>)annotation;
Modified: trunk/server/src/main/org/jboss/deployment/EARStructure.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EARStructure.java 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/server/src/main/org/jboss/deployment/EARStructure.java 2008-08-11 20:01:03 UTC (rev 76955)
@@ -29,8 +29,8 @@
import org.jboss.deployers.spi.structure.ContextInfo;
import org.jboss.deployers.spi.structure.StructureMetaData;
+import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSStructuralDeployers;
-import org.jboss.deployers.vfs.spi.structure.helpers.AbstractStructureDeployer;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
import org.jboss.metadata.ear.spec.AbstractModule;
@@ -58,7 +58,7 @@
* @author adrian at jboss.org
* @version $Revision$
*/
-public class EARStructure extends AbstractStructureDeployer
+public class EARStructure extends AbstractVFSStructureDeployer
{
/**
* The default ear/lib filter
Copied: trunk/server/src/main/org/jboss/deployment/OptAnnotationMetaDataDeployer.java (from rev 76315, trunk/server/src/main/org/jboss/deployment/AltAnnotationMetaDataDeployer.java)
===================================================================
--- trunk/server/src/main/org/jboss/deployment/OptAnnotationMetaDataDeployer.java (rev 0)
+++ trunk/server/src/main/org/jboss/deployment/OptAnnotationMetaDataDeployer.java 2008-08-11 20:01:03 UTC (rev 76955)
@@ -0,0 +1,200 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.deployment;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
+import org.jboss.deployers.spi.annotations.Element;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.annotation.creator.AbstractCreator;
+import org.jboss.metadata.annotation.creator.AnnotationContext;
+import org.jboss.metadata.annotation.creator.client.ApplicationClient5MetaDataCreator;
+import org.jboss.metadata.annotation.creator.ejb.jboss.JBoss50Creator;
+import org.jboss.metadata.annotation.creator.web.Web25MetaDataCreator;
+import org.jboss.metadata.annotation.finder.AnnotationFinder;
+import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
+import org.jboss.metadata.client.spec.ApplicationClientMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.web.spec.WebMetaData;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * A POST_CLASSLOADER deployer which generates metadata from annotations.
+ * Optimized option to its super class.
+ *
+ * @author Ales.Justin at jboss.org
+ */
+public class OptAnnotationMetaDataDeployer extends AnnotationMetaDataDeployer
+{
+ public OptAnnotationMetaDataDeployer()
+ {
+ super();
+ setInput(AnnotationEnvironment.class);
+ }
+
+ protected void processMetaData(VFSDeploymentUnit unit, WebMetaData webMetaData, ApplicationClientMetaData clientMetaData, List<VirtualFile> classpath) throws Exception
+ {
+ AnnotationFinder<AnnotatedElement> finder = new DefaultAnnotationFinder<AnnotatedElement>();
+ if(webMetaData != null)
+ {
+ processJBossWebMetaData(unit, finder);
+ }
+ else
+ {
+ if (clientMetaData != null)
+ {
+ processJBossClientMetaData(unit, finder);
+ }
+ else
+ {
+ String mainClassName = getMainClassName(unit);
+ if (mainClassName != null)
+ {
+ processJBossClientMetaData(unit, finder);
+ }
+ else
+ {
+ processJBossMetaData(unit, finder);
+ }
+ }
+ }
+ }
+
+ /**
+ * Process jboss web meta data.
+ *
+ * @param unit the deployment unit
+ * @param finder the finder
+ */
+ protected void processJBossWebMetaData(VFSDeploymentUnit unit, AnnotationFinder<AnnotatedElement> finder)
+ {
+ Web25MetaDataCreator creator = new Web25MetaDataCreator(finder);
+ Collection<Class<?>> classes = getClasses(unit, creator);
+ WebMetaData annotationMetaData = creator.create(classes);
+ if(annotationMetaData != null)
+ unit.addAttachment(WEB_ANNOTATED_ATTACHMENT_NAME, annotationMetaData, WebMetaData.class);
+ }
+
+ /**
+ * Process jboss app client meta data.
+ *
+ * @param unit the deployment unit
+ * @param finder the finder
+ */
+ protected void processJBossClientMetaData(VFSDeploymentUnit unit, AnnotationFinder<AnnotatedElement> finder)
+ {
+ ApplicationClient5MetaDataCreator creator = new ApplicationClient5MetaDataCreator(finder);
+ Collection<Class<?>> classes = getClasses(unit, creator);
+ ApplicationClientMetaData annotationMetaData = creator.create(classes);
+ if(annotationMetaData != null)
+ unit.addAttachment(CLIENT_ANNOTATED_ATTACHMENT_NAME, annotationMetaData, ApplicationClientMetaData.class);
+ }
+
+ /**
+ * Process jboss meta data.
+ *
+ * @param unit the deployment unit
+ * @param finder the finder
+ */
+ protected void processJBossMetaData(VFSDeploymentUnit unit, AnnotationFinder<AnnotatedElement> finder)
+ {
+ // Create the metadata model from the annotations
+ JBoss50Creator creator = new JBoss50Creator(finder);
+ Collection<Class<?>> classes = getClasses(unit, creator);
+ JBossMetaData annotationMetaData = creator.create(classes);
+ if(annotationMetaData != null)
+ unit.addAttachment(EJB_ANNOTATED_ATTACHMENT_NAME, annotationMetaData, JBossMetaData.class);
+ }
+
+ /**
+ * Get the classes for creator to process.
+ *
+ * @param unit the deployment unit
+ * @param creator the creator
+ * @return classes to process
+ */
+ @SuppressWarnings("unchecked")
+ protected Collection<Class<?>> getClasses(VFSDeploymentUnit unit, AbstractCreator creator)
+ {
+ boolean trace = log.isTraceEnabled();
+
+ AnnotationEnvironment env = unit.getAttachment(AnnotationEnvironment.class);
+ if (env == null)
+ {
+ if (trace)
+ log.trace("Cannot scan classes, missing AnnotationEnvironment as attachment: " + unit.getName());
+
+ return Collections.emptySet();
+ }
+
+ String creatorInfo = creator.toString();
+ AnnotationContext context = creator.getAnnotationContext();
+ Set<Class<?>> classes = new HashSet<Class<?>>();
+
+ Collection<Class<? extends Annotation>> typeAnnotations = context.getTypeAnnotations();
+ if (trace)
+ log.trace("Creator: " + creatorInfo + ", type annotations: " + typeAnnotations);
+ for(Class<? extends Annotation> annotation : typeAnnotations)
+ {
+ Class<Annotation> annotationClass = (Class<Annotation>)annotation;
+ Set<Element<Annotation, Class<?>>> elements = env.classIsAnnotatedWith(annotationClass);
+ for(Element<Annotation, Class<?>> elt : elements)
+ classes.add(elt.getOwner());
+ }
+
+ Collection<Class<? extends Annotation>> methodAnnotations = context.getMethodAnnotations();
+ if (trace)
+ log.trace("Creator: " + creatorInfo + ", method annotations: " + methodAnnotations);
+ for(Class<? extends Annotation> annotation : methodAnnotations)
+ {
+ Class<Annotation> annotationClass = (Class<Annotation>)annotation;
+ Set<Element<Annotation, Method>> elements = env.classHasMethodAnnotatedWith(annotationClass);
+ for(Element<Annotation, Method> elt : elements)
+ classes.add(elt.getOwner());
+ }
+
+ Collection<Class<? extends Annotation>> fieldAnnotations = context.getFieldAnnotations();
+ if (trace)
+ log.trace("Creator: " + creatorInfo + ", field annotations: " + fieldAnnotations);
+ for(Class<? extends Annotation> annotation : fieldAnnotations)
+ {
+ Class<Annotation> annotationClass = (Class<Annotation>)annotation;
+ Set<Element<Annotation, Field>> elements = env.classHasFieldAnnotatedWith(annotationClass);
+ for(Element<Annotation, Field> elt : elements)
+ classes.add(elt.getOwner());
+ }
+
+ if (trace)
+ log.trace("Annotated classes [" + unit.getName() + ", " + creatorInfo + "]: " + classes);
+
+ return classes;
+ }
+}
\ No newline at end of file
Modified: trunk/spring-int/src/main/org/jboss/spring/io/VFSResource.java
===================================================================
--- trunk/spring-int/src/main/org/jboss/spring/io/VFSResource.java 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/spring-int/src/main/org/jboss/spring/io/VFSResource.java 2008-08-11 20:01:03 UTC (rev 76955)
@@ -121,10 +121,14 @@
{
try
{
- return new File(VFSUtils.getCompatibleURL(file).toURI());
+ return new File(VFSUtils.getCompatibleURI(file));
}
- catch (URISyntaxException e)
+ catch (IOException e)
{
+ throw e;
+ }
+ catch (Exception e)
+ {
IOException ioe = new IOException(e.getMessage());
ioe.initCause(e);
throw ioe;
Modified: trunk/system/src/main/org/jboss/system/server/profile/basic/MetaDataAwareProfile.java
===================================================================
--- trunk/system/src/main/org/jboss/system/server/profile/basic/MetaDataAwareProfile.java 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/system/src/main/org/jboss/system/server/profile/basic/MetaDataAwareProfile.java 2008-08-11 20:01:03 UTC (rev 76955)
@@ -23,7 +23,7 @@
import java.io.File;
import java.io.IOException;
-import java.net.URL;
+import java.net.URI;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -70,8 +70,8 @@
protected boolean hasBeenModified(VirtualFile root) throws Exception
{
// get file:/ schema
- URL url = VFSUtils.getCompatibleURL(root);
- File file = new File(url.toURI());
+ URI uri = VFSUtils.getCompatibleURI(root);
+ File file = new File(uri);
// if root is file check its modification
if (file.isFile())
return root.hasBeenModified();
Modified: trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -23,11 +23,9 @@
<!-- web.xml parsing deployer -->
<bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
- <property name="type">war</property>
<property name="relativeOrder">2000</property>
</bean>
<bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
- <property name="type">war</property>
<property name="relativeOrder">2001</property>
</bean>
@@ -125,7 +123,6 @@
<!-- The WebMetaData to service mbean deployer -->
<bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
<property name="mainDeployer"><inject bean="MainDeployer" /></property>
- <property name="type">war</property>
<!-- You can configure a set of authenticators keyed by http-auth method
used. This will apply the same set of authenticators across all web
applications. You can override the set of authenticators at the web
Modified: trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -8,11 +8,9 @@
<!-- web.xml parsing deployer -->
<bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
- <property name="type">war</property>
<property name="relativeOrder">2000</property>
</bean>
<bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
- <property name="type">war</property>
<property name="relativeOrder">2001</property>
</bean>
@@ -81,7 +79,6 @@
<!-- The WebMetaData to service mbean deployer -->
<bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
<property name="mainDeployer"><inject bean="MainDeployer" /></property>
- <property name="type">war</property>
<property name="relativeOrder">2003</property>
<!-- You can configure a set of authenticators keyed by http-auth method
used. This will apply the same set of authenticators across all web
Modified: trunk/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -8,11 +8,9 @@
<!-- web.xml parsing deployer -->
<bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
- <property name="type">war</property>
<property name="relativeOrder">2000</property>
</bean>
<bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
- <property name="type">war</property>
<property name="relativeOrder">2001</property>
</bean>
@@ -104,7 +102,6 @@
<bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
<!-- Inject the MainDeployer for resolving cross deployment refs -->
<property name="mainDeployer"><inject bean="MainDeployer" /></property>
- <property name="type">war</property>
<!-- You can configure a set of authenticators keyed by http-auth method
used. This will apply the same set of authenticators across all web
applications. You can override the set of authenticators at the web
Modified: trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-jboss-beans.xml 2008-08-11 19:28:19 UTC (rev 76954)
+++ trunk/tomcat/src/resources/war-deployers-jboss-beans.xml 2008-08-11 20:01:03 UTC (rev 76955)
@@ -8,144 +8,142 @@
<!-- web.xml parsing deployer -->
<bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
- <property name="type">war</property>
<property name="relativeOrder">2000</property>
</bean>
<bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
- <property name="type">war</property>
<property name="relativeOrder">2001</property>
</bean>
- <!-- Allow for war local class loaders: in testing -->
- <bean name="WarClassLoaderDeployer" class="org.jboss.web.tomcat.service.deployers.WarClassLoaderDeployer">
- <property name="relativeOrder">-1</property>
-
- <property name="includeWebInfInClasspath">true</property>
- <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property>
-
- </bean>
-
- <!--
- Injects default clustering metadata.
- TODO. A better approach is to use a jboss-web.xml equivalent to conf/web.xml
- and conf/standardjboss.xml as the source for defaults.
- -->
- <bean name="WebAppClusteringDefaultsDeployer"
- class="org.jboss.web.tomcat.service.deployers.ClusteringDefaultsDeployer">
-
- <property name="relativeOrder">2002</property>
-
- <!-- Default session cache config used by distributable webapps -->
- <property name="cacheName">standard-session-cache</property>
- <!-- Default session cache config used by FIELD granularity distributable webapps -->
- <property name="fieldGranularityCacheName">field-granularity-session-cache</property>
-
- <!--
- The following two properties define when sessions are replicated to
- the other nodes.
- The default value, "instant", uses the request thread to replicate changes
- to the other nodes at the end of requests. In this case, the
- "SnapshotInterval" property is not used.
- The "interval" mode uses a background thread that periodically checks for
- modified sessions and replicates them. The "SnapshotInterval"
- property controls how often (in milliseconds) the background thread
- should run.
-
- Note that this property is not in effect if the replication-granularity
- is set to FIELD. If it is FIELD, it will be per http request (that is,
- "instant" mode.)
- -->
- <property name="snapshotMode">INSTANT</property>
- <property name="snapshotInterval">1000</property>
-
- <property name="replicationGranularity">SESSION</property>
- <property name="replicationTrigger">SET_AND_NON_PRIMITIVE_GET</property>
- <property name="replicationFieldBatchMode">true</property>
-
- <!--
- Whether by default to add special session handling to coordinate use
- with mod_jk or other JK connector variants.
- If a JK connector is used, you will need to set the JvmRoute inside
- JBossWeb, e.g. configure,
- Engine name="jboss.web" jvmRoute="Node1" defaultHost="localhost"
- in server.xml.
-
- This value can be configured per webapp in the webapp's jboss.xml.
-
- If not set, the default will be to add the special session handling
- if a jvmRoute is configured on the Engine. So, generally the only reason
- to configure this overall default is to set it to 'false' and thus force
- per webapp configuration.
- -->
- <!--
- <property name="useJK">false</property>
-
- <property name="useSessionPassivation">false</property>
- <property name="passivationMaxIdleTime">-1</property>
- <property name="passivationMinIdleTime">-1</property>
- -->
-
- <!--
- Determines the maximum interval between requests, in seconds, after
- which a request will trigger replication of the session's timestamp
- regardless of whether the request has otherwise made the session dirty.
- Such replication ensures that other nodes in the cluster are aware of
- the most recent value for the session's timestamp and won't incorrectly
- expire an unreplicated session upon failover. It also results in correct
- values for HttpSession.getLastAccessedTime() calls following failover.
-
- The cost of timestamp replication is considerably lower in JBoss AS 5
- than it is in earlier versions since replicating a timestamp does not
- necessitate replicating any other data.
-
- A value of 0 means the metadata will be replicated whenever the session is
- accessed. A value of -1 means the metadata will be replicated only if some
- other activity during the request (e.g. modifying an attribute) has
- resulted in other replication work involving the session. A positive value
- greater than the HttpSession.getMaxInactiveInterval() value will be treated
- as a likely misconfiguration and converted to 0; i.e. replicate the
- metadata on every request.
- -->
- <property name="maxUnreplicatedInterval">60</property>
-
- </bean>
-
- <!--
- Adds to distributable webapps a dependency on needed clustering services.
-
- With this deployer in place, webapps marked <distributable/> will not
- deploy completely in the absence of needed clustering support services.
-
- If desired, this deployer can be commented out in a non-clustered AS
- configuration (e.g. 'default') in which case a <distributable/> webapp
- will still deploy after logging a WARN about the missing clustering
- services. The webapp's sessions will not be clustered. This was the
- behavior of distributable webapps in the 'default' config in AS 4.x.
- -->
- <bean name="WebAppClusteringDependencyDeployer"
- class="org.jboss.web.tomcat.service.deployers.ClusteringDependencyDeployer">
-
- <!-- Clustered webapps get their cache from this service -->
- <property name="clusterCacheDependency">jboss.cache:service=CacheManager</property>
-
+ <!-- Allow for war local class loaders: in testing -->
+ <bean name="WarClassLoaderDeployer" class="org.jboss.web.tomcat.service.deployers.WarClassLoaderDeployer">
+ <property name="relativeOrder">-1</property>
+
+ <property name="includeWebInfInClasspath">true</property>
+ <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property>
+
+ </bean>
+
+ <!--
+ Injects default clustering metadata.
+ TODO. A better approach is to use a jboss-web.xml equivalent to conf/web.xml
+ and conf/standardjboss.xml as the source for defaults.
+ -->
+ <bean name="WebAppClusteringDefaultsDeployer"
+ class="org.jboss.web.tomcat.service.deployers.ClusteringDefaultsDeployer">
+
+ <property name="relativeOrder">2002</property>
+
+ <!-- Default session cache config used by distributable webapps -->
+ <property name="cacheName">standard-session-cache</property>
+ <!-- Default session cache config used by FIELD granularity distributable webapps -->
+ <property name="fieldGranularityCacheName">field-granularity-session-cache</property>
+
+ <!--
+ The following two properties define when sessions are replicated to
+ the other nodes.
+ The default value, "instant", uses the request thread to replicate changes
+ to the other nodes at the end of requests. In this case, the
+ "SnapshotInterval" property is not used.
+ The "interval" mode uses a background thread that periodically checks for
+ modified sessions and replicates them. The "SnapshotInterval"
+ property controls how often (in milliseconds) the background thread
+ should run.
+
+ Note that this property is not in effect if the replication-granularity
+ is set to FIELD. If it is FIELD, it will be per http request (that is,
+ "instant" mode.)
+ -->
+ <property name="snapshotMode">INSTANT</property>
+ <property name="snapshotInterval">1000</property>
+
+ <property name="replicationGranularity">SESSION</property>
+ <property name="replicationTrigger">SET_AND_NON_PRIMITIVE_GET</property>
+ <property name="replicationFieldBatchMode">true</property>
+
+ <!--
+ Whether by default to add special session handling to coordinate use
+ with mod_jk or other JK connector variants.
+ If a JK connector is used, you will need to set the JvmRoute inside
+ JBossWeb, e.g. configure,
+ Engine name="jboss.web" jvmRoute="Node1" defaultHost="localhost"
+ in server.xml.
+
+ This value can be configured per webapp in the webapp's jboss.xml.
+
+ If not set, the default will be to add the special session handling
+ if a jvmRoute is configured on the Engine. So, generally the only reason
+ to configure this overall default is to set it to 'false' and thus force
+ per webapp configuration.
+ -->
+ <!--
+ <property name="useJK">false</property>
+
+ <property name="useSessionPassivation">false</property>
+ <property name="passivationMaxIdleTime">-1</property>
+ <property name="passivationMinIdleTime">-1</property>
+ -->
+
+ <!--
+ Determines the maximum interval between requests, in seconds, after
+ which a request will trigger replication of the session's timestamp
+ regardless of whether the request has otherwise made the session dirty.
+ Such replication ensures that other nodes in the cluster are aware of
+ the most recent value for the session's timestamp and won't incorrectly
+ expire an unreplicated session upon failover. It also results in correct
+ values for HttpSession.getLastAccessedTime() calls following failover.
+
+ The cost of timestamp replication is considerably lower in JBoss AS 5
+ than it is in earlier versions since replicating a timestamp does not
+ necessitate replicating any other data.
+
+ A value of 0 means the metadata will be replicated whenever the session is
+ accessed. A value of -1 means the metadata will be replicated only if some
+ other activity during the request (e.g. modifying an attribute) has
+ resulted in other replication work involving the session. A positive value
+ greater than the HttpSession.getMaxInactiveInterval() value will be treated
+ as a likely misconfiguration and converted to 0; i.e. replicate the
+ metadata on every request.
+ -->
+ <property name="maxUnreplicatedInterval">60</property>
+
+ </bean>
+
+ <!--
+ Adds to distributable webapps a dependency on needed clustering services.
+
+ With this deployer in place, webapps marked <distributable/> will not
+ deploy completely in the absence of needed clustering support services.
+
+ If desired, this deployer can be commented out in a non-clustered AS
+ configuration (e.g. 'default') in which case a <distributable/> webapp
+ will still deploy after logging a WARN about the missing clustering
+ services. The webapp's sessions will not be clustered. This was the
+ behavior of distributable webapps in the 'default' config in AS 4.x.
+ -->
+ <bean name="WebAppClusteringDependencyDeployer"
+ class="org.jboss.web.tomcat.service.deployers.ClusteringDependencyDeployer">
+
+ <!-- Clustered webapps get their cache from this service -->
+ <property name="clusterCacheDependency">jboss.cache:service=CacheManager</property>
+
</bean>
<!-- The WebMetaData to service mbean deployer -->
<bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
- <install bean="ManagedDeploymentCreator" method="addAttachmentType">
- <parameter>
- <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
- </parameter>
- <parameter>
- <value>war</value>
- </parameter>
- </install>
- <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
- <parameter>
- <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
- </parameter>
- </uninstall>
-
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
+ </parameter>
+ <parameter>
+ <value>war</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
+ </parameter>
+ </uninstall>
+
<!-- Inject the MainDeployer for resolving cross deployment refs -->
<property name="mainDeployer"><inject bean="MainDeployer" /></property>
More information about the jboss-cvs-commits
mailing list