[jboss-cvs] JBossAS SVN: r98998 - in projects/aop/branches/classpool_JBAOP-742: aop/src/main/java/org/jboss/aop/classpool and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 4 13:20:28 EST 2010
Author: flavia.rainone at jboss.com
Date: 2010-01-04 13:20:27 -0500 (Mon, 04 Jan 2010)
New Revision: 98998
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/classpool/AOPClassPoolFactory.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/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-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/JBoss4Integration.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/JBoss5Integration.java
projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
Log:
[JBAOP-742] Removed AOPClassPool delegate for optimization purposes.
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -61,7 +61,6 @@
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;
@@ -296,7 +295,7 @@
ClassPoolRepository classPoolRepository = ClassPoolRepository.getInstance();
classLoaderRepository.setAspectManager(manager);
classPoolRepository.setClassPoolRepositoryCallback(classLoaderRepository);
- classPoolRepository.setClassPoolFactory(new AOPClassPoolFactory());
+ //classPoolRepository.setClassPoolFactory(new AOPClassPoolFactory());
if (!verbose)
{
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -24,8 +24,8 @@
import javassist.ByteArrayClassPath;
import javassist.CtClass;
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.util.logging.AOPLogger;
@@ -60,7 +60,7 @@
{
return null;
}
- AOPClassPool pool = (AOPClassPool) ClassPoolRepository.getInstance().registerClassLoader(loader);
+ ScopedClassPool pool = (ScopedClassPool) ClassPoolRepository.getInstance().registerClassLoader(loader);
CtClass clazz = null;
try
{
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -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.instrument.WeavingRegistry;
import org.jboss.aop.util.logging.AOPLogger;
import org.jboss.classpool.spi.AbstractClassPool;
import org.jboss.classpool.spi.ClassPoolRepository;
@@ -65,7 +65,7 @@
return null;
}
- AOPClassPool pool = (AOPClassPool) ClassPoolRepository.getInstance().registerClassLoader(loader);
+ ScopedClassPool pool = (ScopedClassPool) ClassPoolRepository.getInstance().registerClassLoader(loader);
CtClass clazz = obtainCtClassInfo(pool, className, classfileBuffer);
@@ -125,9 +125,9 @@
}
}
- private CtClass instrumentClass(AspectManager manager, AOPClassPool pool, CtClass clazz, boolean isLoadedClass) throws NotFoundException, Exception
+ private CtClass instrumentClass(AspectManager manager, ScopedClassPool pool, CtClass clazz, boolean isLoadedClass) throws NotFoundException, Exception
{
- if (pool.isClassLoadedButNotWoven(clazz.getName()))
+ if (WeavingRegistry.isClassLoadedButNotWoven(pool, clazz.getName()))
{
return null;
}
@@ -139,14 +139,14 @@
ClassPool superPool = superClass.getClassPool();
if (superPool != null && superPool instanceof AbstractClassPool)
{
- AOPClassPool aopSuperPool = AOPClassPool.getInstance((AbstractClassPool) superPool);
+ //AOPClassPool aopSuperPool = AOPClassPool.getInstance((AbstractClassPool) superPool);
AspectManager aspectManager = manager;
if (manager instanceof Domain && superPool != pool)
{
//We are in a scoped classloader and the superclass is not
aspectManager = AspectManager.instance(superPool.getClassLoader());
}
- instrumentClass(aspectManager, aopSuperPool, superClass, false);
+ instrumentClass(aspectManager, (ScopedClassPool) superPool, superClass, false);
}
}
@@ -213,7 +213,7 @@
if (isLoadedClass)
{
- pool.setClassLoadedButNotWoven(clazz.getName());
+ WeavingRegistry.setClassLoadedButNotWoven(pool, clazz.getName());
}
return null;
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/classpool/AOPClassPool.java 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPool.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -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.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.spi.AbstractClassPool;
-import org.jboss.classpool.spi.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/classpool/AOPClassPoolFactory.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/classpool/AOPClassPoolFactory.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -1,65 +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.classpool;
-
-import javassist.ClassPool;
-import javassist.scopedpool.ScopedClassPoolRepository;
-
-import org.jboss.classpool.spi.AbstractClassPool;
-import org.jboss.classpool.spi.AbstractClassPoolFactory;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 55872 $
- *
- **/
-public class AOPClassPoolFactory extends AbstractClassPoolFactory
-{
- private static AbstractClassPoolFactory delegateClassPoolFactory = new AbstractClassPoolFactory();
-
- 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 delegate == null? null: 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 delegate == null? null: new AOPClassPool(delegate);
- }
-}
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/FieldAccessTransformer.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -26,6 +26,7 @@
import java.util.List;
import javassist.CannotCompileException;
+import javassist.ClassPool;
import javassist.CodeConverter;
import javassist.CtClass;
import javassist.CtField;
@@ -40,7 +41,6 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.ClassAdvisor;
-import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.Advisable;
/**
@@ -507,7 +507,7 @@
protected CtMethod buildReadWrapperPlaceHolder(CtClass clazz, CtField field, String wrapperName, int mod)
throws NotFoundException, CannotCompileException
{
- AOPClassPool classPool = (AOPClassPool) instrumentor.getClassPool();
+ ClassPool classPool = instrumentor.getClassPool();
CtClass ftype = field.getType();
CtClass[] readParam = new CtClass[]{classPool.get("java.lang.Object")};
@@ -574,7 +574,7 @@
protected CtMethod buildWriteWrapperPlaceHolder(CtClass clazz, CtField field, String wrapperName, int mod)
throws NotFoundException, CannotCompileException
{
- AOPClassPool classPool = (AOPClassPool) instrumentor.getClassPool();
+ ClassPool classPool = instrumentor.getClassPool();
CtClass ftype = field.getType();
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/GeneratedAdvisorInstrumentor.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -22,6 +22,7 @@
package org.jboss.aop.instrument;
import javassist.CannotCompileException;
+import javassist.ClassPool;
import javassist.CtClass;
import javassist.CtConstructor;
import javassist.CtField;
@@ -41,7 +42,6 @@
import org.jboss.aop.MethodByConInfo;
import org.jboss.aop.MethodByMethodInfo;
import org.jboss.aop.MethodInfo;
-import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.logging.AOPLogger;
/**
@@ -88,7 +88,7 @@
CtClass genadvisor;
CtClass genInstanceAdvisor;
- public GeneratedAdvisorInstrumentor(AOPClassPool pool, AspectManager manager, JoinpointClassifier joinpointClassifier, DynamicTransformationObserver observer)
+ public GeneratedAdvisorInstrumentor(ClassPool pool, AspectManager manager, JoinpointClassifier joinpointClassifier, DynamicTransformationObserver observer)
{
super(pool, manager, joinpointClassifier, observer);
}
@@ -719,7 +719,7 @@
// 3) a new child class is loaded and since the SuperClassesWeavingStrategy will attempt to
// weave not modified superclasses, the CtClass will contain the right baseclass stuff, although
// the already loaded class does not.
- if (((AOPClassPool) classPool).isClassLoadedButNotWoven(supa.getName()))
+ if (WeavingRegistry.isClassLoadedButNotWoven(classPool, supa.getName()))
{
return true;
}
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -54,7 +54,6 @@
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.util.Advisable;
@@ -692,7 +691,7 @@
String ref = null;
try
{
- ClassPool pool = AOPClassPool.createAOPClassPool(clazz.getClassPool(), ClassPoolRepository.getInstance());
+ ClassPool pool = ClassPoolRepository.getInstance().getClassPoolFactory().create(clazz.getClassPool(), ClassPoolRepository.getInstance());
//Class.getRefClasses() only gets classes explicitly referenced in the class. We need to check the super classes and do some extra handling
for (ReferenceClassIterator it = new ReferenceClassIterator(clazz.getRefClasses()) ; it.hasNext() ; )
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/InstrumentorFactory.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -23,8 +23,9 @@
import java.lang.reflect.Constructor;
+import javassist.ClassPool;
+
import org.jboss.aop.AspectManager;
-import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.logging.AOPLogger;
/**
@@ -41,7 +42,7 @@
protected static Constructor<?> otherInstrumentorConstructor;
- private static final Class<?>[] CONSTRUCTOR_SIG = new Class[] {AOPClassPool.class, AspectManager.class, JoinpointClassifier.class, DynamicTransformationObserver.class};
+ private static final Class<?>[] CONSTRUCTOR_SIG = new Class[] {ClassPool.class, AspectManager.class, JoinpointClassifier.class, DynamicTransformationObserver.class};
public static void initialise(String property)
{
@@ -95,7 +96,7 @@
return instrumentor;
}
- public static Instrumentor getInstrumentor(AOPClassPool pool, AspectManager manager, JoinpointClassifier joinpointClassifier, DynamicTransformationObserver observer)
+ public static Instrumentor getInstrumentor(ClassPool pool, AspectManager manager, JoinpointClassifier joinpointClassifier, DynamicTransformationObserver observer)
{
if (instrumentor == InstrumentorEnum.CLASSIC)
{
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedCallerInvocations.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -23,6 +23,7 @@
import javassist.CannotCompileException;
+import javassist.ClassPool;
import javassist.CtClass;
import javassist.CtConstructor;
import javassist.CtField;
@@ -31,7 +32,6 @@
import javassist.Modifier;
import javassist.NotFoundException;
-import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.util.logging.AOPLogger;
/**
@@ -105,7 +105,7 @@
CtMethod method, String invocationClassName, String callerDescription)
throws NotFoundException, CannotCompileException
{
- AOPClassPool pool = (AOPClassPool) instrumentor.getClassPool();
+ ClassPool pool = instrumentor.getClassPool();
CtClass methodInvocation = pool.get(invocationClassName);
////////////////
@@ -156,7 +156,7 @@
CtConstructor con, String invocationClassName, String callerDescription)
throws NotFoundException, CannotCompileException
{
- AOPClassPool pool = (AOPClassPool) instrumentor.getClassPool();
+ ClassPool pool = instrumentor.getClassPool();
CtClass conInvocation = pool.get(invocationClassName);
////////////////
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedConstructionInvocations.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -22,14 +22,13 @@
package org.jboss.aop.instrument;
+import javassist.ClassPool;
import javassist.CtClass;
import javassist.CtConstructor;
import javassist.CtMethod;
import javassist.CtNewConstructor;
import javassist.CtNewMethod;
-import org.jboss.aop.classpool.AOPClassPool;
-
/**
* Comment
*
@@ -54,7 +53,7 @@
Instrumentor instrumentor, CtClass clazz, CtConstructor con, int index)
throws Exception
{
- AOPClassPool pool = (AOPClassPool) instrumentor.getClassPool();
+ ClassPool pool = instrumentor.getClassPool();
CtClass conInvocation = pool.get("org.jboss.aop.joinpoint.ConstructionInvocation");
////////////////
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedConstructorInvocations.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -22,6 +22,7 @@
package org.jboss.aop.instrument;
import javassist.CannotCompileException;
+import javassist.ClassPool;
import javassist.CtClass;
import javassist.CtConstructor;
import javassist.CtMethod;
@@ -29,8 +30,6 @@
import javassist.CtNewMethod;
import javassist.NotFoundException;
-import org.jboss.aop.classpool.AOPClassPool;
-
/**
* Comment
*
@@ -55,7 +54,7 @@
CtClass clazz, CtConstructor con, int index)
throws NotFoundException, CannotCompileException
{
- AOPClassPool pool = (AOPClassPool) instrumentor.getClassPool();
+ ClassPool pool = instrumentor.getClassPool();
CtClass conInvocation = pool.get("org.jboss.aop.joinpoint.ConstructorInvocation");
////////////////
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedFieldInvocations.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -21,9 +21,6 @@
*/
package org.jboss.aop.instrument;
-import org.jboss.aop.classpool.AOPClassPool;
-import org.jboss.aop.util.JavassistToReflect;
-
import javassist.CannotCompileException;
import javassist.ClassPool;
import javassist.CtClass;
@@ -33,6 +30,8 @@
import javassist.Modifier;
import javassist.NotFoundException;
+import org.jboss.aop.util.JavassistToReflect;
+
/**
* Comment
*
@@ -108,7 +107,7 @@
protected static String createOptimizedInvocationClass(Instrumentor instrumentor, CtClass clazz, CtField field, boolean get) throws Exception
{
- AOPClassPool pool = (AOPClassPool) instrumentor.getClassPool();
+ ClassPool pool = instrumentor.getClassPool();
CtClass fieldInvocation =
get
? pool.get("org.jboss.aop.joinpoint.FieldReadInvocation")
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedInvocations.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -23,13 +23,12 @@
import javassist.CannotCompileException;
+import javassist.ClassPool;
import javassist.CtClass;
import javassist.CtConstructor;
import javassist.CtNewConstructor;
import javassist.NotFoundException;
-import org.jboss.aop.classpool.AOPClassPool;
-
/**
* Comment
*
@@ -38,7 +37,7 @@
*/
public abstract class OptimizedInvocations
{
- public static void defrostClassIfExists(AOPClassPool pool, String className)
+ public static void defrostClassIfExists(ClassPool pool, String className)
{
//In some cases we get a class frozen exception. I guess if the invocation class
//existed, method was unwrapped and the wrapped again
@@ -63,7 +62,7 @@
* @param superInvocation The super class of this invocation
* @return The created invocation class
*/
- public static CtClass makeInvocationClass(AOPClassPool pool,
+ public static CtClass makeInvocationClass(ClassPool pool,
boolean makeInnerClass,
CtClass outerClass,
String className,
@@ -86,7 +85,7 @@
return invocation;
}
- public static CtClass makeInvocationClassNoCtors(AOPClassPool pool,
+ public static CtClass makeInvocationClassNoCtors(ClassPool pool,
boolean makeInnerClass,
CtClass outerClass,
String className,
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/instrument/OptimizedMethodInvocations.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -24,6 +24,7 @@
import java.lang.reflect.Method;
import javassist.CannotCompileException;
+import javassist.ClassPool;
import javassist.CtClass;
import javassist.CtField;
import javassist.CtMethod;
@@ -31,8 +32,6 @@
import javassist.Modifier;
import javassist.NotFoundException;
-import org.jboss.aop.classpool.AOPClassPool;
-
/**
* Comment
*
@@ -67,7 +66,7 @@
CtClass clazz, CtMethod method, CtMethod notAdvisedMethod)
throws NotFoundException, CannotCompileException
{
- AOPClassPool pool = (AOPClassPool) instrumentor.getClassPool();
+ ClassPool pool = instrumentor.getClassPool();
CtClass methodInvocation = pool.get("org.jboss.aop.joinpoint.MethodInvocation");
////////////////
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/jdk15/dynamic/common/scenario/ScenarioRunner.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -29,12 +29,12 @@
import javassist.CtField;
import javassist.CtMethod;
import javassist.NotFoundException;
+import javassist.scopedpool.ScopedClassPool;
import org.jboss.aop.Advised;
import org.jboss.aop.AspectManager;
import org.jboss.aop.ClassAdvisor;
import org.jboss.aop.advice.AdviceBinding;
-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;
@@ -326,7 +326,7 @@
private static void loadPOJOData()
{
Map<ClassLoader, ClassPool> cls = AspectManager.getRegisteredCLs();
- AOPClassPool classPool = (AOPClassPool) cls.get(POJO.class.getClassLoader());
+ ScopedClassPool classPool = (ScopedClassPool) cls.get(POJO.class.getClassLoader());
try
{
POJO_CLASS = classPool.getLocally(POJO.class.getName());
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -41,7 +41,6 @@
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.classpool.plugins.ucl.JBossClassPool;
import org.jboss.classpool.plugins.ucl.JBossClassPoolFactory;
@@ -50,6 +49,7 @@
import org.jboss.classpool.plugins.ucl.ScopedRepositoryClassLoaderHelper;
import org.jboss.classpool.plugins.ucl.UclDelegatingClassPoolFactory;
import org.jboss.classpool.spi.AbstractClassPoolFactory;
+import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.logging.Logger;
import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
import org.jboss.mx.loading.RepositoryClassLoader;
@@ -157,8 +157,9 @@
return this;
}
}
- AOPClassPoolFactory.setDelegateClassPoolFactory(abstractClassPoolFactory);
- delegateClassPoolFactory = new AOPClassPoolFactory();
+ ClassPoolRepository.getInstance().setClassPoolFactory(abstractClassPoolFactory);
+ //AOPClassPoolFactory.setDelegateClassPoolFactory(abstractClassPoolFactory);
+ delegateClassPoolFactory = abstractClassPoolFactory;//new AOPClassPoolFactory();
return this;
}
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -36,8 +36,8 @@
import javax.management.ObjectName;
import org.jboss.aop.AspectManager;
-import org.jboss.aop.classpool.AOPClassPoolFactory;
import org.jboss.classpool.plugins.ucl.UclDelegatingClassPoolFactory;
+import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
import org.jboss.mx.loading.LoaderRepository;
import org.jboss.mx.loading.RepositoryClassLoader;
@@ -81,7 +81,8 @@
try
{
MAIN_LOADER_REPOSITORY_OBJECT_NAME = new ObjectName("JMImplementation:name=Default,service=LoaderRepository");
- AOPClassPoolFactory.setDelegateClassPoolFactory(new UclDelegatingClassPoolFactory(new File(".")));
+ //AOPClassPoolFactory.setDelegateClassPoolFactory(new UclDelegatingClassPoolFactory(new File(".")));
+ ClassPoolRepository.getInstance().setClassPoolFactory(new UclDelegatingClassPoolFactory(new File(".")));
}
catch (Exception e)
{
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclDelegatingClassPoolTestCase.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -28,7 +28,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-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/JBoss5Integration.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -35,7 +35,6 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.asintegration.JBossIntegration;
-import org.jboss.aop.classpool.AOPClassPoolFactory;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloading.spi.RealClassLoader;
import org.jboss.classpool.plugins.jbosscl.JBoss5ClassPoolFactory;
@@ -133,8 +132,9 @@
{
if (factory instanceof AbstractClassPoolFactory)
{
- AOPClassPoolFactory.setDelegateClassPoolFactory((AbstractClassPoolFactory) factory);
- this.delegateClassPoolFactory = new AOPClassPoolFactory();
+ ClassPoolRepository.getInstance().setClassPoolFactory((AbstractClassPoolFactory) factory);
+ //AOPClassPoolFactory.setDelegateClassPoolFactory();
+ this.delegateClassPoolFactory = factory;//new AOPClassPoolFactory();
}
else
{
@@ -147,8 +147,10 @@
{
if (delegateClassPoolFactory == null)
{
- AOPClassPoolFactory.setDelegateClassPoolFactory(new JBoss5ClassPoolFactory(getDomainRegistry()));
- delegateClassPoolFactory = new AOPClassPoolFactory();
+ delegateClassPoolFactory = new JBoss5ClassPoolFactory(getDomainRegistry());
+ ClassPoolRepository.getInstance().setClassPoolFactory(delegateClassPoolFactory);
+ //AOPClassPoolFactory.setDelegateClassPoolFactory(new JBoss5ClassPoolFactory(getDomainRegistry()));
+ //delegateClassPoolFactory = new AOPClassPoolFactory();
}
return this;
}
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 2010-01-04 18:09:38 UTC (rev 98997)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java 2010-01-04 18:20:27 UTC (rev 98998)
@@ -38,7 +38,6 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.asintegration.jboss5.AOPVFSClassLoaderDomainRegistry;
import org.jboss.aop.asintegration.jboss5.ScopedVFSClassLoaderDomain;
-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;
@@ -127,8 +126,9 @@
// Notice that AspectManager.instance() is invoked by AOPDependencyBuilder, so
// we have no way of avoiding AspectManager creation
AspectManager.instance();
- ClassPoolRepository.getInstance().setClassPoolFactory(new AOPClassPoolFactory());
- AOPClassPoolFactory.setDelegateClassPoolFactory(new JBossClDelegatingClassPoolFactory(domainRegistry, new RegisterModuleCallback(domainRegistry)));
+ ClassPoolRepository.getInstance().setClassPoolFactory(new JBossClDelegatingClassPoolFactory(domainRegistry, new RegisterModuleCallback(domainRegistry)));
+ //ClassPoolRepository.getInstance().setClassPoolFactory(new AOPClassPoolFactory());
+ //AOPClassPoolFactory.setDelegateClassPoolFactory(new JBossClDelegatingClassPoolFactory(domainRegistry, new RegisterModuleCallback(domainRegistry)));
VFS.init();
}
More information about the jboss-cvs-commits
mailing list