[jboss-cvs] JBossAS SVN: r97839 - in projects/aop/branches/classpool_JBAOP-742: aop and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 15 08:29:19 EST 2009
Author: flavia.rainone at jboss.com
Date: 2009-12-15 08:29:18 -0500 (Tue, 15 Dec 2009)
New Revision: 97839
Modified:
projects/aop/branches/classpool_JBAOP-742/aop/pom.xml
projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/pom.xml
projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/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/main/java/org/jboss/aop/deployment/AspectDeployer.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-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderInitializer.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/AOPDomainRegistry.java
projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPVFSClassLoaderDomainRegistry.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/aop/scopeddomain/test/ScopedVFSClassLoaderDomainTestCase.java
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/pom.xml
Log:
[JBAOP-742] Updated branch so it can work with the current version of JBoss ClassPool
Modified: projects/aop/branches/classpool_JBAOP-742/aop/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/pom.xml 2009-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/aop/pom.xml 2009-12-15 13:29:18 UTC (rev 97839)
@@ -308,8 +308,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-classpool</artifactId>
+ <groupId>org.jboss.classpool</groupId>
+ <artifactId>jboss-classpool-jbosscl</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/pom.xml 2009-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/pom.xml 2009-12-15 13:29:18 UTC (rev 97839)
@@ -145,8 +145,8 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-classpool</artifactId>
+ <groupId>org.jboss.classpool</groupId>
+ <artifactId>jboss-classpool-ucl</artifactId>
</dependency>
</dependencies>
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-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java 2009-12-15 13:29:18 UTC (rev 97839)
@@ -43,12 +43,12 @@
import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
import org.jboss.aop.classpool.AOPClassPoolFactory;
import org.jboss.aop.domain.ScopedRepositoryClassLoaderDomain;
-import org.jboss.classpool.plugins.as4.JBossClassPool;
-import org.jboss.classpool.plugins.as4.JBossClassPoolFactory;
-import org.jboss.classpool.plugins.as4.LoaderRepositoryUrlUtil;
-import org.jboss.classpool.plugins.as4.ScopedJBossClassPool;
-import org.jboss.classpool.plugins.as4.ScopedRepositoryClassLoaderHelper;
-import org.jboss.classpool.plugins.as4.ucl.JBossUclDelegatingClassPoolFactory;
+import org.jboss.classpool.plugins.ucl.JBossClassPool;
+import org.jboss.classpool.plugins.ucl.JBossClassPoolFactory;
+import org.jboss.classpool.plugins.ucl.LoaderRepositoryUrlUtil;
+import org.jboss.classpool.plugins.ucl.ScopedJBossClassPool;
+import org.jboss.classpool.plugins.ucl.ScopedRepositoryClassLoaderHelper;
+import org.jboss.classpool.plugins.ucl.UclDelegatingClassPoolFactory;
import org.jboss.classpool.spi.AbstractClassPoolFactory;
import org.jboss.logging.Logger;
import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
@@ -136,9 +136,9 @@
{
abstractClassPoolFactory = new JBossClassPoolFactory(tmpDir);
}
- else if (classname.equals(JBossUclDelegatingClassPoolFactory.class.getName()))
+ else if (classname.equals(UclDelegatingClassPoolFactory.class.getName()))
{
- abstractClassPoolFactory = new JBossUclDelegatingClassPoolFactory(tmpDir);
+ abstractClassPoolFactory = new UclDelegatingClassPoolFactory(tmpDir);
}
else
{
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-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/RepositoryClassLoaderScopingPolicy.java 2009-12-15 13:29:18 UTC (rev 97839)
@@ -28,7 +28,7 @@
import org.jboss.aop.Domain;
import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
import org.jboss.aop.domain.ScopedRepositoryClassLoaderDomain;
-import org.jboss.classpool.plugins.as4.ScopedRepositoryClassLoaderHelper;
+import org.jboss.classpool.plugins.ucl.ScopedRepositoryClassLoaderHelper;
import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.logging.Logger;
import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AspectDeployer.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AspectDeployer.java 2009-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/deployment/AspectDeployer.java 2009-12-15 13:29:18 UTC (rev 97839)
@@ -35,7 +35,7 @@
import org.jboss.aop.AspectAnnotationLoader;
import org.jboss.aop.AspectManager;
import org.jboss.aop.AspectXmlLoader;
-import org.jboss.classpool.plugins.as4.ScopedRepositoryClassLoaderHelper;
+import org.jboss.classpool.plugins.ucl.ScopedRepositoryClassLoaderHelper;
import org.jboss.deployment.DeploymentException;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.DeploymentState;
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-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/test/java/org/jboss/test/aop/classpool/ucl/test/UclClassPoolTest.java 2009-12-15 13:29:18 UTC (rev 97839)
@@ -37,7 +37,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.classpool.AOPClassPoolFactory;
-import org.jboss.classpool.plugins.as4.ucl.JBossUclDelegatingClassPoolFactory;
+import org.jboss.classpool.plugins.ucl.UclDelegatingClassPoolFactory;
import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
import org.jboss.mx.loading.LoaderRepository;
import org.jboss.mx.loading.RepositoryClassLoader;
@@ -81,7 +81,7 @@
try
{
MAIN_LOADER_REPOSITORY_OBJECT_NAME = new ObjectName("JMImplementation:name=Default,service=LoaderRepository");
- AOPClassPoolFactory.setDelegateClassPoolFactory(new JBossUclDelegatingClassPoolFactory(new File(".")));
+ AOPClassPoolFactory.setDelegateClassPoolFactory(new UclDelegatingClassPoolFactory(new File(".")));
}
catch (Exception e)
{
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderInitializer.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderInitializer.java 2009-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderInitializer.java 2009-12-15 13:29:18 UTC (rev 97839)
@@ -50,7 +50,7 @@
AOPDomainRegistry registry = policy.getRegistry();
if (unit.isTopLevel() || unit.getParent().getClassLoader() != unit.getClassLoader())
{
- registry.cleanupLoader(unit.getClassLoader());
+ registry.cleanupModule(registry.getModule(unit.getClassLoader()));
manager.unregisterClassLoader(unit.getClassLoader());
}
}
@@ -80,8 +80,7 @@
domain = createDomain(registry, unit.getClassLoader(), module, unit);
}
- ClassLoader parentUnitLoader = unit.isTopLevel() ? null : unit.getParent().getClassLoader();
- registry.initMapsForLoader(unit.getClassLoader(), module, domain, parentUnitLoader);
+ registry.initMapsForModule(module, domain);
policy.registerClassLoader(module, unit.getClassLoader());
}
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-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderScopingPolicyWithRegistry.java 2009-12-15 13:29:18 UTC (rev 97839)
@@ -23,7 +23,6 @@
import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
import org.jboss.classloading.spi.dependency.Module;
-import org.jboss.classpool.plugins.as5.DomainRegistry;
/**
*
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPDomainRegistry.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPDomainRegistry.java 2009-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPDomainRegistry.java 2009-12-15 13:29:18 UTC (rev 97839)
@@ -27,7 +27,7 @@
import org.jboss.aop.Domain;
import org.jboss.classloader.spi.ClassLoaderDomain;
import org.jboss.classloading.spi.dependency.Module;
-import org.jboss.classpool.plugins.as5.DomainRegistry;
+import org.jboss.classpool.plugins.jbosscl.DomainRegistry;
/**
*
@@ -37,7 +37,7 @@
*/
public interface AOPDomainRegistry extends DomainRegistry
{
- boolean initMapsForLoader(ClassLoader loader, Module module, ScopedVFSClassLoaderDomain domain, ClassLoader parentUnitLoader);
+ boolean initMapsForModule(Module module, ScopedVFSClassLoaderDomain domain);
Domain getRegisteredDomain(ClassLoader cl);
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPVFSClassLoaderDomainRegistry.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPVFSClassLoaderDomainRegistry.java 2009-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPVFSClassLoaderDomainRegistry.java 2009-12-15 13:29:18 UTC (rev 97839)
@@ -32,7 +32,7 @@
import org.jboss.aop.Domain;
import org.jboss.classloader.spi.ClassLoaderDomain;
import org.jboss.classloading.spi.dependency.Module;
-import org.jboss.classpool.plugins.as5.VFSClassLoaderDomainRegistry;
+import org.jboss.classpool.plugins.jbosscl.VFSClassLoaderDomainRegistry;
/**
*
@@ -72,10 +72,10 @@
return aopDomainsByClassLoader.get(cl);
}
- public synchronized boolean initMapsForLoader(ClassLoader loader, Module module, ScopedVFSClassLoaderDomain domain, ClassLoader parentUnitLoader)
+ public synchronized boolean initMapsForModule(Module module, ScopedVFSClassLoaderDomain domain)
{
this.initDomain = domain;
- return super.initMapsForLoader(loader, module, parentUnitLoader);
+ return super.initMapsForModule(module);
}
@Override
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-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java 2009-12-15 13:29:18 UTC (rev 97839)
@@ -38,7 +38,7 @@
import org.jboss.aop.classpool.AOPClassPoolFactory;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloading.spi.RealClassLoader;
-import org.jboss.classpool.plugins.as5.JBoss5ClassPoolFactory;
+import org.jboss.classpool.plugins.jbosscl.JBoss5ClassPoolFactory;
import org.jboss.classpool.spi.AbstractClassPoolFactory;
/**
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/aop/scopeddomain/test/ScopedVFSClassLoaderDomainTestCase.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/aop/scopeddomain/test/ScopedVFSClassLoaderDomainTestCase.java 2009-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/aop/scopeddomain/test/ScopedVFSClassLoaderDomainTestCase.java 2009-12-15 13:29:18 UTC (rev 97839)
@@ -46,7 +46,6 @@
import org.jboss.aop.advice.ScopedInterceptorFactory;
import org.jboss.aop.array.ArrayReplacement;
import org.jboss.aop.asintegration.jboss5.AOPDomainRegistry;
-import org.jboss.aop.asintegration.jboss5.AOPVFSClassLoaderDomainRegistry;
import org.jboss.aop.asintegration.jboss5.ScopedVFSClassLoaderDomain;
import org.jboss.aop.introduction.AnnotationIntroduction;
import org.jboss.aop.introduction.InterfaceIntroduction;
@@ -61,8 +60,8 @@
import org.jboss.aop.pointcut.TypedefExpression;
import org.jboss.classloader.spi.ClassLoaderDomain;
import org.jboss.classloading.spi.dependency.ClassLoading;
-import org.jboss.classpool.plugins.as5.RegisterModuleCallback;
-import org.jboss.classpool.plugins.as5.jbosscl.JBossClDelegatingClassPoolFactory;
+import org.jboss.classpool.plugins.jbosscl.JBossClDelegatingClassPoolFactory;
+import org.jboss.classpool.plugins.jbosscl.RegisterModuleCallback;
import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.test.classpool.jbosscl.test.JBossClClassPoolTest;
import org.jboss.virtual.VFS;
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-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java 2009-12-15 13:29:18 UTC (rev 97839)
@@ -50,8 +50,8 @@
import org.jboss.classloader.test.support.IsolatedClassLoaderTestHelper;
import org.jboss.classloading.spi.dependency.ClassLoading;
import org.jboss.classloading.spi.dependency.Module;
-import org.jboss.classpool.plugins.as5.RegisterModuleCallback;
-import org.jboss.classpool.plugins.as5.jbosscl.JBossClDelegatingClassPoolFactory;
+import org.jboss.classpool.plugins.jbosscl.JBossClDelegatingClassPoolFactory;
+import org.jboss.classpool.plugins.jbosscl.RegisterModuleCallback;
import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
import org.jboss.kernel.spi.deployment.KernelDeployment;
@@ -671,12 +671,12 @@
setup.setClassLoaderAndDomain(loader, clDomain);
domain = setup.getDomain();
}
- domainRegistry.initMapsForLoader(loader, module, domain, parent);
+ domainRegistry.initMapsForModule(module, domain);
}
protected void unregisterModule(ClassLoader loader)
{
- domainRegistry.cleanupLoader(loader);
+ domainRegistry.cleanupModule(domainRegistry.getModule(loader));
}
protected void assertModule(ClassLoader loader)
@@ -751,7 +751,7 @@
{
if (registeredURLClassLoaders.remove(classLoader) == false)
{
- domainRegistry.cleanupLoader(classLoader);
+ domainRegistry.cleanupModule(domainRegistry.getModule(classLoader));
KernelDeployment deployment = loaderNameDeploymentRegistry.unregisterDeployment(classLoader);
unregisterDeployment(deployment);
}
Modified: projects/aop/branches/classpool_JBAOP-742/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/pom.xml 2009-12-15 13:14:50 UTC (rev 97838)
+++ projects/aop/branches/classpool_JBAOP-742/pom.xml 2009-12-15 13:29:18 UTC (rev 97839)
@@ -342,11 +342,16 @@
<version>${version.org.jboss.cl}</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-classpool</artifactId>
+ <groupId>org.jboss.classpool</groupId>
+ <artifactId>jboss-classpool-jbosscl</artifactId>
<version>${version.org.jboss.classpool}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.classpool</groupId>
+ <artifactId>jboss-classpool-ucl</artifactId>
+ <version>${version.org.jboss.classpool}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-client</artifactId>
<version>${version.org.jboss.deployers}</version>
More information about the jboss-cvs-commits
mailing list