[Jboss-cvs] JBossAS SVN: r56778 - in trunk/testsuite/src/resources/aop/scopedextender: sar1 sar1/noparentdelegation sar1/noparentdelegation/META-INF sar1/parentdelegation sar1/parentdelegation/META-INF sar2 sar2/META-INF sar2/loaded sar2/loaded/META-INF sar2/notloaded sar2/notloaded/META-INF
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 12 14:29:56 EDT 2006
Author: kabir.khan at jboss.com
Date: 2006-09-12 14:29:50 -0400 (Tue, 12 Sep 2006)
New Revision: 56778
Added:
trunk/testsuite/src/resources/aop/scopedextender/sar1/noparentdelegation/
trunk/testsuite/src/resources/aop/scopedextender/sar1/noparentdelegation/META-INF/
trunk/testsuite/src/resources/aop/scopedextender/sar1/noparentdelegation/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/scopedextender/sar1/noparentdelegation/META-INF/jboss-service.xml
trunk/testsuite/src/resources/aop/scopedextender/sar1/parentdelegation/
trunk/testsuite/src/resources/aop/scopedextender/sar1/parentdelegation/META-INF/
trunk/testsuite/src/resources/aop/scopedextender/sar1/parentdelegation/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/scopedextender/sar1/parentdelegation/META-INF/jboss-service.xml
trunk/testsuite/src/resources/aop/scopedextender/sar2/loaded/
trunk/testsuite/src/resources/aop/scopedextender/sar2/loaded/META-INF/
trunk/testsuite/src/resources/aop/scopedextender/sar2/loaded/META-INF/jboss-service.xml
trunk/testsuite/src/resources/aop/scopedextender/sar2/notloaded/
trunk/testsuite/src/resources/aop/scopedextender/sar2/notloaded/META-INF/
trunk/testsuite/src/resources/aop/scopedextender/sar2/notloaded/META-INF/jboss-service.xml
Removed:
trunk/testsuite/src/resources/aop/scopedextender/sar1/META-INF/
trunk/testsuite/src/resources/aop/scopedextender/sar2/META-INF/jboss-service.xml
Modified:
trunk/testsuite/src/resources/aop/scopedextender/sar2/META-INF/jboss-aop.xml
Log:
[JBAOP-257] Get basic functionality working for subclasses in a deployment using scoped classloaders extending classes deployed in the global classloading domain.
Still need to test constructors and fields
Added: trunk/testsuite/src/resources/aop/scopedextender/sar1/noparentdelegation/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scopedextender/sar1/noparentdelegation/META-INF/jboss-aop.xml 2006-09-12 18:25:59 UTC (rev 56777)
+++ trunk/testsuite/src/resources/aop/scopedextender/sar1/noparentdelegation/META-INF/jboss-aop.xml 2006-09-12 18:29:50 UTC (rev 56778)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE aop PUBLIC
+ "-//JBoss//DTD JBOSS AOP 1.0//EN"
+ "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+ <aspect class="org.jboss.test.aop.scopedextender.BaseParentAspect"/>
+ <aspect class="org.jboss.test.aop.scopedextender.ChildAspect"/>
+
+ <bind pointcut="execution(* $instanceof{org.jboss.test.aop.scopedextender.Child_A2}->*(..))">
+ <advice aspect="org.jboss.test.aop.scopedextender.ChildAspect" name="invoke"/>
+ </bind>
+ <bind pointcut="execution(* $instanceof{org.jboss.test.aop.scopedextender.Child_B1}->*(..))">
+ <advice aspect="org.jboss.test.aop.scopedextender.ChildAspect" name="invoke"/>
+ </bind>
+ <bind pointcut="execution(* $instanceof{org.jboss.test.aop.scopedextender.Base_Base}->*(..))">
+ <advice aspect="org.jboss.test.aop.scopedextender.BaseParentAspect" name="invoke"/>
+ </bind>
+ <bind pointcut="execution(* $instanceof{org.jboss.test.aop.scopedextender.BaseNotBaseWoven}->notWovenInBase(..))">
+ <advice aspect="org.jboss.test.aop.scopedextender.BaseParentAspect" name="invoke"/>
+ <advice aspect="org.jboss.test.aop.scopedextender.ChildAspect" name="invoke"/>
+ </bind>
+</aop>
Added: trunk/testsuite/src/resources/aop/scopedextender/sar1/noparentdelegation/META-INF/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scopedextender/sar1/noparentdelegation/META-INF/jboss-service.xml 2006-09-12 18:25:59 UTC (rev 56777)
+++ trunk/testsuite/src/resources/aop/scopedextender/sar1/noparentdelegation/META-INF/jboss-service.xml 2006-09-12 18:29:50 UTC (rev 56778)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <loader-repository>
+ aop.loading:loader=scopedextender1
+ <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
+ </loader-repository>
+ <mbean code="org.jboss.test.aop.scopedextender.ScopedChildNoParentDelegationTester" name="jboss.aop:name=ChildTester"/>
+</server>
Added: trunk/testsuite/src/resources/aop/scopedextender/sar1/parentdelegation/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scopedextender/sar1/parentdelegation/META-INF/jboss-aop.xml 2006-09-12 18:25:59 UTC (rev 56777)
+++ trunk/testsuite/src/resources/aop/scopedextender/sar1/parentdelegation/META-INF/jboss-aop.xml 2006-09-12 18:29:50 UTC (rev 56778)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE aop PUBLIC
+ "-//JBoss//DTD JBOSS AOP 1.0//EN"
+ "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+ <aspect class="org.jboss.test.aop.scopedextender.BaseParentAspect"/>
+ <aspect class="org.jboss.test.aop.scopedextender.ChildAspect"/>
+
+ <bind pointcut="execution(* $instanceof{org.jboss.test.aop.scopedextender.Child_A2}->*(..))">
+ <advice aspect="org.jboss.test.aop.scopedextender.ChildAspect" name="invoke"/>
+ </bind>
+ <bind pointcut="execution(* $instanceof{org.jboss.test.aop.scopedextender.Child_B1}->*(..))">
+ <advice aspect="org.jboss.test.aop.scopedextender.ChildAspect" name="invoke"/>
+ </bind>
+ <bind pointcut="execution(* $instanceof{org.jboss.test.aop.scopedextender.Base_Base}->*(..))">
+ <advice aspect="org.jboss.test.aop.scopedextender.BaseParentAspect" name="invoke"/>
+ </bind>
+
+</aop>
Added: trunk/testsuite/src/resources/aop/scopedextender/sar1/parentdelegation/META-INF/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scopedextender/sar1/parentdelegation/META-INF/jboss-service.xml 2006-09-12 18:25:59 UTC (rev 56777)
+++ trunk/testsuite/src/resources/aop/scopedextender/sar1/parentdelegation/META-INF/jboss-service.xml 2006-09-12 18:29:50 UTC (rev 56778)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <loader-repository>
+ aop.loading:loader=scopedextender1
+ <loader-repository-config>java2ParentDelegation=true</loader-repository-config>
+ </loader-repository>
+ <mbean code="org.jboss.test.aop.scopedextender.ScopedChildParentDelegationTester" name="jboss.aop:name=ChildTester"/>
+</server>
Modified: trunk/testsuite/src/resources/aop/scopedextender/sar2/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scopedextender/sar2/META-INF/jboss-aop.xml 2006-09-12 18:25:59 UTC (rev 56777)
+++ trunk/testsuite/src/resources/aop/scopedextender/sar2/META-INF/jboss-aop.xml 2006-09-12 18:29:50 UTC (rev 56778)
@@ -5,9 +5,10 @@
"http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
<aop>
-
- <bind pointcut="execution(* org.jboss.test.aop.scopedextender.Base->setBase(..))">
- <interceptor class="org.jboss.test.aop.scopedextender.ScopedExtenderInterceptor"/>
+ <aspect class="org.jboss.test.aop.scopedextender.BaseAspect"/>
+
+ <bind pointcut="execution(* $instanceof{org.jboss.test.aop.scopedextender.Base_Base}->*(..))">
+ <advice aspect="org.jboss.test.aop.scopedextender.BaseAspect" name="invoke"/>
</bind>
</aop>
Deleted: trunk/testsuite/src/resources/aop/scopedextender/sar2/META-INF/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scopedextender/sar2/META-INF/jboss-service.xml 2006-09-12 18:25:59 UTC (rev 56777)
+++ trunk/testsuite/src/resources/aop/scopedextender/sar2/META-INF/jboss-service.xml 2006-09-12 18:29:50 UTC (rev 56778)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.test.aop.scopedextender.ScopedExtenderTester" name="jboss.aop:name=ScopedExtenderTester2"/>
-</server>
Added: trunk/testsuite/src/resources/aop/scopedextender/sar2/loaded/META-INF/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scopedextender/sar2/loaded/META-INF/jboss-service.xml 2006-09-12 18:25:59 UTC (rev 56777)
+++ trunk/testsuite/src/resources/aop/scopedextender/sar2/loaded/META-INF/jboss-service.xml 2006-09-12 18:29:50 UTC (rev 56778)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.test.aop.scopedextender.BaseLoadedTester" name="jboss.aop:name=BaseTester"/>
+</server>
Added: trunk/testsuite/src/resources/aop/scopedextender/sar2/notloaded/META-INF/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scopedextender/sar2/notloaded/META-INF/jboss-service.xml 2006-09-12 18:25:59 UTC (rev 56777)
+++ trunk/testsuite/src/resources/aop/scopedextender/sar2/notloaded/META-INF/jboss-service.xml 2006-09-12 18:29:50 UTC (rev 56778)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.test.aop.scopedextender.BaseNotLoadedTester" name="jboss.aop:name=BaseTester"/>
+</server>
More information about the jboss-cvs-commits
mailing list