[jboss-cvs] JBossAS SVN: r75804 - in projects/demos/trunk: bootstrap/src/resources and 4 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Jul 14 16:26:03 EDT 2008


Author: alesj
Date: 2008-07-14 16:26:03 -0400 (Mon, 14 Jul 2008)
New Revision: 75804

Added:
   projects/demos/trunk/bootstrap/src/resources/META-INF/
   projects/demos/trunk/bootstrap/src/resources/META-INF/bootstrap-beans-bak.xml
   projects/demos/trunk/bootstrap/src/resources/META-INF/bootstrap-beans.xml
   projects/demos/trunk/jmx/src/resources/META-INF/
   projects/demos/trunk/jmx/src/resources/META-INF/aop-beans.xml
   projects/demos/trunk/jmx/src/resources/META-INF/system-jmx-beans.xml
   projects/demos/trunk/jmx/src/resources/META-INF/varia-deployers-beans.xml
Removed:
   projects/demos/trunk/bootstrap/src/resources/bootstrap-beans-bak.xml
   projects/demos/trunk/bootstrap/src/resources/bootstrap-beans.xml
   projects/demos/trunk/jmx/src/resources/aop-beans.xml
   projects/demos/trunk/jmx/src/resources/system-jmx-beans.xml
   projects/demos/trunk/jmx/src/resources/varia-deployers-beans.xml
Modified:
   projects/demos/trunk/bootstrap/src/main/org/jboss/demos/boostrap/HDScanner.java
   projects/demos/trunk/bootstrap/src/main/org/jboss/demos/boostrap/Main.java
   projects/demos/trunk/jmx/src/main/org/jboss/demos/bootstrap/jmx/JMXMain.java
Log:
Move resources to META-INF.

Modified: projects/demos/trunk/bootstrap/src/main/org/jboss/demos/boostrap/HDScanner.java
===================================================================
--- projects/demos/trunk/bootstrap/src/main/org/jboss/demos/boostrap/HDScanner.java	2008-07-14 20:15:41 UTC (rev 75803)
+++ projects/demos/trunk/bootstrap/src/main/org/jboss/demos/boostrap/HDScanner.java	2008-07-14 20:26:03 UTC (rev 75804)
@@ -52,10 +52,16 @@
    private VirtualFile root;
    private Map<String, Long> files = new HashMap<String, Long>();
 
-   public HDScanner(MainDeployerHelper helper, File file) throws IOException
+   public HDScanner(MainDeployerHelper helper, String path) throws IOException
    {
+      File dir = new File(path);
+      if (dir.exists() == false)
+         throw new IOException("No such path: " + path);
+      if (dir.isDirectory() == false)
+         throw new IOException("Path doesn't denote directory: " + dir);
+
       this.helper = helper;
-      this.root = VFS.getRoot(file.toURI());
+      this.root = VFS.getRoot(dir.toURI());
    }
 
    public void setScanThreadName(String scanThreadName)

