[jboss-cvs] JBossAS SVN: r99365 - in trunk/testsuite: src/resources/aop/mcdefaultannotation/META-INF and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jan 13 16:34:25 EST 2010 

Author: kabir.khan at jboss.com
Date: 2010-01-13 16:34:25 -0500 (Wed, 13 Jan 2010)
New Revision: 99365

Modified:
   trunk/testsuite/.classpath
   trunk/testsuite/src/resources/aop/mcdefaultannotation/META-INF/jboss-beans.xml
   trunk/testsuite/src/resources/aop/mcjmx/META-INF/has-dependency-jboss-beans.xml
   trunk/testsuite/src/resources/aop/mcjmx/META-INF/jboss-beans.xml
   trunk/testsuite/src/resources/aop/scopeddependency/scoped/META-INF/jboss-beans.xml
Log:
[JBAS-7618] Fix the tests requiring @EnableAopProxy

Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath	2010-01-13 21:19:59 UTC (rev 99364)
+++ trunk/testsuite/.classpath	2010-01-13 21:34:25 UTC (rev 99365)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry excluding="org/jboss/test/JBossRMIAdaptorHelper.java|org/jboss/test/JBossTestSuite.java|org/jboss/test/SmokeTestSuite.java|org/jboss/test/bank/|org/jboss/test/bankiiop/|org/jboss/test/banknew/|org/jboss/test/bench/|org/jboss/test/binding/|org/jboss/test/bmp/|org/jboss/test/bootstrapdependencies/|org/jboss/test/bpel/|org/jboss/test/cache/|org/jboss/test/classloader/|org/jboss/test/client/|org/jboss/test/cluster/|org/jboss/test/cmp2/|org/jboss/test/common/|org/jboss/test/compatibility/|org/jboss/test/console/|org/jboss/test/cts/|org/jboss/test/dbtest/|org/jboss/test/deadlock/|org/jboss/test/deployers/|org/jboss/test/deployment/|org/jboss/test/ee5client/|org/jboss/test/ejb/|org/jboss/test/ejb3/|org/jboss/test/ejbconf/|org/jboss/test/entity/|org/jboss/test/entitydepends/|org/jboss/test/entityexc/|org/jboss/test/excepiiop/|org/jboss/test/exception/|org/jboss/test/guid/|org/jboss/test/ha/|org/jboss/test/hello/|org/jboss/test/helloiiop/|org/jboss/test/hellojrmpiio!
 p/|org/jboss/test/hibernate/|org/jboss/test/idgen/|org/jboss/test/iiop/|org/jboss/test/iiopperf/|org/jboss/test/invokers/|org/jboss/test/isolation/|org/jboss/test/jacc/|org/jboss/test/javassist/|org/jboss/test/jaxr/|org/jboss/test/jbossmessaging/|org/jboss/test/jbossmx/|org/jboss/test/jbossts/|org/jboss/test/jca/|org/jboss/test/jcaprops/|org/jboss/test/jms/|org/jboss/test/jmsra/|org/jboss/test/jmx/|org/jboss/test/jpa/|org/jboss/test/jrmp/|org/jboss/test/jsf/|org/jboss/test/kernel/|org/jboss/test/load/|org/jboss/test/lock/|org/jboss/test/management/|org/jboss/test/marathon/|org/jboss/test/marshal/|org/jboss/test/marshaliiop/|org/jboss/test/mdb/|org/jboss/test/mdbsessionpoolclear/|org/jboss/test/messagedriven/|org/jboss/test/naming/|org/jboss/test/passwordinjection/|org/jboss/test/perf/|org/jboss/test/pooled/|org/jboss/test/profileservice/|org/jboss/test/proxycompiler/|org/jboss/test/readahead/|org/jboss/test/refs/|org/jboss/test/retry/|org/jboss/test/scoped/|org/jboss/test/s!
 ecurity/|org/jboss/test/securitymgr/|org/jboss/test/session/|o!
 rg/jboss
/test/sessionsync/|org/jboss/test/snmp/|org/jboss/test/spring/|org/jboss/test/stax/|org/jboss/test/testbean/|org/jboss/test/testbean2/|org/jboss/test/testbeancluster/|org/jboss/test/testbyvalue/|org/jboss/test/threading/|org/jboss/test/timer/|org/jboss/test/tm/|org/jboss/test/txiiop/|org/jboss/test/txtimer/|org/jboss/test/varia/|org/jboss/test/web/|org/jboss/test/webservice/|org/jboss/test/ws/|org/jboss/test/xa/|org/jboss/test/xml/|org/jboss/test/xslt/" kind="src" path="src/main"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

