[jboss-cvs] JBossAS SVN: r104205 - in trunk: connector/src/resources/deployers and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 23 13:16:30 EDT 2010
Author: alex.loubyansky at jboss.com
Date: 2010-04-23 13:16:26 -0400 (Fri, 23 Apr 2010)
New Revision: 104205
Modified:
trunk/cluster/src/etc/deploy-hasingleton-jboss-beans.xml
trunk/cluster/src/etc/ha-legacy-jboss-beans.xml
trunk/cluster/src/etc/hapartition-jboss-beans.xml
trunk/connector/src/resources/deployers/jca-deployers-jboss-beans.xml
trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml
trunk/hornetq-int/src/resources/config/clustered/hornetq-jboss-beans.xml
trunk/hornetq-int/src/resources/config/non-clustered/hornetq-jboss-beans.xml
trunk/profileservice/src/resources/profileservice-jboss-beans.xml
trunk/server/src/etc/conf/all/bootstrap/deployers.xml
trunk/server/src/etc/conf/all/bootstrap/profile.xml
trunk/server/src/etc/conf/default/bootstrap/profile.xml
trunk/server/src/etc/conf/standard/ear-deployer-jboss-beans.xml
trunk/server/src/etc/deploy/transaction-jboss-beans.xml
trunk/server/src/etc/deployers/ear-deployer-jboss-beans.xml
trunk/server/src/etc/deployers/ejb-deployer-jboss-beans.xml
trunk/tomcat/src/resources/jboss-beans.xml
trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml
trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
Log:
JBAS-7971
Modified: trunk/cluster/src/etc/deploy-hasingleton-jboss-beans.xml
===================================================================
--- trunk/cluster/src/etc/deploy-hasingleton-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/cluster/src/etc/deploy-hasingleton-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -41,12 +41,7 @@
class="org.jboss.ha.singleton.HASingletonController">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.ha:service=HASingletonDeployer", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true)</annotation>
-
- <depends>HAPartition</depends>
- <!-- Have the BarrierController that listens for our JMX
- notifications start first. -->
- <depends>HASingletonDeployerBarrierController</depends>
-
+
<property name="HAPartition"><inject bean="HAPartition"/></property>
<property name="target"><inject bean="HASingletonProfileManager"/></property>
<property name="targetStartMethod">activateProfile</property>
@@ -66,6 +61,10 @@
-->
<property name="restartOnMerge">true</property>
+ <depends>HAPartition</depends>
+ <!-- Have the BarrierController that listens for our JMX
+ notifications start first. -->
+ <depends>HASingletonDeployerBarrierController</depends>
</bean>
<!--
Modified: trunk/cluster/src/etc/ha-legacy-jboss-beans.xml
===================================================================
--- trunk/cluster/src/etc/ha-legacy-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/cluster/src/etc/ha-legacy-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -14,10 +14,7 @@
<bean name="JRMPInvokerHA"
class="org.jboss.invocation.jrmp.server.JRMPInvokerHA">
-
- <depends>jboss:service=TransactionManager</depends>
- <depends>HAPartition</depends>
-
+
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=invoker,type=jrmpha", exposedInterface=org.jboss.invocation.jrmp.server.JRMPInvokerMBean.class, registerDirectly=true)</annotation>
<property name="serverAddress">
@@ -35,6 +32,9 @@
<property name="RMIClientSocketFactory">custom</property>
<property name="RMIServerSocketFactory">custom</property>
-->
+
+ <depends>jboss:service=TransactionManager</depends>
+ <depends>HAPartition</depends>
</bean>
<!-- ==================================================================== -->
@@ -43,13 +43,13 @@
<bean name="UnifiedInvokerHA"
class="org.jboss.invocation.unified.server.UnifiedInvokerHA">
+
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=invoker,type=unifiedha", exposedInterface=org.jboss.invocation.unified.server.UnifiedInvokerMBean.class, registerDirectly=true)</annotation>
+ <property name="connector"><inject bean="jboss.remoting:service=Connector,transport=socket"/></property>
+
<depends>jboss:service=TransactionManager</depends>
<depends>HAPartition</depends>
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=invoker,type=unifiedha", exposedInterface=org.jboss.invocation.unified.server.UnifiedInvokerMBean.class, registerDirectly=true)</annotation>
-
- <property name="connector"><inject bean="jboss.remoting:service=Connector,transport=socket"/></property>
</bean>
<!-- ==================================================================== -->
Modified: trunk/cluster/src/etc/hapartition-jboss-beans.xml
===================================================================
--- trunk/cluster/src/etc/hapartition-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/cluster/src/etc/hapartition-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -22,8 +22,6 @@
<bean name="HAPartition"
class="org.jboss.ha.framework.server.ClusterPartition">
-
- <depends>jboss:service=Naming</depends>
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HAPartition,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class, registerDirectly=true)</annotation>
@@ -49,6 +47,8 @@
<property name="cacheHandler"><inject bean="HAPartitionCacheHandler"/></property>
</bean>
</property>
+
+ <depends>jboss:service=Naming</depends>
</bean>
Modified: trunk/connector/src/resources/deployers/jca-deployers-jboss-beans.xml
===================================================================
--- trunk/connector/src/resources/deployers/jca-deployers-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/connector/src/resources/deployers/jca-deployers-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -74,6 +74,8 @@
<!-- The *-ds.xml parsing deployer -->
<bean name="ManagedConnectionFactoryParserDeployer" class="org.jboss.resource.deployers.ManagedConnectionFactoryParserDeployer">
+ <property name="repository"><inject bean="JCAMetaDataRepository"/></property>
+ <property name="suffix">-ds.xml</property>
<install bean="ManagedDeploymentCreator" method="addAttachmentType">
<parameter>
<value>org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup</value>
@@ -87,8 +89,6 @@
<value>org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup</value>
</parameter>
</uninstall>
- <property name="repository"><inject bean="JCAMetaDataRepository"/></property>
- <property name="suffix">-ds.xml</property>
</bean>
<bean name="ManagedConnectionFactoryDeployer" class="org.jboss.resource.deployers.ManagedConnectionFactoryDeployer">
Modified: trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -20,28 +20,6 @@
</bean>
<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>
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="cacheFactoryRegistry"><inject bean="EJB3CacheFactoryRegistry" /></property>
@@ -144,6 +122,30 @@
</set>
</property>
<depends>AspectLibrary</depends>
+
+ <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>
+
</bean>
<bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
@@ -159,6 +161,11 @@
</bean>
<bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <!-- TODO: check depends -->
+ <depends>AspectLibrary</depends>
+
<install bean="ManagedDeploymentCreator" method="addAttachmentType">
<parameter>
<value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
@@ -172,10 +179,6 @@
<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 -->
- <depends>AspectLibrary</depends>
</bean>
<!-- EJB3 Cache Factory Registry -->
Modified: trunk/hornetq-int/src/resources/config/clustered/hornetq-jboss-beans.xml
===================================================================
--- trunk/hornetq-int/src/resources/config/clustered/hornetq-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/hornetq-int/src/resources/config/clustered/hornetq-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -15,9 +15,9 @@
<!-- The security manager -->
<bean name="HornetQSecurityManager" class="org.hornetq.integration.jboss.security.JBossASSecurityManager">
- <depends>JBossSecurityJNDIContextEstablishment</depends>
<start ignored="true"/>
<stop ignored="true"/>
+ <depends>JBossSecurityJNDIContextEstablishment</depends>
</bean>
<!-- The core server -->
Modified: trunk/hornetq-int/src/resources/config/non-clustered/hornetq-jboss-beans.xml
===================================================================
--- trunk/hornetq-int/src/resources/config/non-clustered/hornetq-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/hornetq-int/src/resources/config/non-clustered/hornetq-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -15,9 +15,9 @@
<!-- The security manager -->
<bean name="HornetQSecurityManager" class="org.hornetq.integration.jboss.security.JBossASSecurityManager">
- <depends>JBossSecurityJNDIContextEstablishment</depends>
<start ignored="true"/>
<stop ignored="true"/>
+ <depends>JBossSecurityJNDIContextEstablishment</depends>
</bean>
<!-- The core server -->
Modified: trunk/profileservice/src/resources/profileservice-jboss-beans.xml
===================================================================
--- trunk/profileservice/src/resources/profileservice-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/profileservice/src/resources/profileservice-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -35,6 +35,12 @@
-->
<bean name="ProfileServiceInvocationHandler"
class="org.jboss.profileservice.remoting.ProfileServiceInvocationHandler">
+
+ <property name="managementViewProxy"><inject bean="ProfileServiceProxyFactory" property="managementViewProxy"/></property>
+ <property name="deployMgrProxy"><inject bean="ProfileServiceProxyFactory" property="deployMgrProxy"/></property>
+ <property name="securityDomain">jmx-console</property>
+ <property name="securityManagement"><inject bean="JNDIBasedSecurityManagement"/></property>
+
<install bean="ConnectorMBean" method="addInvocationHandler">
<parameter class="java.lang.String">ProfileService</parameter>
<parameter class="org.jboss.remoting.ServerInvocationHandler"><this/></parameter>
@@ -42,10 +48,6 @@
<uninstall bean="ConnectorMBean" method="removeInvocationHandler">
<parameter>ProfileService</parameter>
</uninstall>
- <property name="managementViewProxy"><inject bean="ProfileServiceProxyFactory" property="managementViewProxy"/></property>
- <property name="deployMgrProxy"><inject bean="ProfileServiceProxyFactory" property="deployMgrProxy"/></property>
- <property name="securityDomain">jmx-console</property>
- <property name="securityManagement"><inject bean="JNDIBasedSecurityManagement"/></property>
</bean>
<!--
@@ -53,6 +55,14 @@
-->
<bean name="DeploymentInvocationHandler"
class="org.jboss.profileservice.management.upload.remoting.DeployHandler">
+
+ <property name="deployer"><inject bean="ProfileServiceDeployer"/></property>
+ <property name="profileService"><inject bean="ProfileService"/></property>
+ <property name="profileRepository"><inject bean="ProfileRepositoryFactory" /></property>
+ <property name="securityDomain">jmx-console</property>
+ <property name="securityManagement"><inject bean="JNDIBasedSecurityManagement"/></property>
+ <depends>TransientDeploymentsProfileManager</depends>
+
<install bean="ConnectorMBean" method="addInvocationHandler">
<parameter class="java.lang.String">DeploymentManager</parameter>
<parameter class="org.jboss.remoting.ServerInvocationHandler"><this/></parameter>
@@ -60,12 +70,6 @@
<uninstall bean="ConnectorMBean" method="removeInvocationHandler">
<parameter>DeploymentManager</parameter>
</uninstall>
- <property name="deployer"><inject bean="ProfileServiceDeployer"/></property>
- <property name="profileService"><inject bean="ProfileService"/></property>
- <property name="profileRepository"><inject bean="ProfileRepositoryFactory" /></property>
- <property name="securityDomain">jmx-console</property>
- <property name="securityManagement"><inject bean="JNDIBasedSecurityManagement"/></property>
- <depends>TransientDeploymentsProfileManager</depends>
</bean>
<bean name="TransientDeploymentsProfileManager"
@@ -106,6 +110,18 @@
The ManagementView plugin
-->
<bean name="ManagementView" class="org.jboss.profileservice.management.ManagementViewImpl">
+
+ <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="profileService"><inject bean="ProfileService"/></property>
+ <property name="attachmentStore"><inject bean="AttachmentStore" /></property>
+ <property name="deploymentManager"><inject bean="DeploymentManager"/></property>
+ <property name="defaultProfileKey"><inject bean="ApplicationsProfileKey"/></property>
+ <property name="dispatcher"><inject bean="RuntimeComponentDispatcher"/></property>
+ <property name="proxyFactory"><inject bean="ManagedOperationProxyFactory"/></property>
+ <property name="mbeanProxyFactory"><inject bean="MBeanManagedOperationProxyFactory"/></property>
+ <property name="bootstrapManagedDeployments"><inject bean="ProfileServiceBootstrap" property="bootstrapMDs"/></property>
+
<install bean="ProfileService" method="setViewManager">
<parameter>
<this/>
@@ -116,21 +132,13 @@
<null/>
</parameter>
</uninstall>
- <property name="mainDeployer"><inject bean="MainDeployer"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="profileService"><inject bean="ProfileService"/></property>
- <property name="attachmentStore"><inject bean="AttachmentStore" /></property>
- <property name="deploymentManager"><inject bean="DeploymentManager"/></property>
- <property name="defaultProfileKey"><inject bean="ApplicationsProfileKey"/></property>
- <property name="dispatcher"><inject bean="RuntimeComponentDispatcher"/></property>
- <property name="proxyFactory"><inject bean="ManagedOperationProxyFactory"/></property>
- <property name="mbeanProxyFactory"><inject bean="MBeanManagedOperationProxyFactory"/></property>
- <property name="bootstrapManagedDeployments"><inject bean="ProfileServiceBootstrap" property="bootstrapMDs"/></property>
+
<!-- Accept any implementor of DeploymentTemplate -->
<incallback method="addTemplate"/>
- <uncallback method="removeTemplate"/>
<!-- Accept any implementor of ManagedDeployment -->
<incallback method="addManagedMBeanDeployments"/>
+
+ <uncallback method="removeTemplate"/>
<uncallback method="removeManagedMBeanDeployments"/>
</bean>
@@ -139,6 +147,11 @@
-->
<bean name="DeploymentManager"
class="org.jboss.profileservice.management.upload.DeploymentManagerImpl">
+ <property name="defaultProfileKey"><inject bean="ApplicationsProfileKey"/></property>
+ <property name="profileRepository"><inject bean="ProfileRepositoryFactory"/></property>
+ <property name="locator"><inject bean="ConnectorMBean" property="invokerLocator"/></property>
+ <property name="remotingSubsystem">DeploymentManager</property>
+
<install bean="ProfileService" method="setDeploymentManager">
<parameter>
<this/>
@@ -149,10 +162,6 @@
<null/>
</parameter>
</uninstall>
- <property name="defaultProfileKey"><inject bean="ApplicationsProfileKey"/></property>
- <property name="profileRepository"><inject bean="ProfileRepositoryFactory"/></property>
- <property name="locator"><inject bean="ConnectorMBean" property="invokerLocator"/></property>
- <property name="remotingSubsystem">DeploymentManager</property>
</bean>
<!-- To remove the unsecure proxy binding, change the jndiName property to
@@ -206,6 +215,8 @@
<!-- Handle OpenType composite conversion to MetaType -->
<bean name="CompositeDataMetaValueBuilder"
class="org.jboss.managed.plugins.jmx.CompositeDataMetaValueBuilder">
+ <property name="metaValueFactory"><inject bean="MetaValueFactory"/></property>
+
<install bean="MetaValueFactory" method="setBuilder">
<parameter>
<value>javax.management.openmbean.CompositeDataSupport</value>
@@ -222,7 +233,6 @@
<null/>
</parameter>
</uninstall>
- <property name="metaValueFactory"><inject bean="MetaValueFactory"/></property>
</bean>
<!-- A MBeanDeploymentNameBuilder that just uses the name key as the name -->
Modified: trunk/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -41,13 +41,15 @@
<!-- The ManagedObjectFactory -->
<bean name="ManagedObjectFactory">
<constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/>
+ <property name="metaValueFactory"><inject bean="MetaValueFactory"/></property>
+
<!-- Accept any implementor of InstanceClassFactory -->
<incallback method="addInstanceClassFactory"/>
+ <incallback method="addManagedObjectDefinition"/>
+
<uncallback method="removeInstanceClassFactory"/>
<!-- Accept any ManagedObjectDefinition -->
- <incallback method="addManagedObjectDefinition"/>
<uncallback method="removeManagedObjectDefinition"/>
- <property name="metaValueFactory"><inject bean="MetaValueFactory"/></property>
</bean>
<!-- The ManagedObjectCreator implementation -->
<bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator">
@@ -96,10 +98,11 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.deployment:service=DeployersImpl", exposedInterface=org.jboss.deployers.plugins.deployers.DeployersImplMBean.class, registerDirectly=true)</annotation>
-->
<constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+ <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
+
<!-- Accept any implementor of deployer -->
<incallback method="addDeployer"/>
<uncallback method="removeDeployer"/>
- <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property>
</bean>
<!-- A declared structure descriptor deployer -->
@@ -211,6 +214,7 @@
<property name="suffix">jboss-beans.xml</property>
</bean>
<bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer">
+ <property name="mgtObjectCreator"><inject bean="KernelDeploymentManagedObjectCreator"/></property>
<install bean="ManagedDeploymentCreator" method="addAttachmentType">
<parameter>
<value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
@@ -224,7 +228,6 @@
<value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
</parameter>
</uninstall>
- <property name="mgtObjectCreator"><inject bean="KernelDeploymentManagedObjectCreator"/></property>
</bean>
<bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
<constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
Modified: trunk/server/src/etc/conf/all/bootstrap/profile.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/profile.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/server/src/etc/conf/all/bootstrap/profile.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -126,9 +126,9 @@
<property name="checker"><inject bean="StructureModificationChecker" /></property>
<!-- Accept any RepositoryClusteringHandler -->
<incallback method="addRepositoryClusteringHandler" />
- <uncallback method="removeRepositoryClusteringHandler" />
<!-- Accept any LocalContentManagerFactory -->
<incallback method="addLocalContentManagerFactory" />
+ <uncallback method="removeRepositoryClusteringHandler" />
<uncallback method="removeLocalContentManagerFactory" />
</bean>
@@ -155,9 +155,9 @@
<constructor><parameter><inject bean="ManagedObjectFactory" /></parameter></constructor>
<!-- Accept any ComponentMapper -->
<incallback method="addComponentMapper" />
- <uncallback method="removeComponentMapper" />
<!-- Accept any ManagedObjectPersistencePlugin -->
<incallback method="addPersistencePlugin" />
+ <uncallback method="removeComponentMapper" />
<uncallback method="removePersistencePlugin" />
</bean>
Modified: trunk/server/src/etc/conf/default/bootstrap/profile.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/profile.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/server/src/etc/conf/default/bootstrap/profile.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -117,9 +117,10 @@
<constructor><parameter><inject bean="ManagedObjectFactory" /></parameter></constructor>
<!-- Accept any ComponentMapper -->
<incallback method="addComponentMapper" />
+ <incallback method="addPersistencePlugin" />
+
<uncallback method="removeComponentMapper" />
<!-- Accept any ManagedObjectPersistencePlugin -->
- <incallback method="addPersistencePlugin" />
<uncallback method="removePersistencePlugin" />
</bean>
Modified: trunk/server/src/etc/conf/standard/ear-deployer-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/conf/standard/ear-deployer-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/server/src/etc/conf/standard/ear-deployer-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -29,6 +29,11 @@
</bean>
<!-- jboss-app.xml parsing deployer -->
<bean name="JBossAppParsingDeployer" class="org.jboss.deployment.JBossAppParsingDeployer">
+ <property name="callByValue">true</property>
+
+ <!-- Specify an unauthenticated identity -->
+ <property name="unauthenticatedIdentity">anonymous</property>
+
<install bean="ManagedDeploymentCreator" method="addAttachmentType">
<parameter>
<value>org.jboss.metadata.ear.jboss.JBossAppMetaData</value>
@@ -45,10 +50,6 @@
<!-- A flag indicating if the ear components should have in VM call
optimization disabled.
-->
- <property name="callByValue">true</property>
-
- <!-- Specify an unauthenticated identity -->
- <property name="unauthenticatedIdentity">anonymous</property>
</bean>
<bean name="EARClassLoaderDeployer" class="org.jboss.deployment.EarClassLoaderDeployer">
<!-- A flag indicating if ear deployments should have their own scoped
Modified: trunk/server/src/etc/deploy/transaction-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/transaction-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/server/src/etc/deploy/transaction-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -246,9 +246,9 @@
<bean name="UserTransactionRegistry" class="org.jboss.tm.usertx.UserTransactionRegistry">
<!-- Register providers -->
<incallback method="addProvider"/>
- <uncallback method="removeProvider"/>
<!-- Register listeners -->
<incallback method="addListener"/>
+ <uncallback method="removeProvider"/>
<uncallback method="removeListener"/>
</bean>
Modified: trunk/server/src/etc/deployers/ear-deployer-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/ear-deployer-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/server/src/etc/deployers/ear-deployer-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -29,6 +29,14 @@
</bean>
<!-- jboss-app.xml parsing deployer -->
<bean name="JBossAppParsingDeployer" class="org.jboss.deployment.JBossAppParsingDeployer">
+ <!-- A flag indicating if the ear components should have in VM call
+ optimization disabled.
+ -->
+ <property name="callByValue">false</property>
+
+ <!-- Specify an unauthenticated identity -->
+ <property name="unauthenticatedIdentity">anonymous</property>
+
<install bean="ManagedDeploymentCreator" method="addAttachmentType">
<parameter>
<value>org.jboss.metadata.ear.jboss.JBossAppMetaData</value>
@@ -42,13 +50,7 @@
<value>org.jboss.metadata.ear.jboss.JBossAppMetaData</value>
</parameter>
</uninstall>
- <!-- A flag indicating if the ear components should have in VM call
- optimization disabled.
- -->
- <property name="callByValue">false</property>
-
- <!-- Specify an unauthenticated identity -->
- <property name="unauthenticatedIdentity">anonymous</property>
+
</bean>
<bean name="EARClassLoaderDeployer" class="org.jboss.deployment.EarClassLoaderDeployer">
<!-- A flag indicating if ear deployments should have their own scoped
Modified: trunk/server/src/etc/deployers/ejb-deployer-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/ejb-deployer-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/server/src/etc/deployers/ejb-deployer-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -22,28 +22,6 @@
<bean name="EjbClassLoaderDeployer" class="org.jboss.deployment.EjbClassLoaderDeployer"/>
<bean name="EJB2xDeployer" class="org.jboss.ejb.deployers.EjbDeployer">
- <install bean="ManagedDeploymentCreator" method="addVersionedAttachmentType">
- <parameter>
- <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
- </parameter>
- <parameter>
- <value>ejb2x</value>
- </parameter>
- <parameter>
- <value>[1-2].*</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>ejb2x</value>
- </parameter>
- </uninstall>
<!-- The EJBDeployer needs the JTA transaction manager service -->
<property name="transactionManagerServiceName">jboss:service=TransactionManager</property>
<!-- The dynamic class loading simple web server -->
@@ -85,6 +63,29 @@
-->
<property name="strictVerifier">true</property>
+ <install bean="ManagedDeploymentCreator" method="addVersionedAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+ </parameter>
+ <parameter>
+ <value>ejb2x</value>
+ </parameter>
+ <parameter>
+ <value>[1-2].*</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>ejb2x</value>
+ </parameter>
+ </uninstall>
+
</bean>
<bean name="MergedJBossMetaDataDeployer" class="org.jboss.ejb.deployers.MergedJBossMetaDataDeployer">
Modified: trunk/tomcat/src/resources/jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/tomcat/src/resources/jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -6,6 +6,13 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.web:service=WebServer", exposedInterface=org.jboss.web.tomcat.service.deployers.TomcatServiceMBean.class,registerDirectly=true)</annotation>
+ <!-- Inject the TomcatDeployer -->
+ <property name="tomcatDeployer"><inject bean="WarDeployer"/></property>
+ <!-- Set the securityManagerService used to flush the auth cache on session expiration -->
+ <property name="securityManagerService">
+ <inject bean="jboss.security:service=JaasSecurityManager" />
+ </property>
+
<!-- Only needed if the org.jboss.web.tomcat.service.jca.CachedConnectionValve
is enabled in the tomcat server.xml file.
-->
@@ -17,12 +24,6 @@
<!-- Uncomment to enable mod_cluster integration -->
<!--depends>ModClusterListener</depends-->
- <!-- Inject the TomcatDeployer -->
- <property name="tomcatDeployer"><inject bean="WarDeployer"/></property>
- <!-- Set the securityManagerService used to flush the auth cache on session expiration -->
- <property name="securityManagerService">
- <inject bean="jboss.security:service=JaasSecurityManager" />
- </property>
<!--
Do not configure other JMX attributes via this file.
Use the WarDeployer bean in deployers/jboss-web.deployer/war-deployers-beans.xml
Modified: trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -72,20 +72,6 @@
<!-- 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>
-
<!-- Inject the MainDeployer for resolving cross deployment refs -->
<property name="mainDeployer"><inject bean="MainDeployer" /></property>
@@ -167,6 +153,21 @@
<!-- Specify a SecurityContext FQN class name -->
<property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property>
+
+ <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>
+
</bean>
<bean name="MergedJBossWebMetaDataDeployer"
Modified: trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-jboss-beans.xml 2010-04-23 17:02:05 UTC (rev 104204)
+++ trunk/tomcat/src/resources/war-deployers-jboss-beans.xml 2010-04-23 17:16:26 UTC (rev 104205)
@@ -149,19 +149,6 @@
<!-- 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>
<!-- Inject the MainDeployer for resolving cross deployment refs -->
<property name="mainDeployer"><inject bean="MainDeployer" /></property>
@@ -244,6 +231,21 @@
<!-- Specify a SecurityContext FQN class name -->
<property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property>
+
+ <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>
+
</bean>
<bean name="MergedJBossWebMetaDataDeployer"
More information about the jboss-cvs-commits
mailing list