[Jboss-cvs] JBossAS SVN: r55907 - in branches/Branch_AOP_1_5/aop/src: main/org/jboss/aop main/org/jboss/aop/joinpoint main/org/jboss/aop/proxy/container test/org/jboss/test/aop/proxy
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 14 13:27:38 EDT 2006
Author: kabir.khan at jboss.com
Date: 2006-08-14 13:27:30 -0400 (Mon, 14 Aug 2006)
New Revision: 55907
Modified:
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/AOPClassPool.java
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/Advisor.java
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/joinpoint/InvocationBase.java
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/AOPProxyFactoryParameters.java
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/ClassProxyContainer.java
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/ContainerCache.java
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyCacheKey.java
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/InstanceProxyContainer.java
branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/proxy/ProxyTestCase.java
Log:
* Get rid of the 2.0 feature AOPMetaDataContext so the build/dependencies can be kept simpler.
* Update to use new javassist snapshot
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/AOPClassPool.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/AOPClassPool.java 2006-08-14 16:53:52 UTC (rev 55906)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/AOPClassPool.java 2006-08-14 17:27:30 UTC (rev 55907)
@@ -22,6 +22,7 @@
package org.jboss.aop;
import java.lang.ref.WeakReference;
+import java.security.ProtectionDomain;
import java.util.Iterator;
import java.util.Map;
@@ -223,7 +224,8 @@
return AspectManager.classPoolFactory.create(src, manager);
}
- public Class toClass(CtClass ct, ClassLoader loader) throws CannotCompileException
+ public Class toClass(CtClass ct, ClassLoader loader, ProtectionDomain domain)
+ throws CannotCompileException
{
//We need to pass up the classloader stored in this pool, as the default implementation uses the Thread context cl.
//In the case of JSP's in Tomcat, org.apache.jasper.servlet.JasperLoader will be stored here, while it's parent
@@ -232,7 +234,7 @@
//the same as for the class generated from the jsp, i.e. org.apache.jsp. For classes belonging to org.apache.jsp,
//JasperLoader does NOT delegate to its parent if it cannot find them.
lockInCache(ct);
- return super.toClass(ct, getClassLoader());
+ return super.toClass(ct, getClassLoader(), domain);
}
}
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/Advisor.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/Advisor.java 2006-08-14 16:53:52 UTC (rev 55906)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/Advisor.java 2006-08-14 17:27:30 UTC (rev 55907)
@@ -65,7 +65,6 @@
import org.jboss.aop.metadata.FieldMetaData;
import org.jboss.aop.metadata.MethodMetaData;
import org.jboss.aop.metadata.SimpleMetaData;
-import org.jboss.repository.spi.MetaDataContext;
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
import EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet;
@@ -150,8 +149,6 @@
protected Interceptor[][] constructionInterceptors;
protected ConstructionInfo[] constructionInfos;
- MetaDataContext metadataContext;
-
public Advisor(String name, AspectManager manager)
{
this.name = name;
@@ -313,12 +310,6 @@
public Object resolveAnnotation(Class annotation)
{
- if (metadataContext != null)
- {
- Object value = metadataContext.getAnnotation(annotation);
- if (value != null) return value;
- }
-
if (annotations.isDisabled(annotation))
return null;
@@ -335,10 +326,6 @@
public boolean hasAnnotation(Class tgt, String annotation)
{
- if (metadataContext != null)
- {
- if (metadataContext.hasAnnotation(annotation)) return true;
- }
if (annotations.hasClassAnnotation(annotation)) return true;
if (tgt == null) return false;
try
@@ -353,12 +340,6 @@
public Object resolveAnnotation(Method m, Class annotation)
{
- if (metadataContext != null)
- {
- Object val = metadataContext.getAnnotation(m, annotation);
- if (val != null) return val;
- }
-
if (annotations.isDisabled(m,annotation))
return null;
@@ -398,11 +379,6 @@
public boolean hasAnnotation(Method m, String annotation)
{
- if (metadataContext != null)
- {
- if (metadataContext.hasAnnotation(m, annotation)) return true;
- }
-
if (annotations.hasAnnotation(m, annotation)) return true;
try
{
@@ -474,16 +450,6 @@
return AnnotationElement.isAnyAnnotationPresent(member, annotation);
}
- public MetaDataContext getMetadataContext()
- {
- return metadataContext;
- }
-
- public void setMetadataContext(MetaDataContext metadataContext)
- {
- this.metadataContext = metadataContext;
- }
-
public String getName()
{
return name;
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/joinpoint/InvocationBase.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/joinpoint/InvocationBase.java 2006-08-14 16:53:52 UTC (rev 55906)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/joinpoint/InvocationBase.java 2006-08-14 17:27:30 UTC (rev 55907)
@@ -27,7 +27,6 @@
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.metadata.MetaDataResolver;
import org.jboss.aop.metadata.SimpleMetaData;
-import org.jboss.repository.spi.MetaDataContext;
import java.util.HashMap;
import java.util.Map;
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/AOPProxyFactoryParameters.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/AOPProxyFactoryParameters.java 2006-08-14 16:53:52 UTC (rev 55906)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/AOPProxyFactoryParameters.java 2006-08-14 17:27:30 UTC (rev 55907)
@@ -22,7 +22,6 @@
package org.jboss.aop.proxy.container;
import org.jboss.aop.metadata.SimpleMetaData;
-import org.jboss.repository.spi.MetaDataContext;
/**
*
@@ -33,7 +32,6 @@
{
private Class proxiedClass;
private Object target;
- private MetaDataContext metaDataContext;
private Class[] interfaces;
private boolean objectAsSuperClass;
private SimpleMetaData simpleMetaData;
@@ -46,12 +44,10 @@
Class proxiedClass,
Object target,
Class[] interfaces,
- MetaDataContext context,
boolean objectAsSuperClass,
SimpleMetaData simpleMetaData)
{
this.interfaces = interfaces;
- this.metaDataContext = context;
this.objectAsSuperClass = objectAsSuperClass;
this.proxiedClass = proxiedClass;
this.target = target;
@@ -68,16 +64,6 @@
this.interfaces = interfaces;
}
- public MetaDataContext getMetaDataContext()
- {
- return metaDataContext;
- }
-
- public void setMetaDataContext(MetaDataContext metaDataContext)
- {
- this.metaDataContext = metaDataContext;
- }
-
public boolean isObjectAsSuperClass()
{
return objectAsSuperClass;
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/ClassProxyContainer.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/ClassProxyContainer.java 2006-08-14 16:53:52 UTC (rev 55906)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/ClassProxyContainer.java 2006-08-14 17:27:30 UTC (rev 55907)
@@ -30,7 +30,6 @@
import org.jboss.aop.introduction.InterfaceIntroduction;
import org.jboss.aop.util.ConstructorComparator;
import org.jboss.aop.util.MethodHashing;
-import org.jboss.repository.spi.MetaDataContext;
/**
* Extension of ClassContainer needed because of Mixins
@@ -117,7 +116,7 @@
}
}
- public InstanceProxyContainer createInstanceProxyContainer(InterfaceIntroduction introduction, MetaDataContext metaDataContext)
+ public InstanceProxyContainer createInstanceProxyContainer(InterfaceIntroduction introduction)
{
ProxyAdvisorDomain domain = new ProxyAdvisorDomain(manager, clazz, false);
domain.setInheritsBindings(true);
@@ -127,14 +126,14 @@
domain.addInterfaceIntroduction(introduction);
}
- InstanceProxyContainer ia = new InstanceProxyContainer(super.getName(), domain, this, metaDataContext);
+ InstanceProxyContainer ia = new InstanceProxyContainer(super.getName(), domain, this);
return ia;
}
public InstanceProxyContainer createInstanceProxyContainer()
{
- return createInstanceProxyContainer(null, null);
+ return createInstanceProxyContainer(null);
}
public void initialise(Class proxiedClass)
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/ContainerCache.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/ContainerCache.java 2006-08-14 16:53:52 UTC (rev 55906)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/ContainerCache.java 2006-08-14 17:27:30 UTC (rev 55907)
@@ -29,7 +29,6 @@
import org.jboss.aop.Advisor;
import org.jboss.aop.AspectManager;
import org.jboss.aop.introduction.InterfaceIntroduction;
-import org.jboss.repository.spi.MetaDataContext;
/**
*
@@ -49,24 +48,22 @@
private InstanceProxyContainer instanceContainer;
boolean isClassProxyContainer;
Class[] interfaces;
- MetaDataContext metaDataContext;
- public ContainerCache(AspectManager manager, Class proxiedClass, Class[] interfaces, MetaDataContext metaDataContext)
+ public ContainerCache(AspectManager manager, Class proxiedClass, Class[] interfaces)
{
this.manager = manager;
this.interfaces = interfaces;
- this.metaDataContext = metaDataContext;
- key = new ContainerProxyCacheKey(proxiedClass, interfaces, metaDataContext);
+ key = new ContainerProxyCacheKey(proxiedClass, interfaces);
}
- public static ContainerCache initialise(AspectManager manager, Class proxiedClass, MetaDataContext metaDataContext)
+ public static ContainerCache initialise(AspectManager manager, Class proxiedClass)
{
- return initialise(manager, proxiedClass, null, metaDataContext);
+ return initialise(manager, proxiedClass, null);
}
- public static ContainerCache initialise(AspectManager manager, Class proxiedClass, Class[] interfaces, MetaDataContext metaDataContext)
+ public static ContainerCache initialise(AspectManager manager, Class proxiedClass, Class[] interfaces)
{
- ContainerCache factory = new ContainerCache(manager, proxiedClass, interfaces, metaDataContext);
+ ContainerCache factory = new ContainerCache(manager, proxiedClass, interfaces);
synchronized (mapLock)
{
factory.initClassContainer();
@@ -107,7 +104,7 @@
public boolean requiresInstanceAdvisor()
{
- return (interfaces != null && interfaces.length > 0) || metaDataContext != null;
+ return (interfaces != null && interfaces.length > 0);
}
public boolean isAdvised()
@@ -198,7 +195,7 @@
introduction = getInterfaceIntroduction(classAdvisor.getClazz(), interfaces);
}
- instanceContainer = InstanceProxyContainer.createInstanceProxyContainer(classAdvisor, introduction, metaDataContext);
+ instanceContainer = InstanceProxyContainer.createInstanceProxyContainer(classAdvisor, introduction);
}
}
}
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyCacheKey.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyCacheKey.java 2006-08-14 16:53:52 UTC (rev 55906)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyCacheKey.java 2006-08-14 17:27:30 UTC (rev 55907)
@@ -26,9 +26,6 @@
import java.util.Arrays;
import java.util.Comparator;
-import org.jboss.repository.spi.MetaData;
-import org.jboss.repository.spi.MetaDataContext;
-
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
@@ -41,20 +38,17 @@
WeakReference clazzRef;
WeakReference[] addedInterfaces = EMTPY_ARRAY;
- MetaDataContext metaDataContext;
int hashcode = 0;
- MetaDataContext ctx;
public ContainerProxyCacheKey(Class clazz)
{
this.clazzRef = new WeakReference(clazz);
}
- public ContainerProxyCacheKey(Class clazz, Class[] addedInterfaces, MetaDataContext metaDataContext)
+ public ContainerProxyCacheKey(Class clazz, Class[] addedInterfaces)
{
this.clazzRef = new WeakReference(clazz);
populateAddedInterfaces(addedInterfaces);
- this.metaDataContext = metaDataContext;
}
private void populateAddedInterfaces(Class[] addedIfaces)
@@ -98,22 +92,6 @@
ContainerProxyCacheKey other = (ContainerProxyCacheKey)obj;
- if (this.metaDataContext == null && other.metaDataContext == null)
- {
- }
- else if ((this.metaDataContext != null && other.metaDataContext != null))
- {
- if (!this.metaDataContext.equals(other.metaDataContext))
- {
- return false;
- }
- }
- else
- {
- return false;
- }
-
-
Class thisClass = (Class)this.clazzRef.get();
Class otherClass = (Class)other.clazzRef.get();
@@ -179,10 +157,6 @@
hashcode = sb.toString().hashCode();
- if (metaDataContext != null)
- {
- hashcode += metaDataContext.hashCode();
- }
}
return hashcode;
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java 2006-08-14 16:53:52 UTC (rev 55906)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/GeneratedAOPProxyFactory.java 2006-08-14 17:27:30 UTC (rev 55907)
@@ -27,7 +27,6 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.instrument.Untransformable;
import org.jboss.aop.metadata.SimpleMetaData;
-import org.jboss.repository.spi.MetaDataContext;
/**
*
@@ -43,11 +42,10 @@
params.getProxiedClass(),
params.getInterfaces(),
params.getSimpleMetaData(),
- params.getTarget(),
- params.getMetaDataContext());
+ params.getTarget());
}
- private Object createAdvisedProxy(boolean objectAsSuper, Class proxiedClass, Class[] interfaces, SimpleMetaData metadata, Object target, MetaDataContext metaDataContext)
+ private Object createAdvisedProxy(boolean objectAsSuper, Class proxiedClass, Class[] interfaces, SimpleMetaData metadata, Object target)
{
AspectManager manager = AspectManager.instance();
@@ -70,11 +68,11 @@
proxiedClass = Object.class;
}
- return getProxy(objectAsSuper, manager, proxiedClass, interfaces, metadata, target, metaDataContext);
+ return getProxy(objectAsSuper, manager, proxiedClass, interfaces, metadata, target);
}
private Object getProxy(boolean objectAsSuper, AspectManager manager, Class proxiedClass,
- Class[] interfaces, SimpleMetaData metadata, Object target, MetaDataContext metaDataContext)
+ Class[] interfaces, SimpleMetaData metadata, Object target)
{
try
{
@@ -83,7 +81,7 @@
boolean isAdvised = Advised.class.isAssignableFrom(proxiedClass);
- if (target instanceof Untransformable || (isAdvised && metaDataContext == null))
+ if (target instanceof Untransformable)
{
return target;
}
@@ -91,7 +89,7 @@
synchronized (ContainerCache.mapLock)
{
- cache = ContainerCache.initialise(manager, proxiedClass, interfaces, metaDataContext);
+ cache = ContainerCache.initialise(manager, proxiedClass, interfaces);
if (!cache.hasAspects() && !cache.requiresInstanceAdvisor())
{
return target;
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/InstanceProxyContainer.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/InstanceProxyContainer.java 2006-08-14 16:53:52 UTC (rev 55906)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/proxy/container/InstanceProxyContainer.java 2006-08-14 17:27:30 UTC (rev 55907)
@@ -32,7 +32,6 @@
import org.jboss.aop.introduction.InterfaceIntroduction;
import org.jboss.aop.joinpoint.Joinpoint;
import org.jboss.aop.metadata.SimpleMetaData;
-import org.jboss.repository.spi.MetaDataContext;
/**
* The InstanceAdvisor returned by ClassProxyContainer
@@ -49,18 +48,17 @@
Advisor classAdvisor;
InstanceAdvisorDelegate delegate;
- public InstanceProxyContainer(String name, ProxyAdvisorDomain instanceDomain, Advisor classAdvisor, MetaDataContext metaDataContext)
+ public InstanceProxyContainer(String name, ProxyAdvisorDomain instanceDomain, Advisor classAdvisor)
{
super(name, instanceDomain);
this.classAdvisor = classAdvisor;
instanceDomain.setAdvisor(this);
- setMetadataContext(metaDataContext);
delegate = new InstanceAdvisorDelegate(classAdvisor, this);
delegate.initialize();
initialise(classAdvisor.getClazz());
}
- public static InstanceProxyContainer createInstanceProxyContainer(Advisor classAdvisor, InterfaceIntroduction introduction, MetaDataContext metaDataContext)
+ public static InstanceProxyContainer createInstanceProxyContainer(Advisor classAdvisor, InterfaceIntroduction introduction)
{
ProxyAdvisorDomain domain = new ProxyAdvisorDomain(classAdvisor.getManager(), classAdvisor.getClazz(), false, true);
if (introduction != null)
@@ -68,7 +66,7 @@
domain.addInterfaceIntroduction(introduction);
}
- InstanceProxyContainer ia = new InstanceProxyContainer(classAdvisor.getName(), domain, classAdvisor, metaDataContext);
+ InstanceProxyContainer ia = new InstanceProxyContainer(classAdvisor.getName(), domain, classAdvisor);
return ia;
}
Modified: branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/proxy/ProxyTestCase.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/proxy/ProxyTestCase.java 2006-08-14 16:53:52 UTC (rev 55906)
+++ branches/Branch_AOP_1_5/aop/src/test/org/jboss/test/aop/proxy/ProxyTestCase.java 2006-08-14 17:27:30 UTC (rev 55907)
@@ -140,9 +140,9 @@
public void testContainerProxyCacheKey() throws Exception
{
- ContainerProxyCacheKey key1 = new ContainerProxyCacheKey(this.getClass(), new Class[] {Serializable.class, InputStream.class, Externalizable.class}, null);
- ContainerProxyCacheKey key2 = new ContainerProxyCacheKey(this.getClass(), new Class[] {Serializable.class, Externalizable.class}, null);
- ContainerProxyCacheKey key3 = new ContainerProxyCacheKey(this.getClass(), new Class[] {Externalizable.class, InputStream.class, Serializable.class}, null);
+ ContainerProxyCacheKey key1 = new ContainerProxyCacheKey(this.getClass(), new Class[] {Serializable.class, InputStream.class, Externalizable.class});
+ ContainerProxyCacheKey key2 = new ContainerProxyCacheKey(this.getClass(), new Class[] {Serializable.class, Externalizable.class});
+ ContainerProxyCacheKey key3 = new ContainerProxyCacheKey(this.getClass(), new Class[] {Externalizable.class, InputStream.class, Serializable.class});
assertFalse(key1.equals(key2));
assertTrue(key1.equals(key3));
More information about the jboss-cvs-commits
mailing list