[jboss-cvs] JBossAS SVN: r102238 - in projects/aop/branches/classpool_JBAOP-742: aop and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 10 12:18:55 EST 2010
Author: flavia.rainone at jboss.com
Date: 2010-03-10 12:18:53 -0500 (Wed, 10 Mar 2010)
New Revision: 102238
Modified:
projects/aop/branches/classpool_JBAOP-742/aop/pom.xml
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/contrib/IDEClassPoolFactory.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/eclipsesupport/Agent.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPool.java
projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPoolFactory.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-core/src/main/java/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java
projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.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-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java
projects/aop/branches/classpool_JBAOP-742/pom.xml
Log:
[JBAOP-742] Updated class-pool dependencies
Modified: projects/aop/branches/classpool_JBAOP-742/aop/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/pom.xml 2010-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/aop/pom.xml 2010-03-10 17:18:53 UTC (rev 102238)
@@ -308,6 +308,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.classpool</groupId>
+ <artifactId>jboss-classpool-scoped</artifactId>
+ <version>${version.org.jboss.classpool}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.classpool</groupId>
<artifactId>jboss-classpool</artifactId>
</dependency>
@@ -347,12 +352,20 @@
<artifactId>jboss-profiler-jvmti</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
</dependency>
+ -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.0.3.GA</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- Included for assembly of jdk50-single jar -->
<dependency>
<groupId>log4j</groupId>
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-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/AspectManager.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -43,8 +43,6 @@
import javassist.ClassPool;
import javassist.CtClass;
-import javassist.scopedpool.ScopedClassPool;
-import javassist.scopedpool.ScopedClassPoolFactory;
import org.jboss.aop.advice.AdviceBinding;
import org.jboss.aop.advice.AdviceStack;
@@ -85,6 +83,8 @@
import org.jboss.aop.util.AOPLock;
import org.jboss.aop.util.UnmodifiableEmptyCollections;
import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.classpool.scoped.ScopedClassPool;
+import org.jboss.classpool.scoped.ScopedClassPoolFactory;
import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.util.collection.WeakValueHashMap;
import org.jboss.util.loading.Translator;
@@ -821,7 +821,7 @@
// Public -------------------------------------------------------
- public static Map<ClassLoader, ClassPool> getRegisteredCLs()
+ public static Map<ClassLoader, ScopedClassPool> getRegisteredCLs()
{
return ClassPoolRepository.getInstance().getRegisteredCLs();
}
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-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/ClassicWeavingStrategy.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -24,11 +24,11 @@
import javassist.ByteArrayClassPath;
import javassist.CtClass;
import javassist.NotFoundException;
-import javassist.scopedpool.ScopedClassPool;
import org.jboss.aop.instrument.Instrumentor;
import org.jboss.aop.instrument.InstrumentorFactory;
import org.jboss.aop.util.logging.AOPLogger;
+import org.jboss.classpool.scoped.ScopedClassPool;
import org.jboss.classpool.spi.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 2010-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -1,24 +1,24 @@
/*
-* 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.
-*/
+ * 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;
@@ -26,12 +26,12 @@
import javassist.ClassPool;
import javassist.CtClass;
import javassist.NotFoundException;
-import javassist.scopedpool.ScopedClassPool;
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.scoped.ScopedClassPool;
import org.jboss.classpool.spi.AbstractClassPool;
import org.jboss.classpool.spi.ClassPoolRepository;
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/contrib/IDEClassPoolFactory.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/contrib/IDEClassPoolFactory.java 2010-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/contrib/IDEClassPoolFactory.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -32,10 +32,10 @@
import javassist.ClassPool;
import javassist.CtClass;
import javassist.LoaderClassPath;
-import javassist.scopedpool.ScopedClassPool;
-import javassist.scopedpool.ScopedClassPoolFactory;
-import javassist.scopedpool.ScopedClassPoolRepository;
+import org.jboss.classpool.scoped.ScopedClassPool;
+import org.jboss.classpool.scoped.ScopedClassPoolFactory;
+import org.jboss.classpool.scoped.ScopedClassPoolRepository;
import org.jboss.classpool.spi.AbstractClassPool;
/**
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/eclipsesupport/Agent.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/eclipsesupport/Agent.java 2010-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/eclipsesupport/Agent.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -21,13 +21,12 @@
*/
package org.jboss.aop.eclipsesupport;
+import java.lang.instrument.Instrumentation;
+
import org.jboss.aop.AspectManager;
import org.jboss.aop.standalone.StandaloneClassPoolFactory;
+import org.jboss.classpool.spi.ClassPoolRepository;
-import java.lang.instrument.Instrumentation;
-
-import javassist.scopedpool.ScopedClassPoolRepositoryImpl;
-
/**
* An Agent for installing the appropriate hooks into eclipse to make the handling of tests easier
*
@@ -43,7 +42,7 @@
AspectManager.setClassPoolFactory(factory);
// necessary for configuration
AspectManager.instance();
- ScopedClassPoolRepositoryImpl.getInstance().setPrune(false);
+ ClassPoolRepository.getInstance().setPrune(false);
inst.addTransformer(new EclipseTestTransformer());
}
}
\ No newline at end of file
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPool.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPool.java 2010-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPool.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -25,8 +25,8 @@
import javassist.ClassPool;
import javassist.CtClass;
import javassist.NotFoundException;
-import javassist.scopedpool.ScopedClassPoolRepository;
+import org.jboss.classpool.scoped.ScopedClassPoolRepository;
import org.jboss.classpool.spi.AbstractClassPool;
/**
Modified: projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPoolFactory.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPoolFactory.java 2010-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/main/java/org/jboss/aop/standalone/StandaloneClassPoolFactory.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -22,8 +22,8 @@
package org.jboss.aop.standalone;
import javassist.ClassPool;
-import javassist.scopedpool.ScopedClassPoolRepository;
+import org.jboss.classpool.scoped.ScopedClassPoolRepository;
import org.jboss.classpool.spi.AbstractClassPoolFactory;
/**
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-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/aop/src/test/java/org/jboss/test/aop/jdk15/dynamic/common/scenario/ScenarioRunner.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -29,13 +29,13 @@
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.pointcut.ast.ParseException;
+import org.jboss.classpool.scoped.ScopedClassPool;
import org.jboss.test.aop.jdk15.dynamic.common.BindingInterceptor;
import org.jboss.test.aop.jdk15.dynamic.common.InstanceInterceptor;
import org.jboss.test.aop.jdk15.dynamic.common.POJOWrappingInfo;
@@ -325,8 +325,8 @@
*/
private static void loadPOJOData()
{
- Map<ClassLoader, ClassPool> cls = AspectManager.getRegisteredCLs();
- ScopedClassPool classPool = (ScopedClassPool) cls.get(POJO.class.getClassLoader());
+ Map<ClassLoader, ScopedClassPool> cls = AspectManager.getRegisteredCLs();
+ ScopedClassPool classPool = cls.get(POJO.class.getClassLoader());
try
{
POJO_CLASS = classPool.getLocally(POJO.class.getName());
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 2010-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/JBossIntegration.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -1,32 +1,31 @@
/*
-* 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.
-*/
+ * 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.asintegration;
import java.io.File;
-import javassist.scopedpool.ScopedClassPoolFactory;
-
import org.jboss.aop.ClassLoaderValidation;
import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
+import org.jboss.classpool.scoped.ScopedClassPoolFactory;
/**
* AOPIntegration.<p>
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java 2010-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/asintegration/core/AspectManagerServiceDelegate.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -33,9 +33,6 @@
import java.util.Map;
import java.util.StringTokenizer;
-import javassist.ClassPool;
-import javassist.scopedpool.ScopedClassPoolFactory;
-
import javax.xml.parsers.ParserConfigurationException;
import org.jboss.aop.AspectManager;
@@ -56,6 +53,8 @@
import org.jboss.aop.instrument.TransformerCommon;
import org.jboss.aop.introduction.InterfaceIntroduction;
import org.jboss.aop.pointcut.Pointcut;
+import org.jboss.classpool.scoped.ScopedClassPool;
+import org.jboss.classpool.scoped.ScopedClassPoolFactory;
import org.jboss.logging.Logger;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -728,7 +727,7 @@
public String registeredClassLoaders()
{
- Map<ClassLoader, ClassPool> loaders = AspectManager.getRegisteredCLs();
+ Map<ClassLoader, ScopedClassPool> loaders = AspectManager.getRegisteredCLs();
StringBuffer buffer = new StringBuffer("");
for (ClassLoader loader : loaders.keySet())
{
Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java 2010-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-core/src/main/java/org/jboss/aop/deployment/AbstractAspectManagerService.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -1,35 +1,34 @@
/*
-* 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.
-*/
+ * 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.deployment;
import java.io.File;
-import javassist.scopedpool.ScopedClassPoolFactory;
-
import org.jboss.aop.AspectManager;
import org.jboss.aop.AspectNotificationHandler;
import org.jboss.aop.ClassLoaderValidation;
import org.jboss.aop.asintegration.JBossIntegration;
import org.jboss.aop.asintegration.core.AspectManagerServiceDelegate;
+import org.jboss.classpool.scoped.ScopedClassPoolFactory;
import org.jboss.logging.Logger;
/**
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-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-jmx/src/main/java/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -1,33 +1,30 @@
/*
-* 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.
-*/
+ * 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.asintegration.jboss4;
import java.io.File;
import java.lang.reflect.Constructor;
import javassist.ClassPool;
-import javassist.scopedpool.ScopedClassPool;
-import javassist.scopedpool.ScopedClassPoolFactory;
-import javassist.scopedpool.ScopedClassPoolRepository;
import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
@@ -48,6 +45,9 @@
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.scoped.ScopedClassPool;
+import org.jboss.classpool.scoped.ScopedClassPoolFactory;
+import org.jboss.classpool.scoped.ScopedClassPoolRepository;
import org.jboss.classpool.spi.AbstractClassPoolFactory;
import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.logging.Logger;
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-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java 2010-03-10 17:18:53 UTC (rev 102238)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file 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.
-*/
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.asintegration.jboss5;
import java.io.File;
@@ -29,15 +29,15 @@
import java.util.Set;
import javassist.ClassPool;
-import javassist.scopedpool.ScopedClassPool;
-import javassist.scopedpool.ScopedClassPoolFactory;
-import javassist.scopedpool.ScopedClassPoolRepository;
import org.jboss.aop.AspectManager;
import org.jboss.aop.asintegration.JBossIntegration;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloading.spi.RealClassLoader;
import org.jboss.classpool.plugins.jbosscl.JBoss5ClassPoolFactory;
+import org.jboss.classpool.scoped.ScopedClassPool;
+import org.jboss.classpool.scoped.ScopedClassPoolFactory;
+import org.jboss.classpool.scoped.ScopedClassPoolRepository;
import org.jboss.classpool.spi.AbstractClassPoolFactory;
import org.jboss.classpool.spi.ClassPoolRepository;
Modified: projects/aop/branches/classpool_JBAOP-742/pom.xml
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/pom.xml 2010-03-10 17:16:48 UTC (rev 102237)
+++ projects/aop/branches/classpool_JBAOP-742/pom.xml 2010-03-10 17:18:53 UTC (rev 102238)
@@ -25,8 +25,9 @@
<version.org.jboss.jbossas>6.0.0.M1</version.org.jboss.jbossas>
<version.org.jboss.jboss-common-core>2.2.17.GA</version.org.jboss.jboss-common-core>
<version.org.jboss.cl>2.2.0.Alpha3</version.org.jboss.cl>
- <version.org.jboss.deployers>2.2.0.Alpha2</version.org.jboss.deployers> <version.org.jboss.integration>6.0.0-Alpha8</version.org.jboss.integration>
- <version.org.jboss.jboss-reflect>2.2.0.Alpha2</version.org.jboss.jboss-reflect>
+ <version.org.jboss.deployers>2.2.0.Alpha2</version.org.jboss.deployers>
+ <version.org.jboss.integration>6.0.0-Alpha8</version.org.jboss.integration>
+ <version.org.jboss.jboss-reflect>2.2.0.Alpha3</version.org.jboss.jboss-reflect>
<version.org.jboss.jboss-vfs>3.0.0.CR3</version.org.jboss.jboss-vfs>
<version.org.jboss.kernel>2.2.0.Alpha6</version.org.jboss.kernel>
<version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
@@ -34,7 +35,7 @@
<version.org.jboss.mdr>2.2.0.Alpha1</version.org.jboss.mdr>
<version.xdoclet>1.2.3</version.xdoclet>
<version.jarjar>1.0</version.jarjar>
- <version.org.jboss.classpool>1.0.0.Alpha2</version.org.jboss.classpool>
+ <version.org.jboss.classpool>1.0.0.Alpha4</version.org.jboss.classpool>
<version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
</properties>
@@ -228,6 +229,11 @@
</dependency>
<dependency>
<groupId>org.jboss.classpool</groupId>
+ <artifactId>jboss-classpool-scoped</artifactId>
+ <version>${version.org.jboss.classpool}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.classpool</groupId>
<artifactId>jboss-classpool</artifactId>
<version>${version.org.jboss.classpool}</version>
</dependency>
More information about the jboss-cvs-commits
mailing list