Modified: projects/demos/trunk/bootstrap/src/main/org/jboss/demos/boostrap/Main.java
===================================================================
--- projects/demos/trunk/bootstrap/src/main/org/jboss/demos/boostrap/Main.java	2008-07-14 20:15:41 UTC (rev 75803)
+++ projects/demos/trunk/bootstrap/src/main/org/jboss/demos/boostrap/Main.java	2008-07-14 20:26:03 UTC (rev 75804)
@@ -48,7 +48,7 @@
    {
       try
       {
-         String rootString = "/projects/demos/bootstrap/src/resources/bootstrap-beans.xml";
+         String rootString = "/projects/demos/bootstrap/src/resources/META-INF/bootstrap-beans.xml";
          if (args.length > 0)
             rootString = args[0];
          System.out.println("Using bootstrap: " + rootString);

Copied: projects/demos/trunk/bootstrap/src/resources/META-INF/bootstrap-beans-bak.xml (from rev 75793, projects/demos/trunk/bootstrap/src/resources/bootstrap-beans-bak.xml)
===================================================================
--- projects/demos/trunk/bootstrap/src/resources/META-INF/bootstrap-beans-bak.xml	                        (rev 0)
+++ projects/demos/trunk/bootstrap/src/resources/META-INF/bootstrap-beans-bak.xml	2008-07-14 20:26:03 UTC (rev 75804)
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   The bootstrap of the server. This should only have the minimum
+   needed to bootstrap the mc kernel and profile service.
+   $Id:$
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- The MainDeployer -->
+   <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+      <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
+      <property name="deployers"><inject bean="Deployers"/></property>
+      <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
+   </bean>
+
+   <!-- The ManagedDeploymentCreator implementation -->
+   <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.DefaultManagedDeploymentCreator" />
+
+   <!-- The holder for deployers that determine structure -->
+   <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
+      <property name="structureBuilder">
+         <!-- The consolidator of the structure information -->
+         <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/>
+      </property>
+      <!-- Accept any implementor of structure deployer -->
+      <incallback method="addDeployer"/>
+      <uncallback method="removeDeployer"/>
+   </bean>
+
+   <!-- The holder for deployers that do real deployment -->
+   <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+      <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+      <!-- Accept any implementor of deployer -->
+      <incallback method="addDeployer"/>
+      <uncallback method="removeDeployer"/>
+   </bean>
+
+   <!-- A declared structure descriptor deployer -->
+   <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
+
+    <!-- JAR Structure -->
+    <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
+       <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop -->
+       <constructor>
+          <parameter>
+             <set elementClass="java.lang.String">
+                <value>.zip</value>
+                <value>.ear</value>
+                <value>.jar</value>
+                <value>.rar</value>
+                <value>.war</value>
+                <value>.sar</value>
+                <value>.har</value>
+                <value>.aop</value>
+                <value>.deployer</value>
+                <value>.beans</value>
+             </set>
+          </parameter>
+       </constructor>
+       <property name="candidateStructureVisitorFactory">
+          <!-- Any file that is not an ordinary directory is a candidate -->
+          <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
+             <!-- A filter to exclude some obvious non-subdeployments -->
+             <property name="filter">
+                <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+                   <constructor><parameter>
+                      <list elementClass="java.lang.String">
+                         <!-- Exclude class files as subdeployments -->
+                         <value>.class</value>
+                      </list>
+                   </parameter></constructor>
+                </bean>
+             </property>
+          </bean>
+       </property>
+    </bean>
+
+    <!-- File Structure -->
+    <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
+       <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
+       <constructor>
+          <parameter>
+             <set elementClass="java.lang.String">
+                <value>-service.xml</value>
+                <value>-beans.xml</value>
+                <value>-ds.xml</value>
+                <value>-aop.xml</value>
+             </set>
+          </parameter>
+       </constructor>
+    </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="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>
+
+   <!-- VFS ClassLoader -->
+   <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
+      <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
+   </bean>
+   <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
+      <incallback method="addModule" state="Configured"/>
+      <uncallback method="removeModule" state="Configured"/>
+   </bean>
+
+   <!--<bean name="CustomClassLoadingMetaDataParser" class="org.jboss.demos.system.deployers.PropertyClassloaderMetaDataDeployer"/>-->
+
+<!--
+   <bean name="ManifestParser" class="org.jboss.osgi.plugins.deployers.OSGiMetaDataDeployer"/>
+   <bean name="OSGi2ClassLoadingMetaDataDeployer" class="org.jboss.osgi.plugins.deployers.OSGiMetaData2ClassLoadingMetaDataDeployer"/>
+-->
+
+   <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+      <constructor>
+         <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
+      </constructor>
+      <property name="name">jboss-classloading.xml</property>
+   </bean>
+
+   <bean name="ClassloadingDeployer" class="org.jboss.demos.system.deployers.ClassloadingDescribeDeployer">
+     <property name="classLoading"><inject bean="ClassLoading"/></property>
+   </bean>
+   <bean name="VFSClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
+      <property name="classLoading"><inject bean="ClassLoading"/></property>
+      <property name="system"><inject bean="ClassLoaderSystem"/></property>
+   </bean>
+
+   <!-- Hotdeployment of applications -->
+
+   <bean name="MainDeployerHelper" class="org.jboss.demos.boostrap.MainDeployerHelper">
+      <constructor>
+         <parameter><inject bean="MainDeployer"/></parameter>
+      </constructor>
+   </bean>
+
+   <bean name="HDScanner" class="org.jboss.demos.boostrap.HDScanner">
+      <constructor>
+         <parameter><inject bean="MainDeployerHelper"/></parameter>
+         <parameter>C:\\projects\\demos\\osgi\\boot\\work</parameter>
+      </constructor>
+      <property name="scanPeriod">10000</property>
+      <property name="scanThreadName">HDScanner</property>
+   </bean>
+
+</deployment>

Copied: projects/demos/trunk/bootstrap/src/resources/META-INF/bootstrap-beans.xml (from rev 75793, projects/demos/trunk/bootstrap/src/resources/bootstrap-beans.xml)
===================================================================
--- projects/demos/trunk/bootstrap/src/resources/META-INF/bootstrap-beans.xml	                        (rev 0)
+++ projects/demos/trunk/bootstrap/src/resources/META-INF/bootstrap-beans.xml	2008-07-14 20:26:03 UTC (rev 75804)
@@ -0,0 +1,127 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- The MainDeployer -->
+   <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
+      <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
+      <property name="deployers"><inject bean="Deployers"/></property>
+      <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
+   </bean>
+
+   <!-- The ManagedDeploymentCreator implementation -->
+   <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.DefaultManagedDeploymentCreator" />
+
+   <!-- The holder for deployers that determine structure -->
+   <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
+      <property name="structureBuilder">
+         <!-- The consolidator of the structure information -->
+         <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/>
+      </property>
+      <!-- Accept any implementor of structure deployer -->
+      <incallback method="addDeployer"/>
+      <uncallback method="removeDeployer"/>
+   </bean>
+
+   <!-- The holder for deployers that do real deployment -->
+   <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+      <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+      <!-- Accept any implementor of deployer -->
+      <incallback method="addDeployer"/>
+      <uncallback method="removeDeployer"/>
+   </bean>
+
+   <!-- A declared structure descriptor deployer -->
+   <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
+
+    <!-- JAR Structure -->
+    <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
+       <property name="candidateStructureVisitorFactory">
+          <!-- Any file that is not an ordinary directory is a candidate -->
+          <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
+             <!-- A filter to exclude some obvious non-subdeployments -->
+             <property name="filter">
+                <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
+                   <constructor><parameter>
+                      <list elementClass="java.lang.String">
+                         <!-- Exclude class files as subdeployments -->
+                         <value>.class</value>
+                      </list>
+                   </parameter></constructor>
+                </bean>
+             </property>
+          </bean>
+       </property>
+    </bean>
+
+    <!-- File Structure -->
+    <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
+       <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
+       <constructor>
+          <parameter>
+             <set elementClass="java.lang.String">
+                <value>-service.xml</value>
+                <value>-beans.xml</value>
+                <value>-ds.xml</value>
+                <value>-aop.xml</value>
+             </set>
+          </parameter>
+       </constructor>
+    </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="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
+      <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
+      <property name="type">beans</property>
+   </bean>
+
+   <!-- VFS ClassLoader -->
+   <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
+      <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
+   </bean>
+   <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
+      <incallback method="addModule" state="Configured"/>
+      <uncallback method="removeModule" state="Configured"/>
+   </bean>
+   <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+      <constructor>
+         <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
+      </constructor>
+      <property name="name">jboss-classloading.xml</property>
+      <property name="buildManagedObject">true</property>
+   </bean>
+   <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
+      <property name="defaultMetaData">
+         <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
+      </property>
+   </bean>
+   <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
+      <property name="classLoading"><inject bean="ClassLoading"/></property>
+   </bean>
+   <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
+      <property name="classLoading"><inject bean="ClassLoading"/></property>
+      <property name="system"><inject bean="ClassLoaderSystem"/></property>
+   </bean>
+
+  <!-- HD scanner -->
+
+  <bean name="MainDeployerHelper" class="org.jboss.demos.boostrap.MainDeployerHelper">
+     <constructor>
+        <parameter><inject bean="MainDeployer"/></parameter>
+     </constructor>
+  </bean>
+
+  <bean name="HDScanner" class="org.jboss.demos.boostrap.HDScanner">
+     <constructor>
+        <parameter><inject bean="MainDeployerHelper"/></parameter>
+        <parameter>/projects/demos/sandbox</parameter>
+     </constructor>
+     <property name="scanPeriod">10000</property>
+     <property name="scanThreadName">HDScanner</property>
+  </bean>
+
+</deployment>

Deleted: projects/demos/trunk/bootstrap/src/resources/bootstrap-beans-bak.xml
===================================================================
--- projects/demos/trunk/bootstrap/src/resources/bootstrap-beans-bak.xml	2008-07-14 20:15:41 UTC (rev 75803)
+++ projects/demos/trunk/bootstrap/src/resources/bootstrap-beans-bak.xml	2008-07-14 20:26:03 UTC (rev 75804)
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   The bootstrap of the server. This should only have the minimum
-   needed to bootstrap the mc kernel and profile service.
-   $Id:$
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <!-- The MainDeployer -->
-   <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
-      <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
-      <property name="deployers"><inject bean="Deployers"/></property>
-      <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
-   </bean>
-
-   <!-- The ManagedDeploymentCreator implementation -->
-   <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.DefaultManagedDeploymentCreator" />
-
-   <!-- The holder for deployers that determine structure -->
-   <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
-      <property name="structureBuilder">
-         <!-- The consolidator of the structure information -->
-         <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/>
-      </property>
-      <!-- Accept any implementor of structure deployer -->
-      <incallback method="addDeployer"/>
-      <uncallback method="removeDeployer"/>
-   </bean>
-
-   <!-- The holder for deployers that do real deployment -->
-   <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
-      <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
-      <!-- Accept any implementor of deployer -->
-      <incallback method="addDeployer"/>
-      <uncallback method="removeDeployer"/>
-   </bean>
-
-   <!-- A declared structure descriptor deployer -->
-   <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
-
-    <!-- JAR Structure -->
-    <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
-       <!-- Unless specified the default list of suffixes is .zip, .ear, .jar, ,.rar, .war, .sar, .har, .aop -->
-       <constructor>
-          <parameter>
-             <set elementClass="java.lang.String">
-                <value>.zip</value>
-                <value>.ear</value>
-                <value>.jar</value>
-                <value>.rar</value>
-                <value>.war</value>
-                <value>.sar</value>
-                <value>.har</value>
-                <value>.aop</value>
-                <value>.deployer</value>
-                <value>.beans</value>
-             </set>
-          </parameter>
-       </constructor>
-       <property name="candidateStructureVisitorFactory">
-          <!-- Any file that is not an ordinary directory is a candidate -->
-          <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
-             <!-- A filter to exclude some obvious non-subdeployments -->
-             <property name="filter">
-                <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
-                   <constructor><parameter>
-                      <list elementClass="java.lang.String">
-                         <!-- Exclude class files as subdeployments -->
-                         <value>.class</value>
-                      </list>
-                   </parameter></constructor>
-                </bean>
-             </property>
-          </bean>
-       </property>
-    </bean>
-
-    <!-- File Structure -->
-    <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
-       <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
-       <constructor>
-          <parameter>
-             <set elementClass="java.lang.String">
-                <value>-service.xml</value>
-                <value>-beans.xml</value>
-                <value>-ds.xml</value>
-                <value>-aop.xml</value>
-             </set>
-          </parameter>
-       </constructor>
-    </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="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>
-
-   <!-- VFS ClassLoader -->
-   <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
-      <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
-   </bean>
-   <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
-      <incallback method="addModule" state="Configured"/>
-      <uncallback method="removeModule" state="Configured"/>
-   </bean>
-
-   <!--<bean name="CustomClassLoadingMetaDataParser" class="org.jboss.demos.system.deployers.PropertyClassloaderMetaDataDeployer"/>-->
-
-<!--
-   <bean name="ManifestParser" class="org.jboss.osgi.plugins.deployers.OSGiMetaDataDeployer"/>
-   <bean name="OSGi2ClassLoadingMetaDataDeployer" class="org.jboss.osgi.plugins.deployers.OSGiMetaData2ClassLoadingMetaDataDeployer"/>
--->
-
-   <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
-      <constructor>
-         <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
-      </constructor>
-      <property name="name">jboss-classloading.xml</property>
-   </bean>
-
-   <bean name="ClassloadingDeployer" class="org.jboss.demos.system.deployers.ClassloadingDescribeDeployer">
-     <property name="classLoading"><inject bean="ClassLoading"/></property>
-   </bean>
-   <bean name="VFSClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
-      <property name="classLoading"><inject bean="ClassLoading"/></property>
-      <property name="system"><inject bean="ClassLoaderSystem"/></property>
-   </bean>
-
-   <!-- Hotdeployment of applications -->
-
-   <bean name="MainDeployerHelper" class="org.jboss.demos.boostrap.MainDeployerHelper">
-      <constructor>
-         <parameter><inject bean="MainDeployer"/></parameter>
-      </constructor>
-   </bean>
-
-   <bean name="HDScanner" class="org.jboss.demos.boostrap.HDScanner">
-      <constructor>
-         <parameter><inject bean="MainDeployerHelper"/></parameter>
-         <parameter>C:\\projects\\demos\\osgi\\boot\\work</parameter>
-      </constructor>
-      <property name="scanPeriod">10000</property>
-      <property name="scanThreadName">HDScanner</property>
-   </bean>
-
-</deployment>

Deleted: projects/demos/trunk/bootstrap/src/resources/bootstrap-beans.xml
===================================================================
--- projects/demos/trunk/bootstrap/src/resources/bootstrap-beans.xml	2008-07-14 20:15:41 UTC (rev 75803)
+++ projects/demos/trunk/bootstrap/src/resources/bootstrap-beans.xml	2008-07-14 20:26:03 UTC (rev 75804)
@@ -1,127 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <!-- The MainDeployer -->
-   <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
-      <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
-      <property name="deployers"><inject bean="Deployers"/></property>
-      <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
-   </bean>
-
-   <!-- The ManagedDeploymentCreator implementation -->
-   <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.DefaultManagedDeploymentCreator" />
-
-   <!-- The holder for deployers that determine structure -->
-   <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
-      <property name="structureBuilder">
-         <!-- The consolidator of the structure information -->
-         <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/>
-      </property>
-      <!-- Accept any implementor of structure deployer -->
-      <incallback method="addDeployer"/>
-      <uncallback method="removeDeployer"/>
-   </bean>
-
-   <!-- The holder for deployers that do real deployment -->
-   <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl">
-      <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
-      <!-- Accept any implementor of deployer -->
-      <incallback method="addDeployer"/>
-      <uncallback method="removeDeployer"/>
-   </bean>
-
-   <!-- A declared structure descriptor deployer -->
-   <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
-
-    <!-- JAR Structure -->
-    <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
-       <property name="candidateStructureVisitorFactory">
-          <!-- Any file that is not an ordinary directory is a candidate -->
-          <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
-             <!-- A filter to exclude some obvious non-subdeployments -->
-             <property name="filter">
-                <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
-                   <constructor><parameter>
-                      <list elementClass="java.lang.String">
-                         <!-- Exclude class files as subdeployments -->
-                         <value>.class</value>
-                      </list>
-                   </parameter></constructor>
-                </bean>
-             </property>
-          </bean>
-       </property>
-    </bean>
-
-    <!-- File Structure -->
-    <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
-       <!-- Unless specified the default list of suffixes is -service.xml, -beans.xml, -ds.xml, -aop.xml -->
-       <constructor>
-          <parameter>
-             <set elementClass="java.lang.String">
-                <value>-service.xml</value>
-                <value>-beans.xml</value>
-                <value>-ds.xml</value>
-                <value>-aop.xml</value>
-             </set>
-          </parameter>
-       </constructor>
-    </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="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
-      <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
-      <property name="type">beans</property>
-   </bean>
-
-   <!-- VFS ClassLoader -->
-   <bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
-      <constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
-   </bean>
-   <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
-      <incallback method="addModule" state="Configured"/>
-      <uncallback method="removeModule" state="Configured"/>
-   </bean>
-   <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
-      <constructor>
-         <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
-      </constructor>
-      <property name="name">jboss-classloading.xml</property>
-      <property name="buildManagedObject">true</property>
-   </bean>
-   <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
-      <property name="defaultMetaData">
-         <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
-      </property>
-   </bean>
-   <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
-      <property name="classLoading"><inject bean="ClassLoading"/></property>
-   </bean>
-   <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
-      <property name="classLoading"><inject bean="ClassLoading"/></property>
-      <property name="system"><inject bean="ClassLoaderSystem"/></property>
-   </bean>
-
-  <!-- HD scanner -->
-
-  <bean name="MainDeployerHelper" class="org.jboss.demos.boostrap.MainDeployerHelper">
-     <constructor>
-        <parameter><inject bean="MainDeployer"/></parameter>
-     </constructor>
-  </bean>
-
-  <bean name="HDScanner" class="org.jboss.demos.boostrap.HDScanner">
-     <constructor>
-        <parameter><inject bean="MainDeployerHelper"/></parameter>
-        <parameter>/projects/demos/sandbox</parameter>
-     </constructor>
-     <property name="scanPeriod">10000</property>
-     <property name="scanThreadName">HDScanner</property>
-  </bean>
-
-</deployment>

Modified: projects/demos/trunk/jmx/src/main/org/jboss/demos/bootstrap/jmx/JMXMain.java
===================================================================
--- projects/demos/trunk/jmx/src/main/org/jboss/demos/bootstrap/jmx/JMXMain.java	2008-07-14 20:15:41 UTC (rev 75803)
+++ projects/demos/trunk/jmx/src/main/org/jboss/demos/bootstrap/jmx/JMXMain.java	2008-07-14 20:26:03 UTC (rev 75804)
@@ -37,9 +37,9 @@
 
       try
       {
-         Main.deploy(getURL("/projects/demos/jmx/src/resources/system-jmx-beans.xml"));
-         Main.deploy(getURL("/projects/demos/jmx/src/resources/aop-beans.xml"));
-         Main.deploy(getURL("/projects/demos/jmx/src/resources/varia-deployers-beans.xml"));
+         Main.deploy(getURL("/projects/demos/jmx/src/resources/META-INF/system-jmx-beans.xml"));
+         Main.deploy(getURL("/projects/demos/jmx/src/resources/META-INF/aop-beans.xml"));
+         Main.deploy(getURL("/projects/demos/jmx/src/resources/META-INF/varia-deployers-beans.xml"));
 
          Main.validate();
       }

Copied: projects/demos/trunk/jmx/src/resources/META-INF/aop-beans.xml (from rev 75793, projects/demos/trunk/jmx/src/resources/aop-beans.xml)
===================================================================
--- projects/demos/trunk/jmx/src/resources/META-INF/aop-beans.xml	                        (rev 0)
+++ projects/demos/trunk/jmx/src/resources/META-INF/aop-beans.xml	2008-07-14 20:26:03 UTC (rev 75804)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   AOP configuration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- Integration -->
+   <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
+   <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
+      <property name="scopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
+   </bean>
+
+   <!-- For use once the aop-mc-int metadata stuff goes live
+   <bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
+      <property name="managerBean">AspectManager</property>
+      <property name="managerProperty">aspectManager</property>
+   </bean>
+   -->
+
+
+   <!--
+      Valid values for the AspectManager bean for use with enableTransformer=true are:
+      * org.jboss.aop.deployers.AspectManagerJDK5 - works with the -javaagent:pluggable-instrumentor.jar switch
+      * org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and the -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor switch
+   -->
+   <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
+      <constructor>
+         <parameter><![CDATA[
+	         <aop>
+			      <aspect name="mainDeployer" class="org.jboss.profileservice.aop.MainDeployerAspect"/>
+					   <bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployment.MainDeployer}->process(..))">
+				      <advice name="process" aspect="mainDeployer"/>
+				   </bind>
+					<aspect name="persist" class="org.jboss.profileservice.aop.PersistAspect"/>
+					<bind pointcut="execution(* $instanceof{org.jboss.managed.api.ManagedProperty}->setValue(..))">
+				      <advice name="setValue" aspect="persist"/>
+				   </bind>
+				</aop>]]>
+	      </parameter>
+      </constructor>
+
+      <property name="jbossIntegration"><inject bean="AOPJBossIntegration"/></property>
+
+      <property name="enableLoadtimeWeaving">false</property>
+      <!-- only relevant when EnableLoadtimeWeaving is true.
+           When transformer is on, every loaded class gets
+           transformed.  If AOP can't find the class, then it
+           throws an exception.  Sometimes, classes may not have
+           all the classes they reference.  So, the Suppressing
+           is needed.  (i.e. Jboss cache in the default configuration -->
+      <property name="suppressTransformationErrors">true</property>
+      <property name="prune">true</property>
+      <property name="include">org.jboss.test., org.jboss.injbossaop.</property>
+      <property name="exclude">org.jboss.</property>
+      <!-- This avoids instrumentation of hibernate cglib enhanced proxies
+      <property name="ignore">*$$EnhancerByCGLIB$$*</property> -->
+      <property name="optimized">true</property>
+      <property name="verbose">false</property>
+      <!--
+         Available choices for this attribute are:
+            org.jboss.aop.instrument.ClassicInstrumentor (default)
+            org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
+       <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
+      -->
+   </bean>
+
+   <!-- Support for @JMX -->
+   <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
+               name="JMXRegistrationAdvice"
+               class="org.jboss.system.microcontainer.jmx.ServiceControllerRegistrationLifecycleCallback"
+               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+               manager-bean="AspectManager"
+               manager-property="aspectManager">
+      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+   </lifecycle-configure>
+   <lifecycle-create xmlns="urn:jboss:aop-beans:1.0"
+               name="JMXCreateDestroyAdvice"
+               class="org.jboss.system.microcontainer.jmx.ServiceControllerCreateDestroyLifecycleCallback"
+               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+               manager-bean="AspectManager"
+               manager-property="aspectManager">
+      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+   </lifecycle-create>
+   <lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
+               name="JMXStartStopAdvice"
+               class="org.jboss.system.microcontainer.jmx.ServiceControllerStartStopLifecycleCallback"
+               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
+               manager-bean="AspectManager"
+               manager-property="aspectManager">
+      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
+   </lifecycle-install>
+
+	<!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
+	<bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
+	   <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+	   <property name="aspectManager"><inject bean="AspectManager"/></property>
+	</bean>
+
+</deployment>

Copied: projects/demos/trunk/jmx/src/resources/META-INF/system-jmx-beans.xml (from rev 75793, projects/demos/trunk/jmx/src/resources/system-jmx-beans.xml)
===================================================================
--- projects/demos/trunk/jmx/src/resources/META-INF/system-jmx-beans.xml	                        (rev 0)
+++ projects/demos/trunk/jmx/src/resources/META-INF/system-jmx-beans.xml	2008-07-14 20:26:03 UTC (rev 75804)
@@ -0,0 +1,20 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <!-- JMX Deployment -->
+
+  <bean name="JMXKernel" class="org.jboss.demos.system.jmx.JMXKernel"/>
+
+  <bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF">
+     <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+  </bean>
+  <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer">
+     <property name="icf"><inject bean="ServiceMetaDataICF"/></property>
+  </bean>
+  <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer">
+  </bean>
+  <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
+      <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
+  </bean>
+  <bean name="HackClassLoaderMetaDataDeployer" class="org.jboss.system.deployers.HackClassloaderMetaDataDeployer"/>  
+
+</deployment>

Copied: projects/demos/trunk/jmx/src/resources/META-INF/varia-deployers-beans.xml (from rev 75803, projects/demos/trunk/jmx/src/resources/varia-deployers-beans.xml)
===================================================================
--- projects/demos/trunk/jmx/src/resources/META-INF/varia-deployers-beans.xml	                        (rev 0)
+++ projects/demos/trunk/jmx/src/resources/META-INF/varia-deployers-beans.xml	2008-07-14 20:26:03 UTC (rev 75804)
@@ -0,0 +1,25 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <bean name="AnnScanDeployer" class="org.jboss.deployers.plugins.annotations.GenericAnnotationDeployer"/>
+
+  <bean name="BeanScanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanScanningDeployer"/>
+
+  <bean name="AnnotationHandlerFactory">
+     <constructor factoryClass="org.jboss.kernel.plugins.annotations.BeanAnnotationAdapterFactory" factoryMethod="getInstance" />
+  </bean>
+  <bean name="AnnotationHandler">
+     <constructor factoryMethod="getBeanAnnotationAdapter">
+        <factory bean="AnnotationHandlerFactory"/>
+     </constructor>
+     <incallback method="addAnnotationPlugin" />
+     <uncallback method="removeAnnotationPlugin" />
+  </bean>
+
+  <!-- Adding @Spring annotation handler -->
+  <bean name="SpringAnnotationPlugin" class="org.jboss.spring.annotations.SpringBeanAnnotationPlugin" />
+
+  <!-- Adding @JMX annotation handler -->
+  <bean name="JmxFieldAnnotationPlugin" class="org.jboss.system.microcontainer.jmx.JMXFieldAnnotationPlugin" />
+  <bean name="JmxPropertyAnnotationPlugin" class="org.jboss.system.microcontainer.jmx.JMXPropertyAnnotationPlugin" />
+
+</deployment>

Deleted: projects/demos/trunk/jmx/src/resources/aop-beans.xml
===================================================================
--- projects/demos/trunk/jmx/src/resources/aop-beans.xml	2008-07-14 20:15:41 UTC (rev 75803)
+++ projects/demos/trunk/jmx/src/resources/aop-beans.xml	2008-07-14 20:26:03 UTC (rev 75804)
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   AOP configuration
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <!-- Integration -->
-   <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
-   <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
-      <property name="scopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
-   </bean>
-
-   <!-- For use once the aop-mc-int metadata stuff goes live
-   <bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
-      <property name="managerBean">AspectManager</property>
-      <property name="managerProperty">aspectManager</property>
-   </bean>
-   -->
-
-
-   <!--
-      Valid values for the AspectManager bean for use with enableTransformer=true are:
-      * org.jboss.aop.deployers.AspectManagerJDK5 - works with the -javaagent:pluggable-instrumentor.jar switch
-      * org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and the -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor switch
-   -->
-   <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
-      <constructor>
-         <parameter><![CDATA[
-	         <aop>
-			      <aspect name="mainDeployer" class="org.jboss.profileservice.aop.MainDeployerAspect"/>
-					   <bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployment.MainDeployer}->process(..))">
-				      <advice name="process" aspect="mainDeployer"/>
-				   </bind>
-					<aspect name="persist" class="org.jboss.profileservice.aop.PersistAspect"/>
-					<bind pointcut="execution(* $instanceof{org.jboss.managed.api.ManagedProperty}->setValue(..))">
-				      <advice name="setValue" aspect="persist"/>
-				   </bind>
-				</aop>]]>
-	      </parameter>
-      </constructor>
-
-      <property name="jbossIntegration"><inject bean="AOPJBossIntegration"/></property>
-
-      <property name="enableLoadtimeWeaving">false</property>
-      <!-- only relevant when EnableLoadtimeWeaving is true.
-           When transformer is on, every loaded class gets
-           transformed.  If AOP can't find the class, then it
-           throws an exception.  Sometimes, classes may not have
-           all the classes they reference.  So, the Suppressing
-           is needed.  (i.e. Jboss cache in the default configuration -->
-      <property name="suppressTransformationErrors">true</property>
-      <property name="prune">true</property>
-      <property name="include">org.jboss.test., org.jboss.injbossaop.</property>
-      <property name="exclude">org.jboss.</property>
-      <!-- This avoids instrumentation of hibernate cglib enhanced proxies
-      <property name="ignore">*$$EnhancerByCGLIB$$*</property> -->
-      <property name="optimized">true</property>
-      <property name="verbose">false</property>
-      <!--
-         Available choices for this attribute are:
-            org.jboss.aop.instrument.ClassicInstrumentor (default)
-            org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
-       <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
-      -->
-   </bean>
-
-   <!-- Support for @JMX -->
-   <lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
-               name="JMXRegistrationAdvice"
-               class="org.jboss.system.microcontainer.jmx.ServiceControllerRegistrationLifecycleCallback"
-               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
-               manager-bean="AspectManager"
-               manager-property="aspectManager">
-      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
-   </lifecycle-configure>
-   <lifecycle-create xmlns="urn:jboss:aop-beans:1.0"
-               name="JMXCreateDestroyAdvice"
-               class="org.jboss.system.microcontainer.jmx.ServiceControllerCreateDestroyLifecycleCallback"
-               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
-               manager-bean="AspectManager"
-               manager-property="aspectManager">
-      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
-   </lifecycle-create>
-   <lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
-               name="JMXStartStopAdvice"
-               class="org.jboss.system.microcontainer.jmx.ServiceControllerStartStopLifecycleCallback"
-               classes="@org.jboss.aop.microcontainer.aspects.jmx.JMX"
-               manager-bean="AspectManager"
-               manager-property="aspectManager">
-      <property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
-   </lifecycle-install>
-
-	<!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
-	<bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
-	   <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
-	   <property name="aspectManager"><inject bean="AspectManager"/></property>
-	</bean>
-
-</deployment>

Deleted: projects/demos/trunk/jmx/src/resources/system-jmx-beans.xml
===================================================================
--- projects/demos/trunk/jmx/src/resources/system-jmx-beans.xml	2008-07-14 20:15:41 UTC (rev 75803)
+++ projects/demos/trunk/jmx/src/resources/system-jmx-beans.xml	2008-07-14 20:26:03 UTC (rev 75804)
@@ -1,20 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <!-- JMX Deployment -->
-
-  <bean name="JMXKernel" class="org.jboss.demos.system.jmx.JMXKernel"/>
-
-  <bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF">
-     <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
-  </bean>
-  <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer">
-     <property name="icf"><inject bean="ServiceMetaDataICF"/></property>
-  </bean>
-  <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer">
-  </bean>
-  <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
-      <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
-  </bean>
-  <bean name="HackClassLoaderMetaDataDeployer" class="org.jboss.system.deployers.HackClassloaderMetaDataDeployer"/>  
-
-</deployment>

Deleted: projects/demos/trunk/jmx/src/resources/varia-deployers-beans.xml
===================================================================
--- projects/demos/trunk/jmx/src/resources/varia-deployers-beans.xml	2008-07-14 20:15:41 UTC (rev 75803)
+++ projects/demos/trunk/jmx/src/resources/varia-deployers-beans.xml	2008-07-14 20:26:03 UTC (rev 75804)
@@ -1,25 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-  <bean name="AnnScanDeployer" class="org.jboss.deployers.plugins.annotations.GenericAnnotationDeployer"/>
-
-  <bean name="BeanScanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanScanningDeployer"/>
-
-  <bean name="AnnotationHandlerFactory">
-     <constructor factoryClass="org.jboss.kernel.plugins.annotations.BeanAnnotationAdapterFactory" factoryMethod="getInstance" />
-  </bean>
-  <bean name="AnnotationHandler">
-     <constructor factoryMethod="getBeanAnnotationAdapter">
-        <factory bean="AnnotationHandlerFactory"/>
-     </constructor>
-     <incallback method="addAnnotationPlugin" />
-     <uncallback method="removeAnnotationPlugin" />
-  </bean>
-
-  <!-- Adding @Spring annotation handler -->
-  <bean name="SpringAnnotationPlugin" class="org.jboss.spring.annotations.SpringBeanAnnotationPlugin" />
-
-  <!-- Adding @JMX annotation handler -->
-  <bean name="JmxFieldAnnotationPlugin" class="org.jboss.system.microcontainer.jmx.JMXFieldAnnotationPlugin" />
-  <bean name="JmxPropertyAnnotationPlugin" class="org.jboss.system.microcontainer.jmx.JMXPropertyAnnotationPlugin" />
-
-</deployment>




More information about the jboss-cvs-commits mailing list