[jboss-cvs] JBossAS SVN: r66302 - in projects/aop/trunk/asintegration: src/main/org/jboss and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 19 14:40:25 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-10-19 14:40:24 -0400 (Fri, 19 Oct 2007)
New Revision: 66302
Added:
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/
Removed:
projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/
Modified:
projects/aop/trunk/asintegration/build.xml
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/JBossIntegration.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBossClassPool.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBossClassPoolFactory.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/LoaderRepositoryUrlUtil.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/RepositoryClassLoaderScopingPolicy.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedJBossClassPool.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedRepositoryClassLoaderHelper.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/SecurityActions.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/DefaultTranslator.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPoolFactory.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/MetaDataClassLoaderScopingPolicy.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/NewClassLoaderDomainRegistry.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/NewClassLoaderScopingPolicy.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedNewClassLoaderDomain.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/AbstractAspectManager.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectDeployer.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectManagerService.java
projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainProxyForDomainUnitTestCase.java
projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainProxyForMainManagerUnitTestCase.java
projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainProxyForSeveralDomainsUnitTestCase.java
projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainWovenForDomainUnitTestCase.java
Log:
rename org.jboss.asintegration to org.jboss.aop.asintegration
Modified: projects/aop/trunk/asintegration/build.xml
===================================================================
--- projects/aop/trunk/asintegration/build.xml 2007-10-19 17:07:16 UTC (rev 66301)
+++ projects/aop/trunk/asintegration/build.xml 2007-10-19 18:40:24 UTC (rev 66302)
@@ -216,6 +216,7 @@
update="${jar.update}" index="${jar.index}">
<fileset dir="${build.classes}">
<!-- Include everything else -->
+ <include name="org/jboss/aop/asintegration/**"/>
<include name="org/jboss/aop/classpool/**"/>
<include name="org/jboss/aop/deploy*/**"/>
<include name="org/jboss/aop/domain/**"/>
@@ -228,6 +229,7 @@
update="${jar.update}" index="${jar.index}">
<fileset dir="${build.classes}">
<!-- Include everything else -->
+ <include name="org/jboss/aop/asintegration/**"/>
<include name="org/jboss/aop/classpool/**"/>
<include name="org/jboss/aop/deploy*/**"/>
<include name="org/jboss/aop/domain/**"/>
@@ -246,6 +248,7 @@
update="${jar.update}" index="${jar.index}">
<fileset dir="${build.classes.retro}">
<!-- Include everything else -->
+ <include name="org/jboss/aop/asintegration/**"/>
<include name="org/jboss/aop/classpool/**"/>
<include name="org/jboss/aop/deploy*/**"/>
<include name="org/jboss/aop/domain/**"/>
Copied: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration (from rev 66289, projects/aop/trunk/asintegration/src/main/org/jboss/asintegration)
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/JBossIntegration.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/JBossIntegration.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/JBossIntegration.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration;
+package org.jboss.aop.asintegration;
import java.io.File;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss4/JBoss4Integration.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBoss4Integration.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss4;
+package org.jboss.aop.asintegration.jboss4;
import java.io.File;
@@ -39,7 +39,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
import org.jboss.aop.deployment.AspectManagerService;
-import org.jboss.asintegration.JBossIntegration;
+import org.jboss.aop.asintegration.JBossIntegration;
import org.jboss.mx.loading.RepositoryClassLoader;
import org.jboss.mx.util.MBeanServerLocator;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBossClassPool.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss4/JBossClassPool.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBossClassPool.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss4;
+package org.jboss.aop.asintegration.jboss4;
import java.io.File;
import java.io.FileOutputStream;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBossClassPoolFactory.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss4/JBossClassPoolFactory.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBossClassPoolFactory.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss4;
+package org.jboss.aop.asintegration.jboss4;
import java.io.File;
import java.io.IOException;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/LoaderRepositoryUrlUtil.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss4/LoaderRepositoryUrlUtil.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/LoaderRepositoryUrlUtil.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss4;
+package org.jboss.aop.asintegration.jboss4;
import java.net.URL;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/RepositoryClassLoaderScopingPolicy.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss4/RepositoryClassLoaderScopingPolicy.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/RepositoryClassLoaderScopingPolicy.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss4;
+package org.jboss.aop.asintegration.jboss4;
import java.util.Map;
import java.util.WeakHashMap;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedJBossClassPool.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss4/ScopedJBossClassPool.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedJBossClassPool.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss4;
+package org.jboss.aop.asintegration.jboss4;
import java.io.File;
import java.lang.ref.WeakReference;
@@ -30,7 +30,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.classpool.AOPClassPoolRepository;
-import org.jboss.asintegration.jboss4.LoaderRepositoryUrlUtil.UrlInfo;
+import org.jboss.aop.asintegration.jboss4.LoaderRepositoryUrlUtil.UrlInfo;
import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
import org.jboss.mx.loading.LoaderRepository;
import org.jboss.mx.loading.RepositoryClassLoader;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedRepositoryClassLoaderHelper.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss4/ScopedRepositoryClassLoaderHelper.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedRepositoryClassLoaderHelper.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss4;
+package org.jboss.aop.asintegration.jboss4;
import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
import org.jboss.mx.loading.LoaderRepository;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/SecurityActions.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss4/SecurityActions.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/SecurityActions.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss4;
+package org.jboss.aop.asintegration.jboss4;
import java.security.AccessController;
import java.security.PrivilegedActionException;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/DefaultTranslator.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss5/DefaultTranslator.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/DefaultTranslator.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss5;
+package org.jboss.aop.asintegration.jboss5;
import java.security.ProtectionDomain;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss5/JBoss5ClassPool.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPool.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss5;
+package org.jboss.aop.asintegration.jboss5;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
@@ -100,10 +100,15 @@
MemoryContextFactory factory = MemoryContextFactory.getInstance();
factory.putFile(outputURL, classBytes);
- clearCacheOnLoaderHack(myloader);
+ if (myloader instanceof BaseClassLoader)
+ {
+ //Update check to RealClassLoader once integration project catches up
+ ((BaseClassLoader)myloader).clearBlackList(classFileName);
+
+ }
Class clazz = myloader.loadClass(cc.getName());
-//System.out.println("====> created " + clazz.getName() + " on " + myloader + " loaded with " + clazz.getClassLoader());
+
return clazz;
}
}
@@ -146,83 +151,6 @@
}
}
- public Class toClassOld(CtClass cc, ClassLoader loader, ProtectionDomain domain)
- throws CannotCompileException
- {
- ClassLoader useLoader = getClassLoader() == null ? loader : getClassLoader();
- localResources.put(getResourceName(cc.getName()), Boolean.TRUE);
- System.out.println("===> Creating class " + cc.getName() + " on loader " + useLoader);
-
- if ("org.jboss.test.aop.scopedextender.Child_A2$Child_A2Advisor".equals(cc.getName()))
- {
- try
- {
- useLoader.loadClass("org.jboss.test.aop.scopedextender.Base_A1$Base_A1Advisor");
- System.out.println("Got BaseAdvisor");
- }
- catch (ClassNotFoundException e)
- {
- System.out.println("Could not get BaseAdvisor");
- }
- }
-
- Class clazz = super.toClass(cc, useLoader, domain);
- try
- {
- if ("org.jboss.test.aop.scopedextender.Base_A1$Base_A1Advisor".equals(cc.getName()))
- {
- Class clazz2 = useLoader.loadClass(cc.getName());
- System.out.println("Found recently created class");
- }
- }
- catch (ClassNotFoundException e)
- {
- System.out.println("Not found recently created class");
- }
- return clazz;
-// lockInCache(cc);
-// if (getClassLoader() == null || tempdir == null)
-// {
-// return super.toClass(cc, loader, domain);
-// }
-// Class dynClass = null;
-// try
-// {
-// File classFile = null;
-// String classFileName = getResourceName(cc.getName());
-// // Write the clas file to the tmpdir
-// synchronized (tmplock)
-// {
-// classFile = new File(tempdir, classFileName);
-// File pkgDirs = classFile.getParentFile();
-// pkgDirs.mkdirs();
-// FileOutputStream stream = new FileOutputStream(classFile);
-// stream.write(cc.toBytecode());
-// stream.flush();
-// stream.close();
-// classFile.deleteOnExit();
-// }
-// // We have to clear Blacklist caches or the class will never
-// // be found
-// //((UnifiedClassLoader)dcl).clearBlacklists();
-// // To be backward compatible
-// RepositoryClassLoader rcl = (RepositoryClassLoader) getClassLoader();
-// rcl.clearClassBlackList();
-// rcl.clearResourceBlackList();
-//
-// // Now load the class through the cl
-// dynClass = getClassLoader().loadClass(cc.getName());
-// }
-// catch (Exception ex)
-// {
-// ClassFormatError cfe = new ClassFormatError("Failed to load dyn class: " + cc.getName());
-// cfe.initCause(ex);
-// throw cfe;
-// }
-//
-// return dynClass;
- }
-
// protected boolean isLocalResource(String resourceName)
// {
// if (super.isLocalResource(resourceName))
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPoolFactory.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss5/JBoss5ClassPoolFactory.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5ClassPoolFactory.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss5;
+package org.jboss.aop.asintegration.jboss5;
import java.net.MalformedURLException;
import java.net.URL;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss5/JBoss5Integration.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/JBoss5Integration.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss5;
+package org.jboss.aop.asintegration.jboss5;
import java.io.File;
@@ -30,7 +30,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
-import org.jboss.asintegration.JBossIntegration;
+import org.jboss.aop.asintegration.JBossIntegration;
import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.mx.loading.RepositoryClassLoader;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/MetaDataClassLoaderScopingPolicy.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss5/MetaDataClassLoaderScopingPolicy.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/MetaDataClassLoaderScopingPolicy.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss5;
+package org.jboss.aop.asintegration.jboss5;
import java.util.Map;
import java.util.WeakHashMap;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/NewClassLoaderDomainRegistry.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss5/NewClassLoaderDomainRegistry.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/NewClassLoaderDomainRegistry.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss5;
+package org.jboss.aop.asintegration.jboss5;
import java.lang.ref.WeakReference;
import java.util.Map;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/NewClassLoaderScopingPolicy.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss5/NewClassLoaderScopingPolicy.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/NewClassLoaderScopingPolicy.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.asintegration.jboss5;
+package org.jboss.aop.asintegration.jboss5;
import java.util.HashMap;
import java.util.Map;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss5/ScopedJBoss5ClassPool.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedJBoss5ClassPool.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,9 +19,8 @@
* 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.asintegration.jboss5;
+package org.jboss.aop.asintegration.jboss5;
-import java.io.File;
import java.lang.ref.WeakReference;
import java.net.URL;
import java.util.ArrayList;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedNewClassLoaderDomain.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/asintegration/jboss5/ScopedNewClassLoaderDomain.java 2007-10-19 15:34:41 UTC (rev 66289)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss5/ScopedNewClassLoaderDomain.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -19,19 +19,15 @@
* 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.asintegration.jboss5;
+package org.jboss.aop.asintegration.jboss5;
import java.lang.ref.WeakReference;
-import java.net.URL;
import org.jboss.aop.AspectManager;
import org.jboss.aop.advice.AspectDefinition;
import org.jboss.aop.domain.ScopedClassLoaderDomain;
import org.jboss.classloader.spi.ClassLoaderDomain;
-import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
-import org.jboss.mx.loading.LoaderRepository;
-import org.jboss.mx.loading.RepositoryClassLoader;
/**
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/AbstractAspectManager.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/AbstractAspectManager.java 2007-10-19 17:07:16 UTC (rev 66301)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/AbstractAspectManager.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -37,8 +37,8 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.AspectXmlLoader;
+import org.jboss.aop.asintegration.JBossIntegration;
import org.jboss.aop.deployment.AspectManagerService;
-import org.jboss.asintegration.JBossIntegration;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.logging.Logger;
import org.w3c.dom.Document;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectDeployer.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectDeployer.java 2007-10-19 17:07:16 UTC (rev 66301)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectDeployer.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -35,7 +35,7 @@
import org.jboss.aop.AspectAnnotationLoader;
import org.jboss.aop.AspectManager;
import org.jboss.aop.AspectXmlLoader;
-import org.jboss.asintegration.jboss4.ScopedRepositoryClassLoaderHelper;
+import org.jboss.aop.asintegration.jboss4.ScopedRepositoryClassLoaderHelper;
import org.jboss.deployment.DeploymentException;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.DeploymentState;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectManagerService.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectManagerService.java 2007-10-19 17:07:16 UTC (rev 66301)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectManagerService.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -45,8 +45,8 @@
import org.jboss.aop.hook.JDK14TransformerManager;
import org.jboss.aop.instrument.InstrumentorFactory;
import org.jboss.aop.instrument.TransformerCommon;
-import org.jboss.asintegration.JBossIntegration;
-import org.jboss.asintegration.jboss4.JBoss4Integration;
+import org.jboss.aop.asintegration.JBossIntegration;
+import org.jboss.aop.asintegration.jboss4.JBoss4Integration;
import org.jboss.logging.Logger;
import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
import org.jboss.mx.server.ServerConstants;
Modified: projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainProxyForDomainUnitTestCase.java
===================================================================
--- projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainProxyForDomainUnitTestCase.java 2007-10-19 17:07:16 UTC (rev 66301)
+++ projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainProxyForDomainUnitTestCase.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -27,7 +27,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.Domain;
-import org.jboss.aop.deployers.temp.MetaDataClassLoaderScopingPolicy;
+import org.jboss.aop.asintegration.jboss5.MetaDataClassLoaderScopingPolicy;
import org.jboss.aop.integration.junit.NotWovenAOPIntegrationTest;
import org.jboss.aop.proxy.container.AOPProxyFactory;
import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
Modified: projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainProxyForMainManagerUnitTestCase.java
===================================================================
--- projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainProxyForMainManagerUnitTestCase.java 2007-10-19 17:07:16 UTC (rev 66301)
+++ projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainProxyForMainManagerUnitTestCase.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -27,7 +27,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.Domain;
-import org.jboss.aop.deployers.temp.MetaDataClassLoaderScopingPolicy;
+import org.jboss.aop.asintegration.jboss5.MetaDataClassLoaderScopingPolicy;
import org.jboss.aop.integration.junit.NotWovenAOPIntegrationTest;
import org.jboss.aop.proxy.container.AOPProxyFactory;
import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
Modified: projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainProxyForSeveralDomainsUnitTestCase.java
===================================================================
--- projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainProxyForSeveralDomainsUnitTestCase.java 2007-10-19 17:07:16 UTC (rev 66301)
+++ projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainProxyForSeveralDomainsUnitTestCase.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -27,7 +27,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.Domain;
-import org.jboss.aop.deployers.temp.MetaDataClassLoaderScopingPolicy;
+import org.jboss.aop.asintegration.jboss5.MetaDataClassLoaderScopingPolicy;
import org.jboss.aop.integration.junit.NotWovenAOPIntegrationTest;
import org.jboss.aop.proxy.container.AOPProxyFactory;
import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
Modified: projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainWovenForDomainUnitTestCase.java
===================================================================
--- projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainWovenForDomainUnitTestCase.java 2007-10-19 17:07:16 UTC (rev 66301)
+++ projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/metadatadomain/test/MetaDataDomainWovenForDomainUnitTestCase.java 2007-10-19 18:40:24 UTC (rev 66302)
@@ -27,7 +27,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.Domain;
-import org.jboss.aop.deployers.temp.MetaDataClassLoaderScopingPolicy;
+import org.jboss.aop.asintegration.jboss5.MetaDataClassLoaderScopingPolicy;
import org.jboss.aop.integration.junit.NotWovenAOPIntegrationTest;
import org.jboss.aop.proxy.container.AOPProxyFactory;
import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
More information about the jboss-cvs-commits
mailing list