[jboss-cvs] JBossAS SVN: r60184 - trunk/server/src/etc/conf/default.

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

Author: scott.stark at jboss.org
Date: 2007-02-02 04:15:41 -0500 (Fri, 02 Feb 2007)
New Revision: 60184

Modified:
   trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml
Log:
Update the repository bootstrap descriptor

Modified: trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml	2007-02-02 06:01:13 UTC (rev 60183)
+++ trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml	2007-02-02 09:15:41 UTC (rev 60184)
@@ -7,33 +7,6 @@
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
     
-    <!-- The file repository profile service which provides full
-        support ProfileService spi.
-    -->
-    <bean name="ProfileService" class="org.jboss.system.server.profileservice.repository.ProfileServiceImpl">
-        <constructor>
-            <parameter>${jboss.server.name}</parameter>
-        </constructor>
-        <property name="profileRepository"><inject bean="FileProfileRepository"/></property>
-    </bean>
-    <bean name="FileProfileRepository" class="org.jboss.system.server.profileservice.repository.FileProfileRepository">
-        <property name="storeRoot">${jboss.server.base.dir}</property>
-        <property name="repositoryFactory"><inject bean="SerializableDeploymentRepositoryFactory"/></property>
-    </bean>
-    <bean name="SerializableDeploymentRepositoryFactory" class="org.jboss.system.server.profileservice.repository.SerializableDeploymentRepositoryFactory">
-        <property name="storeRoot">${jboss.server.base.dir}</property>
-        <property name="serializer"><inject bean="JavaSerializationAttachmentsSerializer"/></property>
-    </bean>
-    <bean name="JavaSerializationAttachmentsSerializer" class="org.jboss.system.server.profileservice.repository.JavaSerializationAttachmentsSerializer">
-        <property name="attachmentsStoreDir">${jboss.server.home.dir}/attachments</property>
-    </bean>
-    
-    <!-- The legacy JMX kernel -->
-    <bean name="JMXKernel" class="org.jboss.system.server.jmx.JMXKernel">
-        <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
-        <property name="serverImpl"><inject bean="JBossServer"/></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
@@ -43,22 +16,24 @@
         <constructor>
             <parameter><![CDATA[
 	         <aop>
+					<aspect name="deployers" class="org.jboss.profileservice.aop.DeployerAspects"/>
+					<bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployer.Deployer}->*(..))">
+				      <advice name="invoke" aspect="deployers"/>							         
+				   </bind>
 			      <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>
-					<aspect name="deployers" class="org.jboss.profileservice.aop.DeployerAspects"/>
-					<bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployer.Deployer}->*(..))">
-				      <advice name="invoke" aspect="deployers"/>							         
-				   </bind>
+					<aspect name="track" class="org.jboss.profileservice.aop.TrackingAdvice"/>
+               <bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.attachments.Attachments}->addAttachment(..))">
+                  <advice name="addAttachment" aspect="track"/>
+               </bind>
+               <bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.attachments.Attachments}->removeAttachment(..))">
+                  <advice name="removeAttachment" aspect="track"/>
+               </bind>
 				</aop>]]>
             </parameter>
         </constructor>
-        
         <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
         <property name="enableLoadtimeWeaving">false</property>
         <!-- only relevant when EnableLoadtimeWeaving is true.
@@ -83,6 +58,34 @@
         -->
     </bean>
     
+    <!-- The file repository profile service which provides full
+        support ProfileService spi.
+    -->
+    <bean name="ProfileService" class="org.jboss.system.server.profileservice.repository.ProfileServiceImpl">
+        <constructor>
+            <parameter>${jboss.server.name}</parameter>
+        </constructor>
+        <property name="profileRepository"><inject bean="FileProfileRepository"/></property>
+        <depends>AspectManager</depends>
+    </bean>
+    <bean name="FileProfileRepository" class="org.jboss.system.server.profileservice.repository.FileProfileRepository">
+        <property name="storeRoot">${jboss.server.base.dir}</property>
+        <property name="repositoryFactory"><inject bean="SerializableDeploymentRepositoryFactory"/></property>
+    </bean>
+    <bean name="SerializableDeploymentRepositoryFactory" class="org.jboss.system.server.profileservice.repository.SerializableDeploymentRepositoryFactory">
+        <property name="storeRoot">${jboss.server.base.dir}</property>
+        <property name="serializer"><inject bean="JavaSerializationAttachmentsSerializer"/></property>
+    </bean>
+    <bean name="JavaSerializationAttachmentsSerializer" class="org.jboss.system.server.profileservice.repository.JavaSerializationAttachmentsSerializer">
+        <property name="attachmentsStoreDir">${jboss.server.home.dir}/attachments</property>
+    </bean>
+    
+    <!-- The legacy JMX kernel -->
+    <bean name="JMXKernel" class="org.jboss.system.server.jmx.JMXKernel">
+        <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+        <property name="serverImpl"><inject bean="JBossServer"/></property>
+    </bean>
+    
     <!--
         <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
         name="DeployerAspects"