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

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

Author: scott.stark at jboss.org
Date: 2007-02-18 22:27:19 -0500 (Sun, 18 Feb 2007)
New Revision: 60609

Modified:
   trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml
Log:
Only intercept the Deployer methods that are needed.

Modified: trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml	2007-02-18 23:44:13 UTC (rev 60608)
+++ trunk/server/src/etc/conf/default/bootstrap-repo-beans.xml	2007-02-19 03:27:19 UTC (rev 60609)
@@ -16,21 +16,19 @@
         <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="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>
+				<aspect name="deployers" class="org.jboss.profileservice.aop.DeployerAspects"/>
+				<bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployer.Deployer}->prepareDeploy(..))">
+					<advice name="invoke" aspect="deployers"/>
+				</bind>
+				<bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployer.Deployer}->prepareUndeploy(..))">
+					<advice name="invoke" aspect="deployers"/>
+				</bind>
+				<bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployer.Deployer}->commitDeploy(..))">
+					<advice name="invoke" aspect="deployers"/>
+				</bind>
+				<bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployer.Deployer}->commitUndeploy(..))">
+					<advice name="invoke" aspect="deployers"/>
+				</bind>
 				</aop>]]>
             </parameter>
         </constructor>
@@ -58,14 +56,6 @@
     </bean>
     
     <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
-        name="Deployers"
-        class="org.jboss.profileservice.aop.DeployerAspects"
-        classes="org.jboss.deployers.spi.deployer.Deployer"
-        manager-bean="AspectManager"
-        manager-property="aspectManager"
-        pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployer.Deployer}->*(..))">
-    </aop:lifecycle-configure>
-    <aop:lifecycle-configure xmlns:aop="urn:jboss:aop-beans:1.0"
         name="MainDeployerAspect"
         class="org.jboss.profileservice.aop.MainDeployerAspect"
         classes="org.jboss.deployers.spi.deployment.MainDeployer"