[jboss-cvs] JBossAS SVN: r79230 - in trunk: server/src/etc/conf/default and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2008-10-07 12:44:10 -0400 (Tue, 07 Oct 2008)
New Revision: 79230

Modified:
   trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPClassLoaderDeployer.java
   trunk/server/src/etc/conf/default/deployers.xml
Log:
[JBAS-6032] use addInput() rather than relative ordering

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 16:10:33 UTC (rev 79229)
+++ trunk/aspects/src/main/org/jboss/aop/asintegration/jboss5/AOPClassLoaderDeployer.java	2008-10-07 16:44:10 UTC (rev 79230)
@@ -40,11 +40,12 @@
 {
    AspectManager aspectManager;
    
-   public AOPClassLoaderDeployer(int xmlRelativeOrder)
+   public AOPClassLoaderDeployer()
    {
       setStage(DeploymentStages.CLASSLOADER);
-      //This needs to come after the classloader deployer
-      setRelativeOrder(xmlRelativeOrder + 1);
+
+      //This makes it come after the ClassLoaderDeployer
+      addInput(ClassLoader.class);
    }
 
    public AspectManager getAspectManager()
@@ -90,6 +91,12 @@
       ClassLoader loader = unit.getClassLoader();
       ClassLoader topLoader = unit.getTopLevel().getClassLoader();
       
+//      System.out.println("====> DEPLOYMENT:    " + unit);
+//      System.out.println("====> Loader:        " + loader);
+//      System.out.println("====> Top Loader:    " + topLoader);
+//      System.out.println("====> Loader Parent: " + loader.getParent());
+//      
+//      
       VFSClassLoaderDomainRegistry registry = policy.getRegistry();
       
       boolean isWar = unit.isAttachmentPresent("org.jboss.metadata.web.jboss.JBossWebMetaData");
@@ -136,4 +143,18 @@
       }      
    }
 
+//   private void registerParentLoaders(DeploymentUnit unit)
+//   {
+//      ClassLoader childLoader = unit.getClassLoader();
+//      DeploymentUnit parent = unit.getParent();
+//      while (parent != null)
+//      {
+//         ClassLoader parentLoader = parent.getClassLoader();
+//         if (parentLoader != childLoader)
+//         {
+//            
+//         }
+//         parent = unit.getParent();
+//      }
+//   }
 }

Modified: trunk/server/src/etc/conf/default/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/default/deployers.xml	2008-10-07 16:10:33 UTC (rev 79229)
+++ trunk/server/src/etc/conf/default/deployers.xml	2008-10-07 16:44:10 UTC (rev 79230)
@@ -133,9 +133,6 @@
       </constructor>
    </bean>
    <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer">
-      <constructor>
-         <parameter><inject bean="ClassLoaderDeployer" property="relativeOrder"/></parameter>
-      </constructor>
       <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property>
    </bean>
    <bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer">