[jboss-cvs] JBossAS SVN: r92132 - in projects/aop/branches/classpool_JBAOP-742: aop/src/main/java/org/jboss/aop/newclasspool and 14 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Aug 7 09:15:27 EDT 2009 

Author: flavia.rainone at jboss.com
Date: 2009-08-07 09:15:27 -0400 (Fri, 07 Aug 2009)
New Revision: 92132

Modified:
   projects/aop/branches/classpool_JBAOP-742/aop/pom.xml
   projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassPool.java
   projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/stress/weavetest/GenerateClassesScenario.java
   projects/aop/branches/classpool_JBAOP-742/aophelper/pom.xml
   projects/aop/branches/classpool_JBAOP-742/asintegration-core/pom.xml
   projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/JBossIntegration.java
   projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/pom.xml
   projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/RepositoryClassLoaderScopingPolicy.java
   projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AspectDeployer.java
   projects/aop/branches/classpool_JBAOP-742/asintegration-mc/pom.xml
   projects/aop/branches/classpool_JBAOP-742/aspects/pom.xml
   projects/aop/branches/classpool_JBAOP-742/build/pom.xml
   projects/aop/branches/classpool_JBAOP-742/deployers/pom.xml
   projects/aop/branches/classpool_JBAOP-742/jrockit-pluggable-instrumentor/
   projects/aop/branches/classpool_JBAOP-742/jrockit-pluggable-instrumentor/pom.xml
   projects/aop/branches/classpool_JBAOP-742/maven-jbossaop-plugin/pom.xml
   projects/aop/branches/classpool_JBAOP-742/pluggable-instrumentor/pom.xml
Log:
[JBAOP-742] This version contains all JBoss AOP projects integrated with jboss-classpool. There are a few test failures at asintegration-mc project only.

Modified: projects/aop/branches/classpool_JBAOP-742/aop/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/pom.xml	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/aop/pom.xml	2009-08-07 13:15:27 UTC (rev 92132)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.jboss.aop</groupId>
     <artifactId>jboss-aop-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT742</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss.aop</groupId>

Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassPool.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassPool.java	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassPool.java	2009-08-07 13:15:27 UTC (rev 92132)
@@ -91,6 +91,12 @@
       instances.put(delegate, new WeakReference<AOPClassPool>(this));
    }
    
+   // TODO: should this method be available?
+   public ScopedClassPool getDelegate()
+   {
+      return this.delegate;
+   }
+   
    public void setClassLoadedButNotWoven(String classname)
    {
       loadedButNotWovenClasses.put(classname, Boolean.TRUE);
@@ -170,22 +176,42 @@
    @Override
    public CtClass get(String classname) throws NotFoundException
    {
+      if (this.childFirstLookup != delegate.childFirstLookup)
+      {
+         delegate.childFirstLookup = this.childFirstLookup;
+      }
       return delegate.get(classname);
    }
    
    @Override
    public CtClass getCtClass(String classname) throws NotFoundException
    {
+      if (this.childFirstLookup != delegate.childFirstLookup)
+      {
+         delegate.childFirstLookup = this.childFirstLookup;
+      }
       return delegate.getCtClass(classname);
    }
    
-   /*@Override
+   @Override
    protected synchronized CtClass get0(String classname, boolean useCache) throws NotFoundException
    {
-      return delegate.get0(classname, useCache);
+      if (this.childFirstLookup != delegate.childFirstLookup)
+      {
+         delegate.childFirstLookup = this.childFirstLookup;
+      }
+      //return delegate.get0(classname, useCache);
+      try
+      {
+         return delegate.get(classname);
+      }
+      catch (NotFoundException nfe)
+      {
+         return null;
+      }
    }
    
-   @Override
+   /*@Override
    protected CtClass createCtClass(String classname, boolean useCache)
    {
       return delegate.createCtClass(classname, useCache);
@@ -358,4 +384,13 @@
    {
       return delegate.getCached(classname);
    }*/
+   
+   public boolean equals(Object other)
+   {
+      if (other == this)
+      {
+         return true;
+      }
+      return other instanceof ScopedClassPool && delegate.equals(other);
+   }
 }

Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/stress/weavetest/GenerateClassesScenario.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/stress/weavetest/GenerateClassesScenario.java	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/stress/weavetest/GenerateClassesScenario.java	2009-08-07 13:15:27 UTC (rev 92132)
@@ -34,7 +34,7 @@
 import javassist.CtNewMethod;
 import javassist.Modifier;
 
-import org.jboss.aop.classpool.AOPClassPoolRepository;
+import org.jboss.classpool.ClassPoolRepository;
 import org.jboss.test.aop.stress.AbstractScenario;
 import org.jboss.test.aop.stress.SkipWarmup;
 
