[jboss-cvs] JBossAS SVN: r70841 - in projects/aop/trunk/asintegration/src: main/org/jboss/aop/classpool and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 13 16:30:34 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-03-13 16:30:34 -0400 (Thu, 13 Mar 2008)
New Revision: 70841
Modified:
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/ScopedRepositoryClassLoaderHelper.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/classpool/ExtraClassPoolFactoryParameters.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/JBossAspectLibrary.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectDeployer.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/domain/ScopedRepositoryClassLoaderDomain.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/junit/AOPTest.java
projects/aop/trunk/asintegration/src/main/org/jboss/aop/junit/AOPTestDelegate.java
projects/aop/trunk/asintegration/src/tests/org/jboss/aop/integration/junit/AOPIntegrationTestDelegate.java
projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.java
Log:
Tidyup, add generics and get rid of warnings
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBossClassPool.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBossClassPool.java 2008-03-13 19:54:41 UTC (rev 70840)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBossClassPool.java 2008-03-13 20:30:34 UTC (rev 70841)
@@ -72,7 +72,7 @@
return false;
}
- public Class toClass(CtClass cc, ClassLoader loader, ProtectionDomain domain)
+ public Class<?> toClass(CtClass cc, ClassLoader loader, ProtectionDomain domain)
throws CannotCompileException
{
lockInCache(cc);
@@ -80,7 +80,7 @@
{
return super.toClass(cc, loader, domain);
}
- Class dynClass = null;
+ Class<?> dynClass = null;
try
{
File classFile = null;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBossClassPoolFactory.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBossClassPoolFactory.java 2008-03-13 19:54:41 UTC (rev 70840)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/JBossClassPoolFactory.java 2008-03-13 20:30:34 UTC (rev 70841)
@@ -25,8 +25,6 @@
import java.io.IOException;
import java.net.URL;
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.classpool.AOPClassLoaderScopingPolicy;
import org.jboss.aop.classpool.AOPClassPool;
import org.jboss.aop.classpool.AbstractJBossClassPoolFactory;
import org.jboss.mx.loading.RepositoryClassLoader;
@@ -66,7 +64,6 @@
{
throw new RuntimeException(e);
}
- AOPClassLoaderScopingPolicy policy = AspectManager.getClassLoaderScopingPolicy();
if (ScopedRepositoryClassLoaderHelper.isScopedClassLoader(cl))
{
//It is scoped
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/LoaderRepositoryUrlUtil.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/LoaderRepositoryUrlUtil.java 2008-03-13 19:54:41 UTC (rev 70840)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/LoaderRepositoryUrlUtil.java 2008-03-13 20:30:34 UTC (rev 70841)
@@ -120,10 +120,8 @@
int scopedLength = 0;
for (int i = 0 ; i < scopedRepositoryUrls.length ; i++)
{
- URL scopedUrl = scopedRepositoryUrls[i];
for (int j = 0 ; j < globalUrls.length ; j ++)
{
- URL globalUrl = globalUrls[j];
if (scopedRepositoryUrls[i].equals(globalUrls[j]))
{
scopedLength = i;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedRepositoryClassLoaderHelper.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedRepositoryClassLoaderHelper.java 2008-03-13 19:54:41 UTC (rev 70840)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/asintegration/jboss4/ScopedRepositoryClassLoaderHelper.java 2008-03-13 20:30:34 UTC (rev 70841)
@@ -42,8 +42,8 @@
if (repository instanceof HeirarchicalLoaderRepository3)
{
scoped = true;
- HeirarchicalLoaderRepository3 hlr = (HeirarchicalLoaderRepository3)repository;
- boolean parentFirst = hlr.getUseParentFirst();
+ //HeirarchicalLoaderRepository3 hlr = (HeirarchicalLoaderRepository3)repository;
+ //boolean parentFirst = hlr.getUseParentFirst();
}
}
return scoped;
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/classpool/ExtraClassPoolFactoryParameters.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/classpool/ExtraClassPoolFactoryParameters.java 2008-03-13 19:54:41 UTC (rev 70840)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/classpool/ExtraClassPoolFactoryParameters.java 2008-03-13 20:30:34 UTC (rev 70841)
@@ -24,6 +24,7 @@
import java.util.Map;
/**
+ * This class is used by the AS5 integration. Do not delete!!!!
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
@@ -31,21 +32,21 @@
public class ExtraClassPoolFactoryParameters
{
/** A map of properties that can be used to configure the classpool factories further */
- private static ThreadLocal<Map> properties = new ThreadLocal<Map>();
+ private static ThreadLocal<Map<Object, Object>> properties = new ThreadLocal<Map<Object, Object>>();
- public static void pushThreadProperties(Map props)
+ public static void pushThreadProperties(Map<Object, Object> props)
{
properties.set(props);
}
- public static Map peekThreadProperties()
+ public static Map<Object, Object> peekThreadProperties()
{
return properties.get();
}
- public static Map popThreadProperties()
+ public static Map<Object, Object> popThreadProperties()
{
- Map props = properties.get();
+ Map<Object, Object> props = properties.get();
properties.remove();
return props;
}
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/JBossAspectLibrary.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/JBossAspectLibrary.java 2008-03-13 19:54:41 UTC (rev 70840)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/JBossAspectLibrary.java 2008-03-13 20:30:34 UTC (rev 70841)
@@ -51,7 +51,13 @@
*/
public void start() throws Exception
{
+ log.debug("Starting JBoss AspectLibrary");
aspectManager.deployBaseAspects();
}
+
+ public void stop()
+ {
+ log.debug("Stopping JBoss AspectLibrary");
+ }
}
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 2008-03-13 19:54:41 UTC (rev 70840)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployment/AspectDeployer.java 2008-03-13 20:30:34 UTC (rev 70841)
@@ -169,6 +169,7 @@
AspectManager manager = (scl != null) ? AspectManager.instance(scl) : AspectManager.instance();
if (!di.isXML)
{
+ @SuppressWarnings("unchecked")
Iterator it = ArchiveBrowser.getBrowser(di.localUrl, new ClassFileFilter());
AspectAnnotationLoader loader = new AspectAnnotationLoader(manager);
loader.setClassLoader(scl);
@@ -231,6 +232,7 @@
Thread.currentThread().setContextClassLoader(di.ucl);
if (!di.isXML)
{
+ @SuppressWarnings("unchecked")
Iterator it = ArchiveBrowser.getBrowser(di.localUrl, new ClassFileFilter());
AspectAnnotationLoader loader = new AspectAnnotationLoader(AspectManager.instance());
loader.undeployInputStreamIterator(it);
@@ -362,6 +364,7 @@
try
{
+ @SuppressWarnings("unused")
MBeanInfo info = server.getMBeanInfo(on);
}
catch (InstanceNotFoundException e)
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/domain/ScopedRepositoryClassLoaderDomain.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/domain/ScopedRepositoryClassLoaderDomain.java 2008-03-13 19:54:41 UTC (rev 70840)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/domain/ScopedRepositoryClassLoaderDomain.java 2008-03-13 20:30:34 UTC (rev 70841)
@@ -75,7 +75,7 @@
//The class has been loaded by a parent classloader, find out if we also have a copy
try
{
- Class clazz = myRepository.loadClass(aspect.getClass().getName());
+ Class<?> clazz = myRepository.loadClass(aspect.getClass().getName());
if (clazz == aspect.getClass())
{
notMyPerVMAspects.put(def, Boolean.TRUE);
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/junit/AOPTest.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/junit/AOPTest.java 2008-03-13 19:54:41 UTC (rev 70840)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/junit/AOPTest.java 2008-03-13 20:30:34 UTC (rev 70841)
@@ -39,7 +39,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return new AOPTestDelegate(clazz);
}
Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/junit/AOPTestDelegate.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/junit/AOPTestDelegate.java 2008-03-13 19:54:41 UTC (rev 70840)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/junit/AOPTestDelegate.java 2008-03-13 20:30:34 UTC (rev 70841)
@@ -22,7 +22,6 @@
package org.jboss.aop.junit;
import java.net.URL;
-import java.util.Iterator;
import java.util.concurrent.CopyOnWriteArrayList;
import org.jboss.aop.AspectXmlLoader;
@@ -37,7 +36,7 @@
public class AOPTestDelegate extends AbstractTestDelegate
{
/** The deployed urls */
- private static final CopyOnWriteArrayList urls = new CopyOnWriteArrayList();
+ private static final CopyOnWriteArrayList<URL> urls = new CopyOnWriteArrayList<URL>();
/**
* Create a new AOPTestDelegate.
@@ -45,7 +44,7 @@
* @param clazz the test class
* @throws Exception for any error
*/
- public AOPTestDelegate(Class clazz) throws Exception
+ public AOPTestDelegate(Class<?> clazz) throws Exception
{
super(clazz);
}
@@ -100,9 +99,8 @@
protected void undeploy()
{
- for (Iterator i = urls.iterator(); i.hasNext();)
+ for (URL url : urls)
{
- URL url = (URL) i.next();
undeploy(url);
}
}
Modified: projects/aop/trunk/asintegration/src/tests/org/jboss/aop/integration/junit/AOPIntegrationTestDelegate.java
===================================================================
--- projects/aop/trunk/asintegration/src/tests/org/jboss/aop/integration/junit/AOPIntegrationTestDelegate.java 2008-03-13 19:54:41 UTC (rev 70840)
+++ projects/aop/trunk/asintegration/src/tests/org/jboss/aop/integration/junit/AOPIntegrationTestDelegate.java 2008-03-13 20:30:34 UTC (rev 70841)
@@ -53,7 +53,7 @@
* @param weaveClasses Whether or not we should weave loaded classes
* @param system the classloader system
*/
- public AOPIntegrationTestDelegate(Class clazz, boolean weaveClasses, ClassLoaderSystem system)
+ public AOPIntegrationTestDelegate(Class<?> clazz, boolean weaveClasses, ClassLoaderSystem system)
{
super(clazz);
this.system = system;
Modified: projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.java
===================================================================
--- projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.java 2008-03-13 19:54:41 UTC (rev 70840)
+++ projects/aop/trunk/asintegration/src/tests/org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.java 2008-03-13 20:30:34 UTC (rev 70841)
@@ -88,12 +88,12 @@
System.out.println("--------------> A1\t\t" + a1);
System.out.println("--------------> Support2\t" + support2);
System.out.println("--------------> A2\t\t" + a2);
- Class clazz = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.test.aop.integration.complex.support.TestInterceptor");
+ Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.test.aop.integration.complex.support.TestInterceptor");
System.out.println("====== " + clazz + " " + clazz.getClassLoader());
- Class clazz1 = a1.loadClass("org.jboss.test.aop.integration.complex.support.TestInterceptor");
+ Class<?> clazz1 = a1.loadClass("org.jboss.test.aop.integration.complex.support.TestInterceptor");
System.out.println("====== " + clazz1 + " " + clazz1.getClassLoader());
- Class clazz2 = a2.loadClass("org.jboss.test.aop.integration.complex.support.TestInterceptor");
+ Class<?> clazz2 = a2.loadClass("org.jboss.test.aop.integration.complex.support.TestInterceptor");
System.out.println("====== " + clazz2 + " " + clazz2.getClassLoader());
try
@@ -102,6 +102,7 @@
try
{
Class<?> classA1 = a1.loadClass(CLASS_A);
+ @SuppressWarnings("unused")
Object instanceA1 = classA1.newInstance();
Class<?> classA2 = a2.loadClass(CLASS_A);
More information about the jboss-cvs-commits
mailing list