[Jboss-cvs] JBossAS SVN: r56910 - in branches/MC_VDF_WORK: aspects/src/resources/META-INF connector/src/resources/jca-sar messaging/src/etc/server/default/deploy server/src/etc/conf/default server/src/etc/deploy server/src/resources/client-deployer server/src/resources/jmx-invoker-adaptor/META-INF tomcat/src/resources varia/src/resources/kernel/META-INF
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Sep 16 08:15:13 EDT 2006
Author: adrian at jboss.org
Date: 2006-09-16 08:14:55 -0400 (Sat, 16 Sep 2006)
New Revision: 56910
Modified:
branches/MC_VDF_WORK/aspects/src/resources/META-INF/jboss-service.xml
branches/MC_VDF_WORK/connector/src/resources/jca-sar/jbossjca-service.xml
branches/MC_VDF_WORK/messaging/src/etc/server/default/deploy/hsqldb-jdbc2-service.xml
branches/MC_VDF_WORK/server/src/etc/conf/default/jboss-service.xml
branches/MC_VDF_WORK/server/src/etc/deploy/bsh-deployer.xml
branches/MC_VDF_WORK/server/src/etc/deploy/ear-deployer.xml
branches/MC_VDF_WORK/server/src/etc/deploy/ejb-deployer.xml
branches/MC_VDF_WORK/server/src/resources/client-deployer/client-deployer-service.xml
branches/MC_VDF_WORK/server/src/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml
branches/MC_VDF_WORK/tomcat/src/resources/jboss-service.xml
branches/MC_VDF_WORK/varia/src/resources/kernel/META-INF/jboss-service.xml
Log:
Reinstate the MainDeployer and ServiceDeployer by adding them
to the top of conf/jboss-service.xml
The MainDeployer is not used, except that the old deployers need
it registered to create a proxy.
The old ServiceDeployer is used by the JCA deployer.
Also fixed some MBean depenedencies.
Modified: branches/MC_VDF_WORK/aspects/src/resources/META-INF/jboss-service.xml
===================================================================
--- branches/MC_VDF_WORK/aspects/src/resources/META-INF/jboss-service.xml 2006-09-16 11:36:27 UTC (rev 56909)
+++ branches/MC_VDF_WORK/aspects/src/resources/META-INF/jboss-service.xml 2006-09-16 12:14:55 UTC (rev 56910)
@@ -46,6 +46,7 @@
<mbean code="org.jboss.aop.deployment.AspectDeployer"
name="jboss.aop:service=AspectDeployer">
+ <depends>jboss.system:service=MainDeployer</depends>
</mbean>
</server>
Modified: branches/MC_VDF_WORK/connector/src/resources/jca-sar/jbossjca-service.xml
===================================================================
--- branches/MC_VDF_WORK/connector/src/resources/jca-sar/jbossjca-service.xml 2006-09-16 11:36:27 UTC (rev 56909)
+++ branches/MC_VDF_WORK/connector/src/resources/jca-sar/jbossjca-service.xml 2006-09-16 12:14:55 UTC (rev 56910)
@@ -42,6 +42,7 @@
name="jboss.jca:service=RARDeployer">
<depends optional-attribute-name="WorkManagerName">jboss.jca:service=WorkManager</depends>
<depends optional-attribute-name="XATerminatorName">jboss:service=TransactionManager</depends>
+ <depends>jboss.system:service=MainDeployer</depends>
</mbean>
<mbean code="org.jboss.deployment.XSLSubDeployer" name="jboss.jca:service=ConnectionFactoryDeployer">
@@ -49,6 +50,7 @@
<attribute name="EnhancedSuffixes">300:-ds.xml</attribute>
<attribute name="XslUrl">stylesheets/ConnectionFactoryTemplate.xsl</attribute>
<attribute name="ValidateDTDs">false</attribute>
+ <depends>jboss.system:service=ServiceDeployer</depends>
</mbean>
<!-- Experimental for new DsSubDeployer support
Modified: branches/MC_VDF_WORK/messaging/src/etc/server/default/deploy/hsqldb-jdbc2-service.xml
===================================================================
--- branches/MC_VDF_WORK/messaging/src/etc/server/default/deploy/hsqldb-jdbc2-service.xml 2006-09-16 11:36:27 UTC (rev 56909)
+++ branches/MC_VDF_WORK/messaging/src/etc/server/default/deploy/hsqldb-jdbc2-service.xml 2006-09-16 12:14:55 UTC (rev 56910)
@@ -33,7 +33,7 @@
name="jboss.mq:service=MessageCache">
<attribute name="HighMemoryMark">50</attribute>
<attribute name="MaxMemoryMark">60</attribute>
- <attribute name="CacheStore">jboss.mq:service=PersistenceManager</attribute>
+ <depends optional-attribute-name="CacheStore">jboss.mq:service=PersistenceManager</depends>
</mbean>
<!--
Modified: branches/MC_VDF_WORK/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- branches/MC_VDF_WORK/server/src/etc/conf/default/jboss-service.xml 2006-09-16 11:36:27 UTC (rev 56909)
+++ branches/MC_VDF_WORK/server/src/etc/conf/default/jboss-service.xml 2006-09-16 12:14:55 UTC (rev 56910)
@@ -15,6 +15,21 @@
<classpath codebase="${jboss.server.lib.url:lib}" archives="*"/>
<!-- ==================================================================== -->
+ <!-- Main Deployer -->
+ <!-- ==================================================================== -->
+ <mbean code="org.jboss.deployment.MainDeployer"
+ name="jboss.system:service=MainDeployer">
+ </mbean>
+
+ <!-- ==================================================================== -->
+ <!-- SAR Deployer -->
+ <!-- ==================================================================== -->
+ <mbean code="org.jboss.deployment.SARDeployer"
+ name="jboss.system:service=ServiceDeployer">
+ <depends>jboss.system:service=MainDeployer</depends>
+ </mbean>
+
+ <!-- ==================================================================== -->
<!-- JSR-77 Single JBoss Server Management Domain -->
<!-- ==================================================================== -->
<mbean code="org.jboss.management.j2ee.LocalJBossServerDomain"
@@ -33,6 +48,7 @@
<attribute name="JTAService">jboss:service=TransactionManager</attribute>
<attribute name="UserTransactionService">jboss:service=DistributedTransactionManager</attribute>
<attribute name="RMI_IIOPService">jboss:service=CorbaORB</attribute>
+ <depends>jboss.system:service=MainDeployer</depends>
</mbean>
<!-- ==================================================================== -->
@@ -261,6 +277,7 @@
<mbean code="org.jboss.security.plugins.SecurityConfig"
name="jboss.security:service=SecurityConfig">
<attribute name="LoginConfig">jboss.security:service=XMLLoginConfig</attribute>
+ <depends>jboss.security:service=XMLLoginConfig</depends>
</mbean>
<mbean code="org.jboss.security.auth.login.XMLLoginConfig"
name="jboss.security:service=XMLLoginConfig">
Modified: branches/MC_VDF_WORK/server/src/etc/deploy/bsh-deployer.xml
===================================================================
--- branches/MC_VDF_WORK/server/src/etc/deploy/bsh-deployer.xml 2006-09-16 11:36:27 UTC (rev 56909)
+++ branches/MC_VDF_WORK/server/src/etc/deploy/bsh-deployer.xml 2006-09-16 12:14:55 UTC (rev 56910)
@@ -8,5 +8,6 @@
-->
<mbean code="org.jboss.varia.deployment.BeanShellSubDeployer"
name="jboss.deployer:service=BSHDeployer">
+ <depends>jboss.system:service=MainDeployer</depends>
</mbean>
</server>
Modified: branches/MC_VDF_WORK/server/src/etc/deploy/ear-deployer.xml
===================================================================
--- branches/MC_VDF_WORK/server/src/etc/deploy/ear-deployer.xml 2006-09-16 11:36:27 UTC (rev 56909)
+++ branches/MC_VDF_WORK/server/src/etc/deploy/ear-deployer.xml 2006-09-16 12:14:55 UTC (rev 56910)
@@ -15,5 +15,6 @@
optimization disabled.
-->
<attribute name="CallByValue">false</attribute>
+ <depends>jboss.system:service=MainDeployer</depends>
</mbean>
</server>
Modified: branches/MC_VDF_WORK/server/src/etc/deploy/ejb-deployer.xml
===================================================================
--- branches/MC_VDF_WORK/server/src/etc/deploy/ejb-deployer.xml 2006-09-16 11:36:27 UTC (rev 56909)
+++ branches/MC_VDF_WORK/server/src/etc/deploy/ejb-deployer.xml 2006-09-16 12:14:55 UTC (rev 56910)
@@ -293,6 +293,7 @@
<depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends>
<!-- The dynamic class loading simple web server -->
<depends optional-attribute-name="WebServiceName">jboss:service=WebService</depends>
+ <depends>jboss.system:service=MainDeployer</depends>
</mbean>
Modified: branches/MC_VDF_WORK/server/src/resources/client-deployer/client-deployer-service.xml
===================================================================
--- branches/MC_VDF_WORK/server/src/resources/client-deployer/client-deployer-service.xml 2006-09-16 11:36:27 UTC (rev 56909)
+++ branches/MC_VDF_WORK/server/src/resources/client-deployer/client-deployer-service.xml 2006-09-16 12:14:55 UTC (rev 56910)
@@ -5,7 +5,8 @@
<server>
<mbean code="org.jboss.deployment.ClientDeployer"
name="jboss.j2ee:service=ClientDeployer"
- xmbean-dd="client-deployer-xmbean.xml" />
+ xmbean-dd="client-deployer-xmbean.xml">
+ <depends>jboss.system:service=MainDeployer</depends>
<!--
<xmbean>
<description>The J2EE Application Client Deployer</description>
@@ -41,7 +42,7 @@
<name>destroy</name>
</operation>
</xmbean>
+ -->
</mbean>
- -->
</server>
Modified: branches/MC_VDF_WORK/server/src/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml
===================================================================
--- branches/MC_VDF_WORK/server/src/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml 2006-09-16 11:36:27 UTC (rev 56909)
+++ branches/MC_VDF_WORK/server/src/resources/jmx-invoker-adaptor/META-INF/jboss-service.xml 2006-09-16 12:14:55 UTC (rev 56910)
@@ -38,6 +38,7 @@
<mbean code="org.jboss.naming.NamingAlias" name="jboss.jmx:alias=jmx/rmi/RMIAdaptor">
<attribute name="FromName">jmx/rmi/RMIAdaptor</attribute>
<attribute name="ToName">jmx/invoker/RMIAdaptor</attribute>
+ <depends>jboss:service=Naming</depends>
</mbean>
<!-- This is the service that handles the RMIAdaptor invocations by routing
Modified: branches/MC_VDF_WORK/tomcat/src/resources/jboss-service.xml
===================================================================
--- branches/MC_VDF_WORK/tomcat/src/resources/jboss-service.xml 2006-09-16 11:36:27 UTC (rev 56909)
+++ branches/MC_VDF_WORK/tomcat/src/resources/jboss-service.xml 2006-09-16 12:14:55 UTC (rev 56910)
@@ -171,6 +171,7 @@
is enabled in the tomcat server.xml file
<depends>jboss.jca:service=CachedConnectionManager</depends>
-->
+ <depends>jboss.system:service=MainDeployer</depends>
</mbean>
</server>
Modified: branches/MC_VDF_WORK/varia/src/resources/kernel/META-INF/jboss-service.xml
===================================================================
--- branches/MC_VDF_WORK/varia/src/resources/kernel/META-INF/jboss-service.xml 2006-09-16 11:36:27 UTC (rev 56909)
+++ branches/MC_VDF_WORK/varia/src/resources/kernel/META-INF/jboss-service.xml 2006-09-16 12:14:55 UTC (rev 56910)
@@ -10,6 +10,7 @@
<attribute name="Extension">.beans</attribute>
<attribute name="MetaDataURL">META-INF/jboss-beans.xml</attribute>
+ <depends>jboss.system:service=MainDeployer</depends>
</mbean>
</server>
More information about the jboss-cvs-commits
mailing list