[jboss-cvs] JBossAS SVN: r92362 - in projects/aop/branches/classpool_JBAOP-742: aop/src/main/java/org/jboss/aop/classpool and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 14 08:23:50 EDT 2009
Author: flavia.rainone at jboss.com
Date: 2009-08-14 08:23:50 -0400 (Fri, 14 Aug 2009)
New Revision: 92362
Added:
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java
Removed:
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassLoaderScopingPolicy.java
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/AOPClassPoolFactory.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/ClassLoaderRepository.java
Modified:
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassLoaderScopingPolicy.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/ClassLoaderRepository.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/FieldAccessTransformer.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/InstrumentorFactory.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedConstructionInvocations.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedConstructorInvocations.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedFieldInvocations.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedInvocations.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedMethodInvocations.java
projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/jdk15/dynamic/common/scenario/ScenarioRunner.java
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/src/main/java/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java
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/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java
projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclDelegatingClassPoolTestCase.java
projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderScopingPolicyWithRegistry.java
projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java
projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
Log:
[JBAOP-742] Renamed org.jboss.aop.newclasspool to org.jboss.aop.classpool
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -60,6 +60,9 @@
import org.jboss.aop.array.ArrayAdvisor;
import org.jboss.aop.array.ArrayBinding;
import org.jboss.aop.array.ArrayReplacement;
+import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
+import org.jboss.aop.classpool.AOPClassPoolFactory;
+import org.jboss.aop.classpool.ClassLoaderRepository;
import org.jboss.aop.instrument.GeneratedAdvisorInstrumentor;
import org.jboss.aop.instrument.Instrumentor;
import org.jboss.aop.instrument.InstrumentorFactory;
@@ -72,9 +75,6 @@
import org.jboss.aop.metadata.SimpleClassMetaDataLoader;
import org.jboss.aop.microcontainer.lifecycle.LifecycleCallbackBinding;
import org.jboss.aop.microcontainer.lifecycle.LifecycleManager;
-import org.jboss.aop.newclasspool.AOPClassLoaderScopingPolicy;
-import org.jboss.aop.newclasspool.AOPClassPoolFactory;
-import org.jboss.aop.newclasspool.ClassLoaderRepository;
import org.jboss.aop.pointcut.CFlowStack;
import org.jboss.aop.pointcut.DeclareDef;
import org.jboss.aop.pointcut.DynamicCFlow;
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -25,9 +25,9 @@
import javassist.CtClass;
import javassist.NotFoundException;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.instrument.Instrumentor;
import org.jboss.aop.instrument.InstrumentorFactory;
-import org.jboss.aop.newclasspool.AOPClassPool;
import org.jboss.aop.util.logging.AOPLogger;
import org.jboss.classpool.ClassPoolRepository;
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -28,9 +28,9 @@
import javassist.NotFoundException;
import javassist.scopedpool.ScopedClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.instrument.Instrumentor;
import org.jboss.aop.instrument.InstrumentorFactory;
-import org.jboss.aop.newclasspool.AOPClassPool;
import org.jboss.aop.util.logging.AOPLogger;
import org.jboss.classpool.AbstractClassPool;
import org.jboss.classpool.ClassPoolRepository;
Copied: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool (from rev 92128, projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool)
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassLoaderScopingPolicy.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassLoaderScopingPolicy.java 2009-08-07 12:59:41 UTC (rev 92128)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassLoaderScopingPolicy.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.aop.newclasspool;
+package org.jboss.aop.classpool;
import org.jboss.aop.AspectManager;
import org.jboss.aop.Domain;
Deleted: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassPool.java 2009-08-07 12:59:41 UTC (rev 92128)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -1,361 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.aop.newclasspool;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.ref.WeakReference;
-import java.net.URL;
-import java.security.ProtectionDomain;
-import java.util.Iterator;
-import java.util.WeakHashMap;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javassist.CannotCompileException;
-import javassist.ClassPath;
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.NotFoundException;
-import javassist.scopedpool.ScopedClassPool;
-import javassist.scopedpool.ScopedClassPoolRepository;
-
-import org.jboss.classpool.AbstractClassPool;
-import org.jboss.classpool.ClassPoolRepository;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 86930 $
- */
-public class AOPClassPool extends AbstractClassPool
-{
- protected final Logger logger = Logger.getLogger(this.getClass());
-
- /** Classnames of classes that have been loaded, but were not woven */
- protected final ConcurrentHashMap<String, Boolean> loadedButNotWovenClasses = new ConcurrentHashMap<String, Boolean>();
-
- private static WeakHashMap<AbstractClassPool, WeakReference<AOPClassPool>> instances = new WeakHashMap<AbstractClassPool, WeakReference<AOPClassPool>>();
-
- static
- {
- ClassPool.doPruning = false;
- ClassPool.releaseUnmodifiedClassFile = false;
- }
-
- /*public AOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
- {
- super(cl, src, repository);
- }
-
- protected AOPClassPool(ClassPool src, ScopedClassPoolRepository repository)
- {
- super(src, repository);
- }
-
- public AOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository, Class<? extends ClassPoolSearchStrategy> searchStrategy)
- {
- super(cl, src, repository, searchStrategy);
- }
-
- public AOPClassPool(ClassPool src, ScopedClassPoolRepository repository, Class<? extends ClassPoolSearchStrategy> searchStrategy)
- {
- super(src, repository, searchStrategy);
- }*/
-
- private ScopedClassPool delegate;
-
- public AOPClassPool(AbstractClassPool delegate)
- {
- super(ClassPool.getDefault(), null);
- this.delegate = delegate;
- instances.put(delegate, new WeakReference<AOPClassPool>(this));
- }
-
- public void setClassLoadedButNotWoven(String classname)
- {
- loadedButNotWovenClasses.put(classname, Boolean.TRUE);
- }
-
- public boolean isClassLoadedButNotWoven(String classname)
- {
- return loadedButNotWovenClasses.get(classname) == Boolean.TRUE;
- }
-
- /*public static AOPClassPool createAOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
- {
- return (AOPClassPool)AspectManager.getClassPoolFactory().create(cl, src, repository);
- }*/
-
-
- // TODO fix this: the method should be in ScopedClassPoolRepository
- public static ClassPool createAOPClassPool(ClassPool src, ScopedClassPoolRepository repository)
- {
- return ClassPoolRepository.getInstance().getClassPoolFactory().create(src, repository);
- }
-
- public static AOPClassPool getInstance(AbstractClassPool delegate)
- {
- if (instances.containsKey(delegate))
- {
- AOPClassPool classPool = instances.get(delegate).get();
- if (classPool != null)
- {
- return classPool;
- }
- instances.remove(delegate);
- }
- return null;
- }
-
- @Override
- public void importPackage(String packageName)
- {
- delegate.importPackage(packageName);
- }
-
- @Override
- public void clearImportedPackages()
- {
- if (delegate == null)
- {
- return;
- }
- delegate.clearImportedPackages();
- }
-
- @Override
- public Iterator<?> getImportedPackages()
- {
- return delegate.getImportedPackages();
- }
-
- @Override
- public void recordInvalidClassName(String name)
- {
- delegate.recordInvalidClassName(name);
- }
-
- @Override
- public Object[] lookupCflow(String name)
- {
- return delegate.lookupCflow(name);
- }
-
- @Override
- public CtClass getAndRename(String orgName, String newName) throws NotFoundException
- {
- return delegate.getAndRename(orgName, newName);
- }
-
- @Override
- public CtClass get(String classname) throws NotFoundException
- {
- return delegate.get(classname);
- }
-
- @Override
- public CtClass getCtClass(String classname) throws NotFoundException
- {
- return delegate.getCtClass(classname);
- }
-
- /*@Override
- protected synchronized CtClass get0(String classname, boolean useCache) throws NotFoundException
- {
- return delegate.get0(classname, useCache);
- }
-
- @Override
- protected CtClass createCtClass(String classname, boolean useCache)
- {
- return delegate.createCtClass(classname, useCache);
- }*/
-
- @Override
- public URL find(String classname)
- {
- return delegate.find(classname);
- }
-
- @Override
- public CtClass[] get(String[] classnames) throws NotFoundException
- {
- return delegate.get(classnames);
- }
-
- @Override
- public CtMethod getMethod(String classname, String methodname) throws NotFoundException
- {
- return delegate.getMethod(classname, methodname);
- }
-
- @Override
- public CtClass makeClass(InputStream classfile) throws IOException, RuntimeException
- {
- return delegate.makeClass(classfile);
- }
-
- @Override
- public CtClass makeClass(InputStream classfile, boolean ifNotFrozen) throws IOException, RuntimeException
- {
- return delegate.makeClass(classfile, ifNotFrozen);
- }
-
- @Override
- public CtClass makeClassIfNew(InputStream classfile) throws IOException, RuntimeException
- {
- return delegate.makeClassIfNew(classfile);
- }
-
- @Override
- public CtClass makeClass(String classname) throws RuntimeException
- {
- return delegate.makeClass(classname);
- }
-
- @Override
- public synchronized CtClass makeClass(String classname, CtClass superclass) throws RuntimeException
- {
- return delegate.makeClass(classname, superclass);
- }
-
- @Override
- public CtClass makeInterface(String name) throws RuntimeException
- {
- return delegate.makeInterface(name);
- }
-
- @Override
- public synchronized CtClass makeInterface(String name, CtClass superclass) throws RuntimeException
- {
- return delegate.makeInterface(name, superclass);
- }
-
- @Override
- public ClassPath appendSystemPath()
- {
- return delegate.appendSystemPath();
- }
-
- @Override
- public ClassPath insertClassPath(ClassPath cp)
- {
- return delegate.insertClassPath(cp);
- }
-
- @Override
- public ClassPath appendClassPath(ClassPath cp) {
- return delegate.appendClassPath(cp);
- }
-
- @Override
- public ClassPath insertClassPath(String pathname) throws NotFoundException
- {
- return delegate.insertClassPath(pathname);
- }
-
- @Override
- public ClassPath appendClassPath(String pathname) throws NotFoundException
- {
- return delegate.appendClassPath(pathname);
- }
-
- @Override
- public void removeClassPath(ClassPath cp)
- {
- delegate.removeClassPath(cp);
- }
-
- @Override
- public void appendPathList(String pathlist) throws NotFoundException
- {
- delegate.appendPathList(pathlist);
- }
-
- @Override
- public Class<?> toClass(CtClass clazz) throws CannotCompileException
- {
- return delegate.toClass(clazz);
- }
-
- @Override
- public ClassLoader getClassLoader()
- {
- return delegate.getClassLoader();
- }
-
- @Override
- @Deprecated
- public Class<?> toClass(CtClass ct, ClassLoader loader) throws CannotCompileException
- {
- return delegate.toClass(ct, loader);
- }
-
- @Override
- public Class<?> toClass(CtClass ct, ClassLoader loader, ProtectionDomain domain) throws CannotCompileException
- {
- return delegate.toClass(ct, loader, domain);
- }
-
- @Override
- public void close()
- {
- delegate.close();
- }
-
- @Override
- public synchronized void flushClass(String classname)
- {
- delegate.flushClass(classname);
- }
-
- @Override
- public synchronized void soften(CtClass clazz)
- {
- delegate.soften(clazz);
- }
-
- @Override
- public boolean isUnloadedClassLoader()
- {
- return delegate.isUnloadedClassLoader();
- }
-
- @Override
- public void lockInCache(CtClass c)
- {
- delegate.lockInCache(c);
- }
-
- @Override
- public synchronized CtClass getLocally(String classname) throws NotFoundException
- {
- return delegate.getLocally(classname);
- }
-
- /*@Override
- public CtClass getCached(String classname)
- {
- return delegate.getCached(classname);
- }*/
-}
Copied: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java (from rev 92132, 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/classpool/AOPClassPool.java (rev 0)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -0,0 +1,396 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.aop.classpool;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.ref.WeakReference;
+import java.net.URL;
+import java.security.ProtectionDomain;
+import java.util.Iterator;
+import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javassist.CannotCompileException;
+import javassist.ClassPath;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtMethod;
+import javassist.NotFoundException;
+import javassist.scopedpool.ScopedClassPool;
+import javassist.scopedpool.ScopedClassPoolRepository;
+
+import org.jboss.classpool.AbstractClassPool;
+import org.jboss.classpool.ClassPoolRepository;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision: 86930 $
+ */
+public class AOPClassPool extends AbstractClassPool
+{
+ protected final Logger logger = Logger.getLogger(this.getClass());
+
+ /** Classnames of classes that have been loaded, but were not woven */
+ protected final ConcurrentHashMap<String, Boolean> loadedButNotWovenClasses = new ConcurrentHashMap<String, Boolean>();
+
+ private static WeakHashMap<AbstractClassPool, WeakReference<AOPClassPool>> instances = new WeakHashMap<AbstractClassPool, WeakReference<AOPClassPool>>();
+
+ static
+ {
+ ClassPool.doPruning = false;
+ ClassPool.releaseUnmodifiedClassFile = false;
+ }
+
+ /*public AOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
+ {
+ super(cl, src, repository);
+ }
+
+ protected AOPClassPool(ClassPool src, ScopedClassPoolRepository repository)
+ {
+ super(src, repository);
+ }
+
+ public AOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository, Class<? extends ClassPoolSearchStrategy> searchStrategy)
+ {
+ super(cl, src, repository, searchStrategy);
+ }
+
+ public AOPClassPool(ClassPool src, ScopedClassPoolRepository repository, Class<? extends ClassPoolSearchStrategy> searchStrategy)
+ {
+ super(src, repository, searchStrategy);
+ }*/
+
+ private ScopedClassPool delegate;
+
+ public AOPClassPool(AbstractClassPool delegate)
+ {
+ super(ClassPool.getDefault(), null);
+ this.delegate = delegate;
+ 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);
+ }
+
+ public boolean isClassLoadedButNotWoven(String classname)
+ {
+ return loadedButNotWovenClasses.get(classname) == Boolean.TRUE;
+ }
+
+ /*public static AOPClassPool createAOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
+ {
+ return (AOPClassPool)AspectManager.getClassPoolFactory().create(cl, src, repository);
+ }*/
+
+
+ // TODO fix this: the method should be in ScopedClassPoolRepository
+ public static ClassPool createAOPClassPool(ClassPool src, ScopedClassPoolRepository repository)
+ {
+ return ClassPoolRepository.getInstance().getClassPoolFactory().create(src, repository);
+ }
+
+ public static AOPClassPool getInstance(AbstractClassPool delegate)
+ {
+ if (instances.containsKey(delegate))
+ {
+ AOPClassPool classPool = instances.get(delegate).get();
+ if (classPool != null)
+ {
+ return classPool;
+ }
+ instances.remove(delegate);
+ }
+ return null;
+ }
+
+ @Override
+ public void importPackage(String packageName)
+ {
+ delegate.importPackage(packageName);
+ }
+
+ @Override
+ public void clearImportedPackages()
+ {
+ if (delegate == null)
+ {
+ return;
+ }
+ delegate.clearImportedPackages();
+ }
+
+ @Override
+ public Iterator<?> getImportedPackages()
+ {
+ return delegate.getImportedPackages();
+ }
+
+ @Override
+ public void recordInvalidClassName(String name)
+ {
+ delegate.recordInvalidClassName(name);
+ }
+
+ @Override
+ public Object[] lookupCflow(String name)
+ {
+ return delegate.lookupCflow(name);
+ }
+
+ @Override
+ public CtClass getAndRename(String orgName, String newName) throws NotFoundException
+ {
+ return delegate.getAndRename(orgName, newName);
+ }
+
+ @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
+ protected synchronized CtClass get0(String classname, boolean useCache) throws NotFoundException
+ {
+ 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
+ protected CtClass createCtClass(String classname, boolean useCache)
+ {
+ return delegate.createCtClass(classname, useCache);
+ }*/
+
+ @Override
+ public URL find(String classname)
+ {
+ return delegate.find(classname);
+ }
+
+ @Override
+ public CtClass[] get(String[] classnames) throws NotFoundException
+ {
+ return delegate.get(classnames);
+ }
+
+ @Override
+ public CtMethod getMethod(String classname, String methodname) throws NotFoundException
+ {
+ return delegate.getMethod(classname, methodname);
+ }
+
+ @Override
+ public CtClass makeClass(InputStream classfile) throws IOException, RuntimeException
+ {
+ return delegate.makeClass(classfile);
+ }
+
+ @Override
+ public CtClass makeClass(InputStream classfile, boolean ifNotFrozen) throws IOException, RuntimeException
+ {
+ return delegate.makeClass(classfile, ifNotFrozen);
+ }
+
+ @Override
+ public CtClass makeClassIfNew(InputStream classfile) throws IOException, RuntimeException
+ {
+ return delegate.makeClassIfNew(classfile);
+ }
+
+ @Override
+ public CtClass makeClass(String classname) throws RuntimeException
+ {
+ return delegate.makeClass(classname);
+ }
+
+ @Override
+ public synchronized CtClass makeClass(String classname, CtClass superclass) throws RuntimeException
+ {
+ return delegate.makeClass(classname, superclass);
+ }
+
+ @Override
+ public CtClass makeInterface(String name) throws RuntimeException
+ {
+ return delegate.makeInterface(name);
+ }
+
+ @Override
+ public synchronized CtClass makeInterface(String name, CtClass superclass) throws RuntimeException
+ {
+ return delegate.makeInterface(name, superclass);
+ }
+
+ @Override
+ public ClassPath appendSystemPath()
+ {
+ return delegate.appendSystemPath();
+ }
+
+ @Override
+ public ClassPath insertClassPath(ClassPath cp)
+ {
+ return delegate.insertClassPath(cp);
+ }
+
+ @Override
+ public ClassPath appendClassPath(ClassPath cp) {
+ return delegate.appendClassPath(cp);
+ }
+
+ @Override
+ public ClassPath insertClassPath(String pathname) throws NotFoundException
+ {
+ return delegate.insertClassPath(pathname);
+ }
+
+ @Override
+ public ClassPath appendClassPath(String pathname) throws NotFoundException
+ {
+ return delegate.appendClassPath(pathname);
+ }
+
+ @Override
+ public void removeClassPath(ClassPath cp)
+ {
+ delegate.removeClassPath(cp);
+ }
+
+ @Override
+ public void appendPathList(String pathlist) throws NotFoundException
+ {
+ delegate.appendPathList(pathlist);
+ }
+
+ @Override
+ public Class<?> toClass(CtClass clazz) throws CannotCompileException
+ {
+ return delegate.toClass(clazz);
+ }
+
+ @Override
+ public ClassLoader getClassLoader()
+ {
+ return delegate.getClassLoader();
+ }
+
+ @Override
+ @Deprecated
+ public Class<?> toClass(CtClass ct, ClassLoader loader) throws CannotCompileException
+ {
+ return delegate.toClass(ct, loader);
+ }
+
+ @Override
+ public Class<?> toClass(CtClass ct, ClassLoader loader, ProtectionDomain domain) throws CannotCompileException
+ {
+ return delegate.toClass(ct, loader, domain);
+ }
+
+ @Override
+ public void close()
+ {
+ delegate.close();
+ }
+
+ @Override
+ public synchronized void flushClass(String classname)
+ {
+ delegate.flushClass(classname);
+ }
+
+ @Override
+ public synchronized void soften(CtClass clazz)
+ {
+ delegate.soften(clazz);
+ }
+
+ @Override
+ public boolean isUnloadedClassLoader()
+ {
+ return delegate.isUnloadedClassLoader();
+ }
+
+ @Override
+ public void lockInCache(CtClass c)
+ {
+ delegate.lockInCache(c);
+ }
+
+ @Override
+ public synchronized CtClass getLocally(String classname) throws NotFoundException
+ {
+ return delegate.getLocally(classname);
+ }
+
+ /*@Override
+ public CtClass getCached(String classname)
+ {
+ 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/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassPoolFactory.java 2009-08-07 12:59:41 UTC (rev 92128)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.aop.newclasspool;
+package org.jboss.aop.classpool;
import javassist.ClassPool;
import javassist.scopedpool.ScopedClassPoolFactory;
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/ClassLoaderRepository.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/ClassLoaderRepository.java 2009-08-07 12:59:41 UTC (rev 92128)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/ClassLoaderRepository.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.aop.newclasspool;
+package org.jboss.aop.classpool;
import java.lang.reflect.Field;
import java.security.AccessController;
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/FieldAccessTransformer.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/FieldAccessTransformer.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/FieldAccessTransformer.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -40,7 +40,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.ClassAdvisor;
-import org.jboss.aop.newclasspool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.Advisable;
/**
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -41,7 +41,7 @@
import org.jboss.aop.MethodByConInfo;
import org.jboss.aop.MethodByMethodInfo;
import org.jboss.aop.MethodInfo;
-import org.jboss.aop.newclasspool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.logging.AOPLogger;
/**
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -54,9 +54,9 @@
import org.jboss.aop.annotation.compiler.AnnotationInfoCreator;
import org.jboss.aop.array.ArrayAdvisor;
import org.jboss.aop.array.ArrayReplacement;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.introduction.AnnotationIntroduction;
import org.jboss.aop.introduction.InterfaceIntroduction;
-import org.jboss.aop.newclasspool.AOPClassPool;
import org.jboss.aop.util.Advisable;
import org.jboss.aop.util.CtConstructorComparator;
import org.jboss.aop.util.CtFieldComparator;
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/InstrumentorFactory.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/InstrumentorFactory.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/InstrumentorFactory.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -24,7 +24,7 @@
import java.lang.reflect.Constructor;
import org.jboss.aop.AspectManager;
-import org.jboss.aop.newclasspool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.logging.AOPLogger;
/**
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -31,7 +31,7 @@
import javassist.Modifier;
import javassist.NotFoundException;
-import org.jboss.aop.newclasspool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.logging.AOPLogger;
/**
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedConstructionInvocations.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedConstructionInvocations.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedConstructionInvocations.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -28,7 +28,7 @@
import javassist.CtNewConstructor;
import javassist.CtNewMethod;
-import org.jboss.aop.newclasspool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
/**
* Comment
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedConstructorInvocations.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedConstructorInvocations.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedConstructorInvocations.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -29,7 +29,7 @@
import javassist.CtNewMethod;
import javassist.NotFoundException;
-import org.jboss.aop.newclasspool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
/**
* Comment
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedFieldInvocations.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedFieldInvocations.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedFieldInvocations.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -21,7 +21,7 @@
*/
package org.jboss.aop.instrument;
-import org.jboss.aop.newclasspool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.JavassistToReflect;
import javassist.CannotCompileException;
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedInvocations.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedInvocations.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedInvocations.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -28,7 +28,7 @@
import javassist.CtNewConstructor;
import javassist.NotFoundException;
-import org.jboss.aop.newclasspool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
/**
* Comment
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedMethodInvocations.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedMethodInvocations.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedMethodInvocations.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -31,7 +31,7 @@
import javassist.Modifier;
import javassist.NotFoundException;
-import org.jboss.aop.newclasspool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
/**
* Comment
Deleted: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassLoaderScopingPolicy.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassLoaderScopingPolicy.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassLoaderScopingPolicy.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -1,55 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.aop.newclasspool;
-
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.Domain;
-
-/**
- * AOPClassLoaderScopingPolicy.<p>
- *
- * This is a temporary abstraction to replace AOPScopedClassLoaderHelper
- * until a better deployment/context resolution mechanism is used rather
- * than using the classloader to decide things.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public interface AOPClassLoaderScopingPolicy
-{
- /**
- * Get the domain for classloader
- *
- * @param classLoader the classloader
- * @param parent the parent (isn't this always the top level aspect manager?)
- * @return any scoped domain or the null if not scoped
- */
- Domain getDomain(ClassLoader classLoader, AspectManager parent);
-
- /**
- * Get the top level domain
- *
- * @param parent the parent (isn't this always the top level aspect manager?)
- * @return any scoped domain or the null if not scoped
- */
- Domain getTopLevelDomain(AspectManager parent);
-}
Deleted: 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-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassPool.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -1,396 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.aop.newclasspool;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.ref.WeakReference;
-import java.net.URL;
-import java.security.ProtectionDomain;
-import java.util.Iterator;
-import java.util.WeakHashMap;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javassist.CannotCompileException;
-import javassist.ClassPath;
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.NotFoundException;
-import javassist.scopedpool.ScopedClassPool;
-import javassist.scopedpool.ScopedClassPoolRepository;
-
-import org.jboss.classpool.AbstractClassPool;
-import org.jboss.classpool.ClassPoolRepository;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 86930 $
- */
-public class AOPClassPool extends AbstractClassPool
-{
- protected final Logger logger = Logger.getLogger(this.getClass());
-
- /** Classnames of classes that have been loaded, but were not woven */
- protected final ConcurrentHashMap<String, Boolean> loadedButNotWovenClasses = new ConcurrentHashMap<String, Boolean>();
-
- private static WeakHashMap<AbstractClassPool, WeakReference<AOPClassPool>> instances = new WeakHashMap<AbstractClassPool, WeakReference<AOPClassPool>>();
-
- static
- {
- ClassPool.doPruning = false;
- ClassPool.releaseUnmodifiedClassFile = false;
- }
-
- /*public AOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
- {
- super(cl, src, repository);
- }
-
- protected AOPClassPool(ClassPool src, ScopedClassPoolRepository repository)
- {
- super(src, repository);
- }
-
- public AOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository, Class<? extends ClassPoolSearchStrategy> searchStrategy)
- {
- super(cl, src, repository, searchStrategy);
- }
-
- public AOPClassPool(ClassPool src, ScopedClassPoolRepository repository, Class<? extends ClassPoolSearchStrategy> searchStrategy)
- {
- super(src, repository, searchStrategy);
- }*/
-
- private ScopedClassPool delegate;
-
- public AOPClassPool(AbstractClassPool delegate)
- {
- super(ClassPool.getDefault(), null);
- this.delegate = delegate;
- 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);
- }
-
- public boolean isClassLoadedButNotWoven(String classname)
- {
- return loadedButNotWovenClasses.get(classname) == Boolean.TRUE;
- }
-
- /*public static AOPClassPool createAOPClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
- {
- return (AOPClassPool)AspectManager.getClassPoolFactory().create(cl, src, repository);
- }*/
-
-
- // TODO fix this: the method should be in ScopedClassPoolRepository
- public static ClassPool createAOPClassPool(ClassPool src, ScopedClassPoolRepository repository)
- {
- return ClassPoolRepository.getInstance().getClassPoolFactory().create(src, repository);
- }
-
- public static AOPClassPool getInstance(AbstractClassPool delegate)
- {
- if (instances.containsKey(delegate))
- {
- AOPClassPool classPool = instances.get(delegate).get();
- if (classPool != null)
- {
- return classPool;
- }
- instances.remove(delegate);
- }
- return null;
- }
-
- @Override
- public void importPackage(String packageName)
- {
- delegate.importPackage(packageName);
- }
-
- @Override
- public void clearImportedPackages()
- {
- if (delegate == null)
- {
- return;
- }
- delegate.clearImportedPackages();
- }
-
- @Override
- public Iterator<?> getImportedPackages()
- {
- return delegate.getImportedPackages();
- }
-
- @Override
- public void recordInvalidClassName(String name)
- {
- delegate.recordInvalidClassName(name);
- }
-
- @Override
- public Object[] lookupCflow(String name)
- {
- return delegate.lookupCflow(name);
- }
-
- @Override
- public CtClass getAndRename(String orgName, String newName) throws NotFoundException
- {
- return delegate.getAndRename(orgName, newName);
- }
-
- @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
- protected synchronized CtClass get0(String classname, boolean useCache) throws NotFoundException
- {
- 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
- protected CtClass createCtClass(String classname, boolean useCache)
- {
- return delegate.createCtClass(classname, useCache);
- }*/
-
- @Override
- public URL find(String classname)
- {
- return delegate.find(classname);
- }
-
- @Override
- public CtClass[] get(String[] classnames) throws NotFoundException
- {
- return delegate.get(classnames);
- }
-
- @Override
- public CtMethod getMethod(String classname, String methodname) throws NotFoundException
- {
- return delegate.getMethod(classname, methodname);
- }
-
- @Override
- public CtClass makeClass(InputStream classfile) throws IOException, RuntimeException
- {
- return delegate.makeClass(classfile);
- }
-
- @Override
- public CtClass makeClass(InputStream classfile, boolean ifNotFrozen) throws IOException, RuntimeException
- {
- return delegate.makeClass(classfile, ifNotFrozen);
- }
-
- @Override
- public CtClass makeClassIfNew(InputStream classfile) throws IOException, RuntimeException
- {
- return delegate.makeClassIfNew(classfile);
- }
-
- @Override
- public CtClass makeClass(String classname) throws RuntimeException
- {
- return delegate.makeClass(classname);
- }
-
- @Override
- public synchronized CtClass makeClass(String classname, CtClass superclass) throws RuntimeException
- {
- return delegate.makeClass(classname, superclass);
- }
-
- @Override
- public CtClass makeInterface(String name) throws RuntimeException
- {
- return delegate.makeInterface(name);
- }
-
- @Override
- public synchronized CtClass makeInterface(String name, CtClass superclass) throws RuntimeException
- {
- return delegate.makeInterface(name, superclass);
- }
-
- @Override
- public ClassPath appendSystemPath()
- {
- return delegate.appendSystemPath();
- }
-
- @Override
- public ClassPath insertClassPath(ClassPath cp)
- {
- return delegate.insertClassPath(cp);
- }
-
- @Override
- public ClassPath appendClassPath(ClassPath cp) {
- return delegate.appendClassPath(cp);
- }
-
- @Override
- public ClassPath insertClassPath(String pathname) throws NotFoundException
- {
- return delegate.insertClassPath(pathname);
- }
-
- @Override
- public ClassPath appendClassPath(String pathname) throws NotFoundException
- {
- return delegate.appendClassPath(pathname);
- }
-
- @Override
- public void removeClassPath(ClassPath cp)
- {
- delegate.removeClassPath(cp);
- }
-
- @Override
- public void appendPathList(String pathlist) throws NotFoundException
- {
- delegate.appendPathList(pathlist);
- }
-
- @Override
- public Class<?> toClass(CtClass clazz) throws CannotCompileException
- {
- return delegate.toClass(clazz);
- }
-
- @Override
- public ClassLoader getClassLoader()
- {
- return delegate.getClassLoader();
- }
-
- @Override
- @Deprecated
- public Class<?> toClass(CtClass ct, ClassLoader loader) throws CannotCompileException
- {
- return delegate.toClass(ct, loader);
- }
-
- @Override
- public Class<?> toClass(CtClass ct, ClassLoader loader, ProtectionDomain domain) throws CannotCompileException
- {
- return delegate.toClass(ct, loader, domain);
- }
-
- @Override
- public void close()
- {
- delegate.close();
- }
-
- @Override
- public synchronized void flushClass(String classname)
- {
- delegate.flushClass(classname);
- }
-
- @Override
- public synchronized void soften(CtClass clazz)
- {
- delegate.soften(clazz);
- }
-
- @Override
- public boolean isUnloadedClassLoader()
- {
- return delegate.isUnloadedClassLoader();
- }
-
- @Override
- public void lockInCache(CtClass c)
- {
- delegate.lockInCache(c);
- }
-
- @Override
- public synchronized CtClass getLocally(String classname) throws NotFoundException
- {
- return delegate.getLocally(classname);
- }
-
- /*@Override
- public CtClass getCached(String classname)
- {
- return delegate.getCached(classname);
- }*/
-
- public boolean equals(Object other)
- {
- if (other == this)
- {
- return true;
- }
- return other instanceof ScopedClassPool && delegate.equals(other);
- }
-}
Deleted: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassPoolFactory.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassPoolFactory.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/AOPClassPoolFactory.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.aop.newclasspool;
-
-import javassist.ClassPool;
-import javassist.scopedpool.ScopedClassPoolFactory;
-import javassist.scopedpool.ScopedClassPoolRepository;
-
-import org.jboss.classpool.AbstractClassPool;
-import org.jboss.classpool.AbstractClassPoolFactory;
-import org.jboss.classpool.AbstractClassPoolFactoryImpl;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 55872 $
- *
- **/
-public class AOPClassPoolFactory implements ScopedClassPoolFactory
-{
- private static AbstractClassPoolFactory delegateClassPoolFactory = new AbstractClassPoolFactoryImpl();
-
- public static void setDelegateClassPoolFactory (AbstractClassPoolFactory factory)
- {
- delegateClassPoolFactory = factory;
- }
-
- public AOPClassPool create(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
- {
- if (delegateClassPoolFactory == null)
- {
- throw new IllegalStateException("AOPClassPoolFactory can be used only after delegateClassPoolFactory is defined");
- }
- AbstractClassPool delegate = delegateClassPoolFactory.create(cl, src, repository);
- return new AOPClassPool(delegate);
- }
-
- public AOPClassPool create(ClassPool src, ScopedClassPoolRepository repository)
- {
- if (delegateClassPoolFactory == null)
- {
- throw new IllegalStateException("AOPClassPoolFactory can be used only after delegateClassPoolFactory is defined");
- }
- AbstractClassPool delegate = delegateClassPoolFactory.create(src, repository);
- return new AOPClassPool(delegate);
- }
-}
Deleted: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/ClassLoaderRepository.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/ClassLoaderRepository.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/newclasspool/ClassLoaderRepository.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -1,262 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.aop.newclasspool;
-
-import java.lang.reflect.Field;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.HashMap;
-import java.util.HashSet;
-
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.advice.SecurityActions;
-import org.jboss.aop.instrument.Instrumentor;
-import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.classpool.ClassPoolRepositoryCallback;
-
-/**
- * Singleton classpool repository used by aop
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
- * @version $Revision: 87799 $
- */
-public class ClassLoaderRepository implements ClassPoolRepositoryCallback
-{
- private static final AOPLogger logger = AOPLogger.getLogger(ClassLoaderRepository.class);
-
- private final static ClassLoaderRepository instance = new ClassLoaderRepository();
-
- /** The classes per classppol */
- protected final HashMap<ClassLoader, HashSet<Class<?>>> ucl2classes = new HashMap<ClassLoader, HashSet<Class<?>>>();
-
- /** The top-level AspectManager this pool belongs to */
- AspectManager manager;
-
- public static ClassLoaderRepository getInstance()
- {
- return instance;
- }
-
- private ClassLoaderRepository()
- {
- //This was needed when jboss-aop.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);
- }
-
- public ScopedClassPoolFactory getClassPoolFactory()
- {
- return delegate.getClassPoolFactory();
- }
-
- public boolean isPrune()
- {
- return delegate.isPrune();
- }
-
- public void setPrune(boolean prune)
- {
- delegate.setPrune(prune);
- }
-
- public ScopedClassPool createScopedClassPool(ClassLoader cl, ClassPool src)
- {
- return delegate.createScopedClassPool(cl, src);
- }
-
- public ClassPool findClassPool(ClassLoader cl)
- {
- return delegate.findClassPool(cl);
- }*/
-
- public void setAspectManager(AspectManager manager)
- {
- this.manager = manager;
- }
-
- /**
- * Get the registered classloaders
- *
- * @return the registered classloaders
- */
- /*public Map<ClassLoader, ClassPool> getRegisteredCLs()
- {
- return delegate.getRegisteredCLs();
- }
-
- /**
- * This method will check to see if a register classloader has been undeployed (as in JBoss)
- *
- public void clearUnregisteredClassLoaders()
- {
- delegate.clearUnregisteredClassLoaders();
- }
-
- public ClassPool registerClassLoader(ClassLoader ucl)
- {
- return delegate.registerClassLoader(ucl);
- }
-
- public void unregisterClassLoader(ClassLoader cl)
- {
- delegate.unregisterClassLoader(cl);
- }*/
-
- public void registerClass(Class<?> clazz)
- {
- ClassLoader classLoader = SecurityActions.getClassLoader(clazz);
- HashSet<Class<?>> classes = ucl2classes.get(classLoader);
- if (classes == null)
- {
- classes = new HashSet<Class<?>>();
- ucl2classes.put(classLoader, classes);
- }
- classes.add(clazz);
- }
-
- public void classLoaderUnregistered(ClassLoader classLoader)
- {
- if (System.getSecurityManager() == null)
- {
- UnregisterClassLoaderAction.NON_PRIVILEGED.unregister(this, classLoader);
- }
- else
- {
- UnregisterClassLoaderAction.PRIVILEGED.unregister(this, classLoader);
- }
- }
-
- private void doUnregisterClassLoader(ClassLoader cl)
- {
- synchronized (this)
- {
- HashSet<Class<?>> classes = ucl2classes.remove(cl);
- if (classes != null)
- {
- for (Class<?> clazz : classes)
- {
- manager.cleanAdvisor(clazz);
- Class<?> advisedClass = clazz;
- try
- {
- //The static advisor field should be the only remaining hard reference to the advisor
- Field f = advisedClass.getDeclaredField(Instrumentor.HELPER_FIELD_NAME);
- f.setAccessible(true);
- f.set(null, null);
- }
- catch(NoSuchFieldException e)
- {
- logger.warn("Error unsetting advisor for " + advisedClass.getName() + " " + e);
- }
- catch(IllegalAccessException e)
- {
- logger.warn("Error unsetting advisor for " + advisedClass.getName() + " " + e);
- }
- catch(NoClassDefFoundError e)
- {
- logger.warn("Error unsetting advisor for " + advisedClass.getName() + " " + e);
- }
- }
- }
- manager.cleanProxyAdvisorDomains(cl);
- }
- }
-
-
- interface UnregisterClassLoaderAction
- {
- void unregister(ClassLoaderRepository repository, ClassLoader loader);
-
- UnregisterClassLoaderAction PRIVILEGED = new UnregisterClassLoaderAction()
- {
- public void unregister(final ClassLoaderRepository repository, final ClassLoader loader)
- {
- try
- {
- AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
- {
- public Object run()
- {
- repository.doUnregisterClassLoader(loader);
- return null;
- }
- });
- }
- catch (PrivilegedActionException e)
- {
- Exception ex = e.getException();
- if (ex instanceof RuntimeException)
- {
- throw (RuntimeException)ex;
- }
- throw new RuntimeException(ex);
- }
- }
- };
-
- UnregisterClassLoaderAction NON_PRIVILEGED = new UnregisterClassLoaderAction()
- {
- public void unregister(ClassLoaderRepository repository, ClassLoader loader)
- {
- repository.doUnregisterClassLoader(loader);
- }
- };
- }
-
-
- public void classLoaderRegistered(ClassLoader classLoader)
- {
- // TODO Auto-generated method stub
-
- }
-}
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/jdk15/dynamic/common/scenario/ScenarioRunner.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/jdk15/dynamic/common/scenario/ScenarioRunner.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/jdk15/dynamic/common/scenario/ScenarioRunner.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -34,7 +34,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.ClassAdvisor;
import org.jboss.aop.advice.AdviceBinding;
-import org.jboss.aop.newclasspool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.pointcut.ast.ParseException;
import org.jboss.test.aop.jdk15.dynamic.common.BindingInterceptor;
import org.jboss.test.aop.jdk15.dynamic.common.InstanceInterceptor;
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-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/JBossIntegration.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -26,7 +26,7 @@
import javassist.scopedpool.ScopedClassPoolFactory;
import org.jboss.aop.ClassLoaderValidation;
-import org.jboss.aop.newclasspool.AOPClassLoaderScopingPolicy;
+import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
/**
* AOPIntegration.<p>
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -40,9 +40,9 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.asintegration.JBossIntegration;
+import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
+import org.jboss.aop.classpool.AOPClassPoolFactory;
import org.jboss.aop.domain.ScopedRepositoryClassLoaderDomain;
-import org.jboss.aop.newclasspool.AOPClassLoaderScopingPolicy;
-import org.jboss.aop.newclasspool.AOPClassPoolFactory;
import org.jboss.classpool.AbstractClassPoolFactory;
import org.jboss.classpool.jboss4.JBossClassPool;
import org.jboss.classpool.jboss4.JBossClassPoolFactory;
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-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/RepositoryClassLoaderScopingPolicy.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -26,8 +26,8 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.Domain;
+import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
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;
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -36,7 +36,7 @@
import javax.management.ObjectName;
import org.jboss.aop.AspectManager;
-import org.jboss.aop.newclasspool.AOPClassPoolFactory;
+import org.jboss.aop.classpool.AOPClassPoolFactory;
import org.jboss.classpool.ucl.JBossUclDelegatingClassPoolFactory;
import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
import org.jboss.mx.loading.LoaderRepository;
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclDelegatingClassPoolTestCase.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclDelegatingClassPoolTestCase.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclDelegatingClassPoolTestCase.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -28,7 +28,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.aop.newclasspool.AOPClassPool;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
import org.jboss.aop.proxy.container.AspectManaged;
import org.jboss.aop.proxy.container.ContainerProxyFactory;
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderScopingPolicyWithRegistry.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderScopingPolicyWithRegistry.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderScopingPolicyWithRegistry.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -21,7 +21,7 @@
*/
package org.jboss.aop.asintegration.jboss5;
-import org.jboss.aop.newclasspool.AOPClassLoaderScopingPolicy;
+import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
import org.jboss.classloading.spi.dependency.Module;
import org.jboss.classpool.jboss5.DomainRegistry;
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -35,7 +35,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.asintegration.JBossIntegration;
-import org.jboss.aop.newclasspool.AOPClassPoolFactory;
+import org.jboss.aop.classpool.AOPClassPoolFactory;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloading.spi.RealClassLoader;
import org.jboss.classpool.AbstractClassPoolFactory;
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java 2009-08-14 12:21:13 UTC (rev 92361)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java 2009-08-14 12:23:50 UTC (rev 92362)
@@ -38,7 +38,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.asintegration.jboss5.AOPVFSClassLoaderDomainRegistry;
import org.jboss.aop.asintegration.jboss5.ScopedVFSClassLoaderDomain;
-import org.jboss.aop.newclasspool.AOPClassPoolFactory;
+import org.jboss.aop.classpool.AOPClassPoolFactory;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
import org.jboss.classloader.plugins.filter.CombiningClassFilter;
import org.jboss.classloader.plugins.filter.PatternClassFilter;
More information about the jboss-cvs-commits
mailing list