[Jboss-cvs] JBossAS SVN: r55836 - branches/MC_VDF_WORK/server/src/etc/conf/default

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

Author: scott.stark at jboss.org
Date: 2006-08-11 15:38:01 -0400 (Fri, 11 Aug 2006)
New Revision: 55836

Modified:
   branches/MC_VDF_WORK/server/src/etc/conf/default/deployer-beans.xml
Log:
Add the server/conf dir to the JMXClassLoader path and deploy the conf/jboss-service.xml static mbeans.

Modified: branches/MC_VDF_WORK/server/src/etc/conf/default/deployer-beans.xml
===================================================================
--- branches/MC_VDF_WORK/server/src/etc/conf/default/deployer-beans.xml	2006-08-11 19:35:24 UTC (rev 55835)
+++ branches/MC_VDF_WORK/server/src/etc/conf/default/deployer-beans.xml	2006-08-11 19:38:01 UTC (rev 55836)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- A ProfileServiceBootstrap bootstrap descriptor that uses the simple
-VFSDeploymentScanner that goes directly to the MainDeployer rather than the
-ProfileService.
-$Id:$
+   VFSDeploymentScanner that goes directly to the MainDeployer rather than the
+   ProfileService.
+   $Id:$
 -->
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
@@ -15,7 +15,7 @@
       </constructor>
       <property name="profileRoot">${jboss.server.home.url}/profile</property>
    </bean>
-
+   
    <!-- The MainDeployer -->
    <bean name="MainDeployer" class="org.jboss.deployers.plugins.MainDeployerImpl">
       <property name="VFSFactory"><inject bean="VFSFactory"/></property>
@@ -32,7 +32,7 @@
    <!-- The factory for VFS instances -->
    <bean name="VFSFactory" class="org.jboss.vfs.file.DefaultVFSFactory">
    </bean>
-
+   
    <!-- Deployers. Declaration order defines the deployer chain order
    -->
    <bean name="ClassLoadingDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDeployer">
@@ -41,22 +41,23 @@
    </bean>
    <bean name="JARDeployer" class="org.jboss.deployers.plugins.jar.JARDeployer">
    </bean>
-
+   
    <!-- Load the jboss jmx classes -->
    <bean name="JMXClassLoader" class="org.jboss.vfs.classloading.VFSClassLoader">
       <constructor factoryClass="org.jboss.vfs.classloading.VFSClassLoaderFactory"
-                   factoryMethod="newClassLoader">
+         factoryMethod="newClassLoader">
          <parameter class="java.net.URL">${jboss.home.url}</parameter>
          <parameter>
-         	<array class="[Ljava.lang.String;" elementClass="java.lang.String">
-	         	<value>lib/dom4j.jar</value>
-	         	<value>lib/jboss-j2se.jar</value>
-	         	<value>lib/jboss-jmx.jar</value>
-	         	<value>lib/jboss-mbeans.jar</value>
-	         	<value>lib/jboss-system-jmx.jar</value>
+            <array class="[Ljava.lang.String;" elementClass="java.lang.String">
+               <value>lib/dom4j.jar</value>
+               <value>lib/jboss-j2se.jar</value>
+               <value>lib/jboss-jmx.jar</value>
+               <value>lib/jboss-mbeans.jar</value>
+               <value>lib/jboss-system-jmx.jar</value>
                <value>server/${jboss.server.name}/lib/*.jar</value>
-         	</array>
-         	</parameter>
+               <value>server/${jboss.server.name}/conf/</value>
+            </array>
+         </parameter>
          <parameter><inject bean="VFSFactory"/></parameter>
       </constructor>
    </bean>
@@ -67,24 +68,29 @@
       <property name="server"><inject bean="JMXKernel" property="mbeanServer" /></property>
       <property name="serviceController"><inject bean="JMXKernel" property="serviceController" /></property>
    </bean>
-	<!-- A bean that setups a jboss-4.0.x type of jmx kernel to support the
-		the legacy mbean deployments handled by the SARDeployer
-	-->
+   <!-- A bean that setups a jboss-4.0.x type of jmx kernel to support the
+      the legacy mbean deployments handled by the SARDeployer
+   -->
    <bean name="JMXKernel" class="org.jboss.system.server.jmx.JMXKernel">
       <classloader><inject bean="JMXClassLoader"/></classloader>
       <property name="serverImpl"><inject bean="org.jboss.system.server.Server"/></property>
    </bean>
-
+   
    <!-- Hot deployment service that directly uses the MainDeployer -->
    <bean name="VFSDeploymentScanner" class="org.jboss.deployers.plugins.scanner.VFSDeploymentScannerImpl">
       <classloader><inject bean="JMXClassLoader"/></classloader>
       <property name="mainDeployer"><inject bean="MainDeployer"/></property>
       <property name="VFSFactory"><inject bean="MainDeployer" property="VFSFactory" /></property>
       <property name="URIList">
-         <list elementClass="java.net.URI"><value>${jboss.server.home.url}/deploy/</value></list>
+         <list elementClass="java.net.URI">
+            <!-- Legacy static conf/jboss-service.xml -->
+            <value>${jboss.server.home.url}/conf/jboss-service.xml</value>
+            <!-- Standard hot deployment directory -->
+            <value>${jboss.server.home.url}/deploy/</value>
+         </list>
       </property>
       <property name="scanPeriod"><value>500000</value></property>
       <demand state="Instantiated">Deployers</demand>
    </bean>
-	
+   
 </deployment>