[jboss-cvs] JBossAS SVN: r58236 - projects/aop/trunk/aop/src/main/org/jboss/aop/classpool

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

Author: kabir.khan at jboss.com
Date: 2006-11-09 15:52:41 -0500 (Thu, 09 Nov 2006)
New Revision: 58236

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPoolRepository.java
Log:
Add some commented code that was needed when deploying jboss-aop-jdk50.jar in jboss5/lib

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPoolRepository.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPoolRepository.java	2006-11-09 17:05:46 UTC (rev 58235)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/classpool/AOPClassPoolRepository.java	2006-11-09 20:52:41 UTC (rev 58236)
@@ -65,10 +65,35 @@
    private AOPClassPoolRepository()
    {
       this.delegate = ScopedClassPoolRepositoryImpl.getInstance();
+      //This was needed when jboss-aop-jdk50.jar was deployed in the jboss/lib directory since the AspectManager bean had no chance to initialise it
       delegate.setClassPoolFactory(new AOPClassPoolFactory());
+//      if (!setJBossSpecificStartupVariables())
+//      {
+//         delegate.setClassPoolFactory(new AOPClassPoolFactory());
+//      }
    }
 
-
+//   private boolean setJBossSpecificStartupVariables()
+//   {
+//      //We are running within JBoss 5, let's default to the JBossClassPoolFactory and set the ScopedClassPoolHelper
+//      //so that we get correct behaviour before the AspectManager service has been deployed
+//      try
+//      {
+//         Class jbcpf = Class.forName("org.jboss.aop.deployment.JBossClassPoolFactory");
+//         ScopedClassPoolFactory factory = (ScopedClassPoolFactory)jbcpf.newInstance();
+//         
+//         Class hlpr = Class.forName("org.jboss.aop.deployment.JBossScopedClassLoaderHelper");
+//         AOPScopedClassLoaderHelper helper = (AOPScopedClassLoaderHelper)hlpr.newInstance();
+//         delegate.setClassPoolFactory(factory);
+//         AspectManager.scopedCLHelper = helper;
+//         return true;
+//      }
+//      catch (Exception e)
+//      {
+//      }
+//      return false;//Not running in JBoss probably
+//   }
+   
    public void setClassPoolFactory(ScopedClassPoolFactory factory)
    {
       delegate.setClassPoolFactory(factory);