[jboss-cvs] JBossAS SVN: r79200 - trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5.

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

Author: kabir.khan at jboss.com
Date: 2008-10-07 05:33:58 -0400 (Tue, 07 Oct 2008)
New Revision: 79200

Modified:
   trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java
   trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPClassLoaderDeployer.java
   trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AbstractAopMetaDataDeployer.java
Log:
[JBAS-6032] Add deployer attachments using DeploymentUnit.addAttachment()

Modified: trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java	2008-10-07 09:31:38 UTC (rev 79199)
+++ trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPAnnotationMetaDataParserDeployer.java	2008-10-07 09:33:58 UTC (rev 79200)
@@ -109,7 +109,7 @@
          if (deployment == null)
          {
             deployment = new AOPDeployment();
-            unit.getTransientManagedObjects().addAttachment(AOPDeployment.class.getName(), deployment, AOPDeployment.class);
+            unit.addAttachment(AOPDeployment.class.getName(), deployment, AOPDeployment.class);
          }
          if (deployment.getBeanFactories() == null)
          {

Modified: trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPClassLoaderDeployer.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPClassLoaderDeployer.java	2008-10-07 09:31:38 UTC (rev 79199)
+++ trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPClassLoaderDeployer.java	2008-10-07 09:33:58 UTC (rev 79200)
@@ -71,7 +71,8 @@
       {
          manager = domain;
       }
-      unit.getTransientManagedObjects().addAttachment(AspectManager.class, manager);
+      log.debug("Adding AspectManager attachment " + manager + " for " + unit);
+      unit.addAttachment(AspectManager.class, manager);
    }
 
    @Override

Modified: trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AbstractAopMetaDataDeployer.java
===================================================================
--- trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AbstractAopMetaDataDeployer.java	2008-10-07 09:31:38 UTC (rev 79199)
+++ trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AbstractAopMetaDataDeployer.java	2008-10-07 09:33:58 UTC (rev 79200)
@@ -112,11 +112,12 @@
       log.debug("Deploying " + unit + " " + deployment);
       
       AopMetaDataDeployerOutput output = new AopMetaDataDeployerOutput();
-      unit.getTransientManagedObjects().addAttachment(AopMetaDataDeployerOutput.class, output);
+      unit.addAttachment(AopMetaDataDeployerOutput.class, output);
       
       if (extractAopBeanMetaDataFactories(unit, deployment, output))
       {
          AspectManager correctManager = unit.getAttachment(AspectManager.class);
+         log.debug("Got AspectManager attachment " + correctManager + " for " + unit);
          if (correctManager != aspectManager)
          {
             int sequence = getSequence();