@@ -132,7 +132,7 @@
    {
       initDirectory();
       
-      pool = AOPClassPoolRepository.getInstance().registerClassLoader(this.getClass().getClassLoader());
+      pool = ClassPoolRepository.getInstance().registerClassLoader(this.getClass().getClassLoader());
       packageName = this.getClass().getPackage().getName();
       CtClass clazz = pool.get("org.jboss.test.aop.stress.weavetest.TemplatePOJO");
       if (clazz == null)

Modified: projects/aop/branches/classpool_JBAOP-742/aophelper/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aophelper/pom.xml	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/aophelper/pom.xml	2009-08-07 13:15:27 UTC (rev 92132)
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.jboss.aop</groupId>
     <artifactId>jboss-aop-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT742</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss.aop</groupId>
   <artifactId>aophelper</artifactId>
   <packaging>jar</packaging>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT742</version>
   <name>JBoss AOP Helper</name>
 
    <pluginRepositories>

Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-core/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-core/pom.xml	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-core/pom.xml	2009-08-07 13:15:27 UTC (rev 92132)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.jboss.aop</groupId>
     <artifactId>jboss-aop-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT742</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jboss-aop-asintegration-core</artifactId>

Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/JBossIntegration.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/JBossIntegration.java	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/JBossIntegration.java	2009-08-07 13:15:27 UTC (rev 92132)
@@ -26,7 +26,7 @@
 import javassist.scopedpool.ScopedClassPoolFactory;
 
 import org.jboss.aop.ClassLoaderValidation;
-import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
+import org.jboss.aop.newclasspool.AOPClassLoaderScopingPolicy;
 
 /**
  * AOPIntegration.<p>

Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/pom.xml	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/pom.xml	2009-08-07 13:15:27 UTC (rev 92132)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.jboss.aop</groupId>
     <artifactId>jboss-aop-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT742</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jboss-aop-asintegration-jmx</artifactId>

Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/RepositoryClassLoaderScopingPolicy.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/RepositoryClassLoaderScopingPolicy.java	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/RepositoryClassLoaderScopingPolicy.java	2009-08-07 13:15:27 UTC (rev 92132)
@@ -26,9 +26,10 @@
 
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.Domain;
-import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
-import org.jboss.aop.classpool.AOPClassPoolRepository;
 import org.jboss.aop.domain.ScopedRepositoryClassLoaderDomain;
+import org.jboss.aop.newclasspool.AOPClassLoaderScopingPolicy;
+import org.jboss.classpool.ClassPoolRepository;
+import org.jboss.classpool.jboss4.ScopedRepositoryClassLoaderHelper;
 import org.jboss.logging.Logger;
 import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
 import org.jboss.mx.loading.RepositoryClassLoader;
@@ -51,7 +52,7 @@
       if (scopedClassLoader != null)
       {
          Domain scopedManager = null;
-         synchronized (AOPClassPoolRepository.getInstance().getRegisteredCLs())
+         synchronized (ClassPoolRepository.getInstance().getRegisteredCLs())
          {
             Object loaderRepository = getLoaderRepository(classLoader);
             scopedManager = scopedClassLoaderDomains.get(loaderRepository);

Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AspectDeployer.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AspectDeployer.java	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AspectDeployer.java	2009-08-07 13:15:27 UTC (rev 92132)
@@ -35,7 +35,7 @@
 import org.jboss.aop.AspectAnnotationLoader;
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.AspectXmlLoader;
-import org.jboss.aop.asintegration.jboss4.ScopedRepositoryClassLoaderHelper;
+import org.jboss.classpool.jboss4.ScopedRepositoryClassLoaderHelper;
 import org.jboss.deployment.DeploymentException;
 import org.jboss.deployment.DeploymentInfo;
 import org.jboss.deployment.DeploymentState;

Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/pom.xml	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/pom.xml	2009-08-07 13:15:27 UTC (rev 92132)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.jboss.aop</groupId>
     <artifactId>jboss-aop-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT742</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jboss-aop-asintegration-mc</artifactId>

Modified: projects/aop/branches/classpool_JBAOP-742/aspects/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aspects/pom.xml	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/aspects/pom.xml	2009-08-07 13:15:27 UTC (rev 92132)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>jboss-aop-parent</artifactId>
     <groupId>org.jboss.aop</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT742</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jboss-aop-aspects</artifactId>

Modified: projects/aop/branches/classpool_JBAOP-742/build/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/build/pom.xml	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/build/pom.xml	2009-08-07 13:15:27 UTC (rev 92132)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.jboss.aop</groupId>
     <artifactId>jboss-aop-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT742</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jboss-aop-dist</artifactId>

Modified: projects/aop/branches/classpool_JBAOP-742/deployers/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/deployers/pom.xml	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/deployers/pom.xml	2009-08-07 13:15:27 UTC (rev 92132)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>jboss-aop-parent</artifactId>
     <groupId>org.jboss.aop</groupId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT742</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jboss-aop-deployers</artifactId>


Property changes on: projects/aop/branches/classpool_JBAOP-742/jrockit-pluggable-instrumentor
___________________________________________________________________
Name: svn:ignore
   - target

   + target
.settings


Modified: projects/aop/branches/classpool_JBAOP-742/jrockit-pluggable-instrumentor/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/jrockit-pluggable-instrumentor/pom.xml	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/jrockit-pluggable-instrumentor/pom.xml	2009-08-07 13:15:27 UTC (rev 92132)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jboss.aop</groupId>
     <artifactId>jboss-aop-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT742</version>
   </parent>
   <artifactId>jrockit-pluggable-instrumentor</artifactId>
   <packaging>jar</packaging>

Modified: projects/aop/branches/classpool_JBAOP-742/maven-jbossaop-plugin/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/maven-jbossaop-plugin/pom.xml	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/maven-jbossaop-plugin/pom.xml	2009-08-07 13:15:27 UTC (rev 92132)
@@ -9,7 +9,7 @@
   <groupId>org.jboss.maven.plugins</groupId>
   <artifactId>maven-jbossaop-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT742</version>
   <name>JBoss AOP Maven Plugin</name>
 
   <distributionManagement>

Modified: projects/aop/branches/classpool_JBAOP-742/pluggable-instrumentor/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/pluggable-instrumentor/pom.xml	2009-08-07 13:13:11 UTC (rev 92131)
+++ projects/aop/branches/classpool_JBAOP-742/pluggable-instrumentor/pom.xml	2009-08-07 13:15:27 UTC (rev 92132)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jboss.aop</groupId>
     <artifactId>jboss-aop-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT742</version>
   </parent>
   <artifactId>pluggable-instrumentor</artifactId>
   <packaging>jar</packaging>

More information about the jboss-cvs-commits mailing list