[jboss-cvs] jboss-aspects/src/main/org/jboss/aop/deployment ...
Kabir Khan
kkhan at jboss.com
Thu Jul 13 18:03:11 EDT 2006
User: kkhan
Date: 06/07/13 18:03:11
Modified: src/main/org/jboss/aop/deployment JBossClassPool.java
AspectManagerService.java
JBossClassPoolFactory.java
JBossScopedClassLoaderHelper.java
JBossClassPoolFactory32.java JBossClassPool32.java
AspectManagerService32.java
Log:
Refactor to wrap arouind ScopedClassPoolRepository and ScopedClassPool which has been moved to javassist
Revision Changes Path
1.16 +7 -9 jboss-aspects/src/main/org/jboss/aop/deployment/JBossClassPool.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossClassPool.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aop/deployment/JBossClassPool.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- JBossClassPool.java 26 Jun 2006 17:26:28 -0000 1.15
+++ JBossClassPool.java 13 Jul 2006 22:03:11 -0000 1.16
@@ -23,21 +23,19 @@
import java.io.File;
import java.io.FileOutputStream;
-import java.net.URL;
-import java.net.URLClassLoader;
-import org.jboss.aop.AOPClassPool;
-import org.jboss.aop.AspectManager;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.mx.loading.RepositoryClassLoader;
import javassist.CannotCompileException;
import javassist.ClassPool;
import javassist.CtClass;
+import javassist.scopedpool.ScopedClassPoolRepository;
/**
* Comment
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public class JBossClassPool extends AOPClassPool
{
@@ -48,15 +46,15 @@
// For loadClass tmpdir creation for UCL
protected final Object tmplock = new Object();
- protected JBossClassPool(ClassLoader cl, ClassPool src, AspectManager manager, File tmp)
+ protected JBossClassPool(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository, File tmp)
{
- super(cl, src, manager);
+ super(cl, src, repository);
tempdir = tmp;
}
- protected JBossClassPool(ClassPool src, AspectManager manager)
+ protected JBossClassPool(ClassPool src, ScopedClassPoolRepository repository)
{
- super(src, manager);
+ super(src, repository);
}
public boolean isUnloadedClassLoader()
1.31 +8 -6 jboss-aspects/src/main/org/jboss/aop/deployment/AspectManagerService.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AspectManagerService.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aop/deployment/AspectManagerService.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- AspectManagerService.java 30 May 2006 15:49:58 -0000 1.30
+++ AspectManagerService.java 13 Jul 2006 22:03:11 -0000 1.31
@@ -28,6 +28,9 @@
import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
+
+import javassist.scopedpool.ScopedClassPoolFactory;
+
import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
import javax.management.InstanceNotFoundException;
@@ -40,7 +43,6 @@
import org.jboss.aop.AspectNotificationHandler;
import org.jboss.aop.AspectXmlLoader;
import org.jboss.aop.ClassLoaderValidation;
-import org.jboss.aop.ClassPoolFactory;
import org.jboss.aop.Deployment;
import org.jboss.aop.hook.JDK14Transformer;
import org.jboss.aop.hook.JDK14TransformerManager;
@@ -52,7 +54,7 @@
/**
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 1.30 $
+ * @version $Revision: 1.31 $
* @jmx:mbean extends="org.jboss.system.ServiceMBean"
*/
public class AspectManagerService
@@ -82,7 +84,7 @@
// Public -------------------------------------------------------
- protected ClassPoolFactory createFactory() throws Exception
+ protected ScopedClassPoolFactory createFactory() throws Exception
{
return new JBossClassPoolFactory(tmpClassesDir);
}
@@ -106,7 +108,7 @@
// Validate the the tmp dir exists
if (tmpClassesDir.exists() == false && tmpClassesDir.mkdirs() == false)
throw new FileNotFoundException("Failed to create tmpClassesDir: " + tmpClassesDir.getAbsolutePath());
- AspectManager.classPoolFactory = createFactory();
+ AspectManager.setClassPoolFactory(createFactory());
AspectManager.classLoaderValidator = createClassLoaderValidation();
// Add the tmp classes dir to our UCL classpath
@@ -244,12 +246,12 @@
public boolean getPrune()
{
- return AspectManager.prune;
+ return AspectManager.getPrune();
}
public void setPrune(boolean prune)
{
- AspectManager.prune = prune;
+ AspectManager.setPrune(prune);
}
public String getExclude()
1.8 +11 -10 jboss-aspects/src/main/org/jboss/aop/deployment/JBossClassPoolFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossClassPoolFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aop/deployment/JBossClassPoolFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- JBossClassPoolFactory.java 23 Apr 2006 17:03:45 -0000 1.7
+++ JBossClassPoolFactory.java 13 Jul 2006 22:03:11 -0000 1.8
@@ -24,20 +24,21 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
-import org.jboss.aop.AOPClassPool;
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.ClassPoolFactory;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.mx.loading.RepositoryClassLoader;
import javassist.ClassPool;
+import javassist.scopedpool.ScopedClassPool;
+import javassist.scopedpool.ScopedClassPoolFactory;
+import javassist.scopedpool.ScopedClassPoolRepository;
/**
* Comment
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*
**/
-public class JBossClassPoolFactory implements ClassPoolFactory
+public class JBossClassPoolFactory implements ScopedClassPoolFactory
{
protected File tmpClassesDir;
@@ -46,16 +47,16 @@
this.tmpClassesDir = tmpClassesDir;
}
- public AOPClassPool create(ClassLoader cl, ClassPool src, AspectManager manager)
+ public ScopedClassPool create(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
{
try
{
if (cl instanceof RepositoryClassLoader)
{
File tempdir = createTempDir(cl);
- return new JBossClassPool(cl, src, manager, tempdir);
+ return new JBossClassPool(cl, src, repository, tempdir);
}
- return new AOPClassPool(cl, src, manager);
+ return new AOPClassPool(cl, src, repository);
}
catch (IOException e)
{
@@ -63,9 +64,9 @@
}
}
- public AOPClassPool create(ClassPool src, AspectManager manager)
+ public ScopedClassPool create(ClassPool src, ScopedClassPoolRepository repository)
{
- return new JBossClassPool(src, manager);
+ return new JBossClassPool(src, repository);
}
public File createTempDir(ClassLoader cl) throws IOException
1.3 +2 -2 jboss-aspects/src/main/org/jboss/aop/deployment/JBossScopedClassLoaderHelper.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossScopedClassLoaderHelper.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aop/deployment/JBossScopedClassLoaderHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- JBossScopedClassLoaderHelper.java 24 Apr 2006 17:52:44 -0000 1.2
+++ JBossScopedClassLoaderHelper.java 13 Jul 2006 22:03:11 -0000 1.3
@@ -21,7 +21,7 @@
*/
package org.jboss.aop.deployment;
-import org.jboss.aop.AOPScopedClassLoaderHelper;
+import org.jboss.aop.classpool.AOPScopedClassLoaderHelper;
import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
import org.jboss.mx.loading.RepositoryClassLoader;
import org.jboss.system.server.NoAnnotationURLClassLoader;
1.7 +9 -9 jboss-aspects/src/main/org/jboss/aop/deployment/JBossClassPoolFactory32.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossClassPoolFactory32.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aop/deployment/JBossClassPoolFactory32.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- JBossClassPoolFactory32.java 23 Apr 2006 17:03:45 -0000 1.6
+++ JBossClassPoolFactory32.java 13 Jul 2006 22:03:11 -0000 1.7
@@ -24,20 +24,20 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
-import org.jboss.aop.AOPClassPool;
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.ClassPoolFactory;
import org.jboss.mx.loading.UnifiedClassLoader;
import javassist.ClassPool;
+import javassist.scopedpool.ScopedClassPool;
+import javassist.scopedpool.ScopedClassPoolFactory;
+import javassist.scopedpool.ScopedClassPoolRepository;
/**
* Comment
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*
**/
-public class JBossClassPoolFactory32 implements ClassPoolFactory
+public class JBossClassPoolFactory32 implements ScopedClassPoolFactory
{
protected File tmpClassesDir;
@@ -46,12 +46,12 @@
this.tmpClassesDir = tmpClassesDir;
}
- public AOPClassPool create(ClassLoader cl, ClassPool src, AspectManager manager)
+ public ScopedClassPool create(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository)
{
try
{
File tempdir = createTempDir(cl);
- return new JBossClassPool32(cl, src, manager, tempdir);
+ return new JBossClassPool32(cl, src, repository, tempdir);
}
catch (IOException e)
{
@@ -59,9 +59,9 @@
}
}
- public AOPClassPool create(ClassPool src, AspectManager manager)
+ public ScopedClassPool create(ClassPool src, ScopedClassPoolRepository repository)
{
- return new JBossClassPool32(src, manager);
+ return new JBossClassPool32(src, repository);
}
public File createTempDir(ClassLoader cl) throws IOException
1.9 +7 -6 jboss-aspects/src/main/org/jboss/aop/deployment/JBossClassPool32.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossClassPool32.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aop/deployment/JBossClassPool32.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- JBossClassPool32.java 23 Apr 2006 17:03:45 -0000 1.8
+++ JBossClassPool32.java 13 Jul 2006 22:03:11 -0000 1.9
@@ -23,19 +23,20 @@
import java.io.File;
import java.io.FileOutputStream;
-import org.jboss.aop.AOPClassPool;
import org.jboss.aop.AspectManager;
+import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.mx.loading.RepositoryClassLoader;
import org.jboss.mx.loading.UnifiedClassLoader;
import javassist.CannotCompileException;
import javassist.ClassPool;
import javassist.CtClass;
+import javassist.scopedpool.ScopedClassPoolRepository;
/**
* Comment
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class JBossClassPool32 extends AOPClassPool
{
@@ -46,15 +47,15 @@
// For loadClass tmpdir creation for UCL
protected final Object tmplock = new Object();
- protected JBossClassPool32(ClassLoader cl, ClassPool src, AspectManager manager, File tmp)
+ protected JBossClassPool32(ClassLoader cl, ClassPool src, ScopedClassPoolRepository repository, File tmp)
{
- super(cl, src, manager);
+ super(cl, src, repository);
tempdir = tmp;
}
- protected JBossClassPool32(ClassPool src, AspectManager manager)
+ protected JBossClassPool32(ClassPool src, ScopedClassPoolRepository repository)
{
- super(src, manager);
+ super(src, repository);
}
public boolean isUnloadedClassLoader()
1.5 +4 -3 jboss-aspects/src/main/org/jboss/aop/deployment/AspectManagerService32.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AspectManagerService32.java
===================================================================
RCS file: /cvsroot/jboss/jboss-aspects/src/main/org/jboss/aop/deployment/AspectManagerService32.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- AspectManagerService32.java 29 Oct 2005 23:35:50 -0000 1.4
+++ AspectManagerService32.java 13 Jul 2006 22:03:11 -0000 1.5
@@ -21,18 +21,19 @@
*/
package org.jboss.aop.deployment;
+import javassist.scopedpool.ScopedClassPoolFactory;
+
import org.jboss.aop.ClassLoaderValidation;
-import org.jboss.aop.ClassPoolFactory;
/**
* Comment
*
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class AspectManagerService32 extends AspectManagerService
{
- protected ClassPoolFactory createFactory() throws Exception
+ protected ScopedClassPoolFactory createFactory() throws Exception
{
return new JBossClassPoolFactory32(tmpClassesDir);
}
More information about the jboss-cvs-commits
mailing list