Modified: trunk/testsuite/src/resources/aop/mcdefaultannotation/META-INF/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/aop/mcdefaultannotation/META-INF/jboss-beans.xml	2010-01-13 21:19:59 UTC (rev 99364)
+++ trunk/testsuite/src/resources/aop/mcdefaultannotation/META-INF/jboss-beans.xml	2010-01-13 21:34:25 UTC (rev 99365)
@@ -13,10 +13,12 @@
    </aop:bind>
 
    <bean name="TestAOPBean" class="org.jboss.test.aop.mcdefaultannotation.MyBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.aop:name=Bean", exposedInterface=org.jboss.test.aop.mcdefaultannotation.BeanInterface.class)</annotation>
       <annotation>@org.jboss.test.aop.mcdefaultannotation.TestAnnotation</annotation>
    </bean>
    <bean name="TestAOPBean2" class="org.jboss.test.aop.mcdefaultannotation.MyBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.aop:name=Bean2", exposedInterface=org.jboss.test.aop.mcdefaultannotation.BeanInterface.class)</annotation>
       <annotation>@org.jboss.test.aop.mcdefaultannotation.TestAnnotation(property="Overridden")</annotation>
    </bean>

Modified: trunk/testsuite/src/resources/aop/mcjmx/META-INF/has-dependency-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/aop/mcjmx/META-INF/has-dependency-jboss-beans.xml	2010-01-13 21:19:59 UTC (rev 99364)
+++ trunk/testsuite/src/resources/aop/mcjmx/META-INF/has-dependency-jboss-beans.xml	2010-01-13 21:34:25 UTC (rev 99365)
@@ -17,6 +17,7 @@
       <interceptor-ref name="DependencyAdvice"/>
    </bind>
 
-   <bean name="BeanWithDependency" class="org.jboss.test.aop.mcjmx.BeanWithDependency"/>
-
+   <bean name="BeanWithDependency" class="org.jboss.test.aop.mcjmx.BeanWithDependency">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

Modified: trunk/testsuite/src/resources/aop/mcjmx/META-INF/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/aop/mcjmx/META-INF/jboss-beans.xml	2010-01-13 21:19:59 UTC (rev 99364)
+++ trunk/testsuite/src/resources/aop/mcjmx/META-INF/jboss-beans.xml	2010-01-13 21:34:25 UTC (rev 99365)
@@ -3,9 +3,11 @@
 
    <bean name="AnnotatedBean" class="org.jboss.test.aop.mcjmx.AnnotatedBean"/>
    <bean name="XmlBean" class="org.jboss.test.aop.mcjmx.XmlBean">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.aop:name=XmlBean", exposedInterface=org.jboss.test.aop.mcjmx.BeanInterface.class)</annotation>
    </bean>
    <bean name="BeanWithCtorMethodCall" class="org.jboss.test.aop.mcjmx.SubClassBeanWithMethodCallInCtor">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.aop:name=BeanWithCtorMethodCall", exposedInterface=org.jboss.test.aop.mcjmx.BeanInterface.class)</annotation>
    </bean>
 </deployment>

Modified: trunk/testsuite/src/resources/aop/scopeddependency/scoped/META-INF/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scopeddependency/scoped/META-INF/jboss-beans.xml	2010-01-13 21:19:59 UTC (rev 99364)
+++ trunk/testsuite/src/resources/aop/scopeddependency/scoped/META-INF/jboss-beans.xml	2010-01-13 21:34:25 UTC (rev 99365)
@@ -15,6 +15,7 @@
       <interceptor-ref name="ScopedInterceptor"/>
    </bind>
 
-   <bean name="ScopedTester" class="org.jboss.test.aop.scopeddependency.ScopedTester"/>
-
+   <bean name="ScopedTester" class="org.jboss.test.aop.scopeddependency.ScopedTester">
+      <annotation>@org.jboss.aop.microcontainer.annotations.EnableAopProxy</annotation>
+   </bean>
 </deployment>

More information about the jboss-cvs-commits mailing list