[jboss-cvs] JBossAS SVN: r75780 - in trunk: testsuite/src/resources/aop/META-INF and 17 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 14 11:35:08 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-07-14 11:35:08 -0400 (Mon, 14 Jul 2008)
New Revision: 75780
Removed:
trunk/testsuite/src/resources/aop/jdk15annotated/
Modified:
trunk/testsuite/src/resources/aop/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/calllogging/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/deployers/xml/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/earwithwebinf/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/extender/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/invocationlog/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/jmx/jmx-aop.xml
trunk/testsuite/src/resources/aop/proxycache/aspects/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/scoped-attach/sar1/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/scoped-attach/sar1/META-INF/prepare-aop.xml
trunk/testsuite/src/resources/aop/scoped-attach/sar2/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/scoped-attach/sar2/META-INF/prepare-aop.xml
trunk/testsuite/src/resources/aop/scoped/ear1/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/scoped/ear2/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/scoped/sar1/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/scoped/sar2/META-INF/scoped-aop.xml
trunk/testsuite/src/resources/aop/scopedextender/base/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/scopedextender/child/noparentdelegation/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/scopedextender/child/parentdelegation/META-INF/jboss-aop.xml
trunk/tomcat/src/resources/META-INF/jboss-aop.xml
Log:
[JBAS-5766] Touch up the -aop.xml files so that they will work with the new aop deployers
Modified: trunk/testsuite/src/resources/aop/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop SYSTEM "jboss-aop_1_0.dtd">
+<aop xmlns="urn:jboss:aop-beans:1.0">
-<aop>
-
<!-- AOPTester -->
<prepare expr="all(org.jboss.test.aop.bean.POJORef)"/>
@@ -24,16 +22,18 @@
<advice name="interceptField" aspect="org.jboss.test.aop.bean.Aspect"/>
</bind>
+ <interceptor class="org.jboss.test.aop.bean.POJOWildCardConstructorInterceptor"/>
<bind pointcut="execution(org.jboss.test.aop.bean.POJOWildCardConstructorTest->new(..))">
- <interceptor class="org.jboss.test.aop.bean.POJOWildCardConstructorInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.POJOWildCardConstructorInterceptor"/>
</bind>
+ <interceptor class="org.jboss.test.aop.bean.POJOConstructorInterceptor"/>
<bind pointcut="execution(org.jboss.test.aop.bean.POJOConstructorTest->new())">
- <interceptor class="org.jboss.test.aop.bean.POJOConstructorInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.POJOConstructorInterceptor"/>
</bind>
<bind pointcut="execution(org.jboss.test.aop.bean.POJOConstructorTest->new(int, int))">
- <interceptor class="org.jboss.test.aop.bean.POJOConstructorInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.POJOConstructorInterceptor"/>
</bind>
<metadata tag="test" class="org.jboss.test.aop.bean.POJOConstructorTest">
@@ -54,60 +54,63 @@
</method>
</metadata>
+ <interceptor class="org.jboss.test.aop.bean.POJOMethodInterceptor"/>
<bind pointcut="execution(int org.jboss.test.aop.bean.POJOConstructorTest->*(..))">
- <interceptor class="org.jboss.test.aop.bean.POJOMethodInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.POJOMethodInterceptor"/>
</bind>
<bind pointcut="execution(void org.jboss.test.aop.bean.POJOConstructorTest->another(int, int))">
- <interceptor class="org.jboss.test.aop.bean.POJOMethodInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.POJOMethodInterceptor"/>
</bind>
<bind pointcut="execution(* org.jboss.test.aop.bean.POJOConstructorTest->another())">
- <interceptor class="org.jboss.test.aop.bean.POJOMethodInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.POJOMethodInterceptor"/>
</bind>
+ <interceptor class="org.jboss.test.aop.bean.CallerInterceptor"/>
<bind pointcut="call(* org.jboss.test.aop.bean.POJO->someMethod(..)) AND withincode(* org.jboss.test.aop.bean.CallingPOJO->callSomeMethod(..))">
- <interceptor class="org.jboss.test.aop.bean.CallerInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.CallerInterceptor"/>
</bind>
<bind pointcut="call(* org.jboss.test.aop.bean.NonadvisedPOJO->remoteTest(..)) AND withincode(* org.jboss.test.aop.bean.CallingPOJO->*(..))">
- <interceptor class="org.jboss.test.aop.bean.CallerInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.CallerInterceptor"/>
</bind>
<bind pointcut="call(* org.jboss.test.aop.bean.POJO->someMethod(..)) AND withincode(org.jboss.test.aop.bean.CallingPOJO->new(..))">
- <interceptor class="org.jboss.test.aop.bean.CallerInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.CallerInterceptor"/>
</bind>
<bind pointcut="call(* org.jboss.test.aop.bean.NonadvisedPOJO->remoteTest(..)) AND withincode(org.jboss.test.aop.bean.CallingPOJO->new(..))">
- <interceptor class="org.jboss.test.aop.bean.CallerInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.CallerInterceptor"/>
</bind>
<bind pointcut="call(org.jboss.test.aop.bean.POJO->new(..)) AND withincode(* org.jboss.test.aop.bean.CallingPOJO->callSomeMethod(..))">
- <interceptor class="org.jboss.test.aop.bean.CallerInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.CallerInterceptor"/>
</bind>
<bind pointcut="call(org.jboss.test.aop.bean.NonadvisedPOJO->new(..)) AND withincode(* org.jboss.test.aop.bean.CallingPOJO->*(..))">
- <interceptor class="org.jboss.test.aop.bean.CallerInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.CallerInterceptor"/>
</bind>
<bind pointcut="call(org.jboss.test.aop.bean.POJO->new(..)) AND withincode(org.jboss.test.aop.bean.CallingPOJO->new(..))">
- <interceptor class="org.jboss.test.aop.bean.CallerInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.CallerInterceptor"/>
</bind>
<bind pointcut="call(org.jboss.test.aop.bean.NonadvisedPOJO->new(..)) AND withincode(org.jboss.test.aop.bean.CallingPOJO->new(..))">
- <interceptor class="org.jboss.test.aop.bean.CallerInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.CallerInterceptor"/>
</bind>
<interceptor name="SimpleInterceptor"
factory="org.jboss.test.aop.bean.SimpleInterceptorFactory"/>
+ <interceptor class="org.jboss.test.aop.bean.InstanceOfInterceptor"/>
<bind pointcut="all($instanceof{org.jboss.test.aop.bean.EmptyInterface})">
- <interceptor class="org.jboss.test.aop.bean.InstanceOfInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.InstanceOfInterceptor"/>
</bind>
<bind pointcut="execution(void $instanceof{org.jboss.test.aop.bean.SomeInterface}->someMethod())">
- <interceptor class="org.jboss.test.aop.bean.InstanceOfInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.InstanceOfInterceptor"/>
</bind>
<cflow-stack name="recursive">
@@ -120,12 +123,13 @@
<called expr="void org.jboss.test.aop.bean.CFlowedPOJO->method2()"/>
</cflow-stack>
+ <interceptor class="org.jboss.test.aop.bean.InterceptorCounter"/>
<bind pointcut="execution(void org.jboss.test.aop.bean.CFlowedPOJO->method3())" cflow="method3">
- <interceptor class="org.jboss.test.aop.bean.InterceptorCounter"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.InterceptorCounter"/>
</bind>
<bind pointcut="execution(void org.jboss.test.aop.bean.CFlowedPOJO->recursive(int))" cflow="recursive">
- <interceptor class="org.jboss.test.aop.bean.InterceptorCounter"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.InterceptorCounter"/>
</bind>
<bind pointcut="execution(* org.jboss.test.aop.bean.POJO*->*(..))">
@@ -186,23 +190,23 @@
</bind>
-->
+ <interceptor name="SimpleBeanInterceptor"
+ factory="org.jboss.test.aop.bean.SimpleBeanInterceptorFactory"/>
<bind pointcut="execution(* $instanceof{javax.ejb.SessionBean}->*(..))">
- <interceptor name="SimpleBeanInterceptor"
- factory="org.jboss.test.aop.bean.SimpleBeanInterceptorFactory"/>
+ <interceptor-ref name="SimpleBeanInterceptor"/>
</bind>
+ <interceptor class="org.jboss.test.aop.bean.SimpleBeanCallerInterceptor"/>
<bind pointcut="call(* $instanceof{javax.ejb.EJBObject}->*(..))">
- <interceptor class="org.jboss.test.aop.bean.SimpleBeanCallerInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.SimpleBeanCallerInterceptor"/>
</bind>
<bind pointcut="get(* org.jboss.test.aop.simpleejb.SimpleBean->*) OR set(* org.jboss.test.aop.simpleejb.SimpleBean->*)">
- <interceptor name="SimpleBeanInterceptor"
- factory="org.jboss.test.aop.bean.SimpleBeanInterceptorFactory"/>
+ <interceptor-ref name="SimpleBeanInterceptor"/>
</bind>
<bind pointcut="execution(org.jboss.test.aop.simpleejb.SimpleBean->new(..))">
- <interceptor name="SimpleBeanInterceptor"
- factory="org.jboss.test.aop.bean.SimpleBeanInterceptorFactory"/>
+ <interceptor-ref name="SimpleBeanInterceptor"/>
</bind>
<metadata tag="transaction" class="org.jboss.test.aop.bean.POJO*">
@@ -289,17 +293,17 @@
</default>
</metadata>
-
+ <interceptor name="VERSIONED" factory="org.jboss.aspects.versioned.VersionedConstructorInterceptorFactory"/>
<bind pointcut="execution(* org.jboss.test.aop.bean.VersionedPOJO->*(..))">
- <interceptor name="VERSIONED" factory="org.jboss.aspects.versioned.VersionedConstructorInterceptorFactory"/>
+ <interceptor-ref name="VERSIONED"/>
</bind>
<bind pointcut="get(* org.jboss.test.aop.bean.VersionedPOJO->*) OR set(* org.jboss.test.aop.bean.VersionedPOJO->*)">
- <interceptor name="VERSIONED" factory="org.jboss.aspects.versioned.VersionedConstructorInterceptorFactory"/>
+ <interceptor-ref name="VERSIONED"/>
</bind>
<bind pointcut="execution(org.jboss.test.aop.bean.VersionedPOJO->new(..))">
- <interceptor name="VERSIONED" factory="org.jboss.aspects.versioned.VersionedConstructorInterceptorFactory"/>
+ <interceptor-ref name="VERSIONED"/>
</bind>
<metadata tag="transaction" class="org.jboss.test.aop.bean.VersionedPOJO">
@@ -455,8 +459,9 @@
<prepare expr="all(org.jboss.test.aop.bean.LogUtil)"/>
<prepare expr="all(org.jboss.test.aop.bean.ObservableTester)"/>
+ <interceptor class="org.jboss.aspects.patterns.observable.SubjectInterceptor"/>
<bind pointcut="set(* org.jboss.test.aop.bean.Temperature->*)">
- <interceptor class="org.jboss.aspects.patterns.observable.SubjectInterceptor"/>
+ <interceptor-ref name="org.jboss.aspects.patterns.observable.SubjectInterceptor"/>
</bind>
<introduction class="org.jboss.test.aop.bean.Temperature">
@@ -480,7 +485,8 @@
@org.jboss.test.aop.bean.OverriddenAnnotation(data="Overridden")
</annotation>
+ <interceptor class="org.jboss.test.aop.bean.OverriddenAnnotationInterceptor"/>
<bind pointcut="execution(* org.jboss.test.aop.bean.POJO->overriddenAnnotatedMethod())">
- <interceptor class="org.jboss.test.aop.bean.OverriddenAnnotationInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.bean.OverriddenAnnotationInterceptor"/>
</bind>
</aop>
Modified: trunk/testsuite/src/resources/aop/calllogging/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/calllogging/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/calllogging/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bind pointcut="all(org.jboss.test.aop.test.CallLoggingUnitTestCase)">
<interceptor name="CallLogging" factory="org.jboss.aspects.logging.CallLoggingInterceptorFactory"/>
Modified: trunk/testsuite/src/resources/aop/deployers/xml/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/deployers/xml/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/deployers/xml/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,4 +1,4 @@
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<interceptor class="org.jboss.test.aop.deployers.xml.SomeInterceptor"/>
<interceptor name="someinterceptor" class="org.jboss.test.aop.deployers.xml.SomeInterceptor"/>
<aspect class="org.jboss.test.aop.deployers.xml.SomeAspect"/>
Modified: trunk/testsuite/src/resources/aop/earwithwebinf/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/earwithwebinf/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/earwithwebinf/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,4 +1,4 @@
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<interceptor class="org.jboss.test.aop.earwithwebinf.interceptor.EJBInterceptor"/>
<interceptor class="org.jboss.test.aop.earwithwebinf.interceptor.WebInterceptor"/>
Modified: trunk/testsuite/src/resources/aop/extender/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/extender/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/extender/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,25 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
+<aop xmlns="urn:jboss:aop-beans:1.0">
-<!DOCTYPE aop PUBLIC
- "-//JBoss//DTD JBOSS AOP 1.0//EN"
- "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
-
+ <interceptor class="org.jboss.test.aop.extender.ExtenderInterceptor"/>
<bind pointcut="execution(* org.jboss.test.aop.extender.ChildBase->updateBase())">
- <interceptor class="org.jboss.test.aop.extender.ExtenderInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.extender.ExtenderInterceptor"/>
</bind>
<bind pointcut="execution(* org.jboss.test.aop.extender.Base->setBase(..))">
- <interceptor class="org.jboss.test.aop.extender.ExtenderInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.extender.ExtenderInterceptor"/>
</bind>
<bind pointcut="execution(* org.jboss.test.aop.extender.ChildExtender->*(..))">
- <interceptor class="org.jboss.test.aop.extender.ExtenderInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.extender.ExtenderInterceptor"/>
</bind>
<bind pointcut="execution(* org.jboss.test.aop.extender.InfantBase->*(..))">
- <interceptor class="org.jboss.test.aop.extender.ExtenderInterceptor"/>
+ <interceptor-ref name="org.jboss.test.aop.extender.ExtenderInterceptor"/>
</bind>
</aop>
Modified: trunk/testsuite/src/resources/aop/invocationlog/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/invocationlog/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/invocationlog/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<bind pointcut="all(org.jboss.test.aop.bean.POJO)">
<interceptor name="InvocationLog" factory="org.jboss.aspects.logging.InvocationLogInterceptorFactory"/>
Modified: trunk/testsuite/src/resources/aop/jmx/jmx-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/jmx/jmx-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/jmx/jmx-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<introduction class="org.jboss.test.aop.jmx.IntrospectedMBean">
<mixin>
<interfaces>javax.management.DynamicMBean</interfaces>
Modified: trunk/testsuite/src/resources/aop/proxycache/aspects/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/proxycache/aspects/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/proxycache/aspects/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,21 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<interceptor class="org.jboss.test.aop.proxycache.NullInterceptor"/>
<bind pointcut="execution(* java.util.ArrayList->*(..))">
<interceptor-ref name="org.jboss.test.aop.proxycache.NullInterceptor"/>
</bind>
-
- <bind pointcut="execution(* java.utl.ArrayList->*(..))">
- <interceptor-ref name="org.jboss.test.aop.proxycache.NullInterceptor"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.proxycache.GlobalClass->*(..))">
- <interceptor-ref name="org.jboss.test.aop.proxycache.NullInterceptor"/>
- </bind>
-
- <bind pointcut="execution(* org.jboss.test.aop.proxycache.ScopedClass->*(..))">
- <interceptor-ref name="org.jboss.test.aop.proxycache.NullInterceptor"/>
- </bind>
-
-</aop>
\ No newline at end of file
+</aop>
Modified: trunk/testsuite/src/resources/aop/scoped/ear1/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped/ear1/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/scoped/ear1/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,4 +1,4 @@
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<interceptor class="org.jboss.test.aop.scoped.ear.interceptor.TestInterceptor">
<attribute name="scope">scope1</attribute>
</interceptor>
Modified: trunk/testsuite/src/resources/aop/scoped/ear2/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped/ear2/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/scoped/ear2/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,4 +1,4 @@
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<interceptor class="org.jboss.test.aop.scoped.ear.interceptor.TestInterceptor">
<attribute name="scope">scope2</attribute>
</interceptor>
Modified: trunk/testsuite/src/resources/aop/scoped/sar1/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped/sar1/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/scoped/sar1/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<interceptor class="org.jboss.test.aop.scoped.ScopedInterceptor" scope="PER_INSTANCE">
<attribute name="value">11</attribute>
</interceptor>
Modified: trunk/testsuite/src/resources/aop/scoped/sar2/META-INF/scoped-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped/sar2/META-INF/scoped-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/scoped/sar2/META-INF/scoped-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<interceptor class="org.jboss.test.aop.scoped.ScopedInterceptor" scope="PER_INSTANCE">
<attribute name="value">12</attribute>
</interceptor>
Modified: trunk/testsuite/src/resources/aop/scoped-attach/sar1/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped-attach/sar1/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/scoped-attach/sar1/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<loader-repository>aop.loading:loader=scope1</loader-repository>
<interceptor class="org.jboss.test.aop.scopedattach.ScopedInterceptor" scope="PER_INSTANCE">
Modified: trunk/testsuite/src/resources/aop/scoped-attach/sar1/META-INF/prepare-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped-attach/sar1/META-INF/prepare-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/scoped-attach/sar1/META-INF/prepare-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<prepare expr="all(org.jboss.test.aop.scopedattach.POJO)"/>
</aop>
Modified: trunk/testsuite/src/resources/aop/scoped-attach/sar2/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped-attach/sar2/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/scoped-attach/sar2/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<loader-repository>aop.loading:loader=scope2</loader-repository>
<interceptor class="org.jboss.test.aop.scopedattach.ScopedInterceptor" scope="PER_INSTANCE">
Modified: trunk/testsuite/src/resources/aop/scoped-attach/sar2/META-INF/prepare-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped-attach/sar2/META-INF/prepare-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/scoped-attach/sar2/META-INF/prepare-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<prepare expr="all(org.jboss.test.aop.scopedattach.POJO)"/>
</aop>
Modified: trunk/testsuite/src/resources/aop/scopedextender/base/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scopedextender/base/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/scopedextender/base/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
- "-//JBoss//DTD JBOSS AOP 1.0//EN"
- "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<aspect class="org.jboss.test.aop.scopedextender.BaseAspect"/>
<interceptor name="class" class="org.jboss.test.aop.scopedextender.BasePerClassInterceptor" scope="PER_CLASS"/>
<interceptor name="instance" class="org.jboss.test.aop.scopedextender.BasePerInstanceInterceptor" scope="PER_INSTANCE"/>
Modified: trunk/testsuite/src/resources/aop/scopedextender/child/noparentdelegation/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scopedextender/child/noparentdelegation/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/scopedextender/child/noparentdelegation/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
- "-//JBoss//DTD JBOSS AOP 1.0//EN"
- "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<aspect class="org.jboss.test.aop.scopedextender.BaseParentAspect"/>
<aspect class="org.jboss.test.aop.scopedextender.ChildAspect"/>
Modified: trunk/testsuite/src/resources/aop/scopedextender/child/parentdelegation/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scopedextender/child/parentdelegation/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/testsuite/src/resources/aop/scopedextender/child/parentdelegation/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
- "-//JBoss//DTD JBOSS AOP 1.0//EN"
- "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<aspect class="org.jboss.test.aop.scopedextender.BaseParentAspect"/>
<aspect class="org.jboss.test.aop.scopedextender.ChildAspect"/>
Modified: trunk/tomcat/src/resources/META-INF/jboss-aop.xml
===================================================================
--- trunk/tomcat/src/resources/META-INF/jboss-aop.xml 2008-07-14 15:33:12 UTC (rev 75779)
+++ trunk/tomcat/src/resources/META-INF/jboss-aop.xml 2008-07-14 15:35:08 UTC (rev 75780)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<aop>
+<aop xmlns="urn:jboss:aop-beans:1.0">
<!-- If a POJO has Replicable annotation, it will be aspectized. -->
<!--
More information about the jboss-cvs-commits
mailing list