[jboss-cvs] JBossAS SVN: r57804 - in branches/Branch_AOP_1_5: aop aop/src/main/org/jboss/aop aspects/src/main/org/jboss/aop/deployment
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 24 14:37:42 EDT 2006
Author: kabir.khan at jboss.com
Date: 2006-10-24 14:37:35 -0400 (Tue, 24 Oct 2006)
New Revision: 57804
Modified:
branches/Branch_AOP_1_5/aop/.classpath
branches/Branch_AOP_1_5/aop/build.xml
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/Domain.java
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/DomainDefinition.java
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/GeneratedAdvisorDomain.java
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/InstanceDomain.java
branches/Branch_AOP_1_5/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
Log:
Align Domain API with that of AOP 2.0 and bump up version to snapshot
Modified: branches/Branch_AOP_1_5/aop/.classpath
===================================================================
--- branches/Branch_AOP_1_5/aop/.classpath 2006-10-24 17:17:18 UTC (rev 57803)
+++ branches/Branch_AOP_1_5/aop/.classpath 2006-10-24 18:37:35 UTC (rev 57804)
@@ -2,8 +2,7 @@
<classpath>
<classpathentry excluding="org/jboss/aop/AnnotationIntroductionDef.java|org/jboss/aop/Aspect.java|org/jboss/aop/Bind.java|org/jboss/aop/CFlowDef.java|org/jboss/aop/CFlowStackDef.java|org/jboss/aop/DeclareError.java|org/jboss/aop/DeclareWarning.java|org/jboss/aop/DynamicCFlowDef.java|org/jboss/aop/InterceptorDef.java|org/jboss/aop/Introduction.java|org/jboss/aop/Mixin.java|org/jboss/aop/PointcutDef.java|org/jboss/aop/Precedence.java|org/jboss/aop/PrecedenceAdvice.java|org/jboss/aop/PrecedenceInterceptor.java|org/jboss/aop/Prepare.java|org/jboss/aop/TypeDef.java|org/jboss/aop/advice/Scope.java|org/jboss/aop/annotation/AnnotationElement.java|org/jboss/aop/hook/JRockitClassPreProcessor.java|org/jboss/aop/hook/JRockitPluggableClassPreProcessor.java|org/jboss/aspects/Threadbased.java" kind="src" path="src/main"/>
<classpathentry kind="src" path="src/jdk15"/>
- <classpathentry excluding="org/jboss/test/aop/jdk15/" kind="src" path="src/test"/>
- <classpathentry kind="src" path="/common"/>
+ <classpathentry excluding="org/jboss/test/aop/jdk15/|org/jboss/test/aop/memoryleaks/" kind="src" path="src/test"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry sourcepath="/javassist" kind="lib" path="/thirdparty/javassist/lib/javassist.jar"/>
<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
@@ -13,7 +12,7 @@
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="docs"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/Branch_AOP_1_5/aop/build.xml
===================================================================
--- branches/Branch_AOP_1_5/aop/build.xml 2006-10-24 17:17:18 UTC (rev 57803)
+++ branches/Branch_AOP_1_5/aop/build.xml 2006-10-24 18:37:35 UTC (rev 57804)
@@ -57,7 +57,7 @@
-->
<target name="configure" unless="configure.disable">
- <property name="aop.version" value="jboss-aop-1.5.2.GA"/>
+ <property name="aop.version" value="jboss-aop-snapshot-Branch_1_5"/>
<property name="aop.title" value="JBoss AOP Framework"/>
<!-- =================== -->
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/Domain.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/Domain.java 2006-10-24 17:17:18 UTC (rev 57803)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/Domain.java 2006-10-24 18:37:35 UTC (rev 57804)
@@ -56,10 +56,11 @@
protected boolean inheritsBindings = false;
- public Domain(AspectManager manager, boolean parentFirst)
+ public Domain(AspectManager manager, String name, boolean parentFirst)
{
this.parent = manager;
this.parentFirst = parentFirst;
+ //Ignore the name - it is used by AOP 2.0
}
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/DomainDefinition.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/DomainDefinition.java 2006-10-24 17:17:18 UTC (rev 57803)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/DomainDefinition.java 2006-10-24 18:37:35 UTC (rev 57804)
@@ -36,7 +36,7 @@
public DomainDefinition(String name, AspectManager parent, boolean parentFirst, boolean inheritDefs, boolean inheritBindings)
{
this.name = name;
- Domain domain = new Domain(parent, parentFirst);
+ Domain domain = new Domain(parent, name, parentFirst);
domain.setInheritsBindings(inheritBindings);
domain.setInheritsDeclarations(inheritDefs);
manager = domain;
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/GeneratedAdvisorDomain.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/GeneratedAdvisorDomain.java 2006-10-24 17:17:18 UTC (rev 57803)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/GeneratedAdvisorDomain.java 2006-10-24 18:37:35 UTC (rev 57804)
@@ -35,7 +35,7 @@
public GeneratedAdvisorDomain(AspectManager manager, Class clazz, boolean parentFirst, boolean instanceDomain)
{
- super(manager, parentFirst);
+ super(manager, null, parentFirst);
if (!instanceDomain)
{
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/InstanceDomain.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/InstanceDomain.java 2006-10-24 17:17:18 UTC (rev 57803)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/InstanceDomain.java 2006-10-24 18:37:35 UTC (rev 57804)
@@ -35,7 +35,7 @@
public InstanceDomain(AspectManager manager, boolean parentFirst)
{
- super(manager, parentFirst);
+ super(manager, null, parentFirst);
setInheritsBindings(true);
}
Modified: branches/Branch_AOP_1_5/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java
===================================================================
--- branches/Branch_AOP_1_5/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2006-10-24 17:17:18 UTC (rev 57803)
+++ branches/Branch_AOP_1_5/aspects/src/main/org/jboss/aop/deployment/ScopedClassLoaderDomain.java 2006-10-24 18:37:35 UTC (rev 57804)
@@ -48,8 +48,7 @@
public ScopedClassLoaderDomain(ClassLoader loader, boolean parentDelegation, AspectManager manager, boolean parentFirst)
{
- // FIXME ScopedClassLoaderDomain constructor
- super(manager, parentFirst);
+ super(manager, null, parentFirst);
this.loader = new WeakReference(loader);
this.parentDelegation = parentDelegation;
}
More information about the jboss-cvs-commits
mailing list