[jboss-cvs] JBossAS SVN: r77367 - in trunk/testsuite: src/main/org/jboss/test/aop/jdk15annotated and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 22 13:15:13 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-08-22 13:15:13 -0400 (Fri, 22 Aug 2008)
New Revision: 77367
Added:
trunk/testsuite/src/resources/aop/jdk15annotated/META-INF/jboss-aop.xml
trunk/testsuite/src/resources/aop/jdk15annotated/scoped2/META-INF/jboss-aop.xml
Modified:
trunk/testsuite/imports/sections/aop.xml
trunk/testsuite/src/main/org/jboss/test/aop/jdk15annotated/ScopedAnnotatedTester.java
trunk/testsuite/src/main/org/jboss/test/aop/test/AOPTestSetup.java
Log:
Undo files wrongly committed/deleted in r77361
Modified: trunk/testsuite/imports/sections/aop.xml
===================================================================
--- trunk/testsuite/imports/sections/aop.xml 2008-08-22 17:09:08 UTC (rev 77366)
+++ trunk/testsuite/imports/sections/aop.xml 2008-08-22 17:15:13 UTC (rev 77367)
@@ -264,6 +264,9 @@
<exclude name="org/jboss/test/aop/jdk15annotated/ScopedAnnotatedTester.class" />
<exclude name="org/jboss/test/aop/jdk15annotated/ScopedAnnotatedTesterMBean.class" />
</fileset>
+ <fileset dir="${build.resources}/aop/jdk15annotated">
+ <include name="META-INF/jboss-aop.xml"/>
+ </fileset>
</jar>
<jar destfile="${build.lib}/aop-annotated.sar">
<fileset dir="${build.classes}">
@@ -287,6 +290,9 @@
<exclude name="org/jboss/test/aop/jdk15annotated/ScopedAnnotatedTester.class" />
<exclude name="org/jboss/test/aop/jdk15annotated/ScopedAnnotatedTesterMBean.class" />
</fileset>
+ <fileset dir="${build.resources}/aop/jdk15annotated/scoped">
+ <include name="META-INF/jboss-aop.xml"/>
+ </fileset>
</jar>
<jar destfile="${build.lib}/aop-scoped-annotated.sar">
<fileset dir="${build.classes}">
@@ -318,6 +324,9 @@
<include name="org/jboss/test/aop/jdk15annotated/PreparePOJO.class"/>
<include name="org/jboss/test/aop/jdk15annotated/VariaPOJO.class"/>
</fileset>
+ <fileset dir="${build.resources}/aop/jdk15annotated/scoped2">
+ <include name="META-INF/jboss-aop.xml"/>
+ </fileset>
</jar>
<jar destfile="${build.lib}/aop-scoped-annotated2.sar">
<fileset dir="${build.classes}">
@@ -649,46 +658,49 @@
</fileset>
</jar>
+
+
<!-- create jars for proxycache test -->
+
<jar destfile="${build.lib}/aop-proxycache.aop">
+
<fileset dir="${build.classes}">
+
<include name="org/jboss/test/aop/proxycache/NullInterceptor.class"/>
+
</fileset>
+
<fileset dir="${build.resources}/aop/proxycache/aspects">
+
<include name="**/*.xml"/>
+
</fileset>
+
</jar>
+
+
<jar destfile="${build.lib}/aop-proxycache-global.sar">
+
<fileset dir="${build.classes}">
+
<include name="org/jboss/test/aop/proxycache/CreateProxyTester*.class"/>
+
<include name="org/jboss/test/aop/proxycache/GlobalClass.class"/>
+
<include name="org/jboss/test/aop/proxycache/GlobalInterface.class"/>
+
</fileset>
+
<fileset dir="${build.resources}/aop/proxycache/global">
+
<include name="**/*.xml"/>
+
</fileset>
+
</jar>
- <!-- Create jars for the scopeddependency tests -->
- <jar destfile="${build.lib}/aop-scopeddependency-global.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/aop/scopeddependency/GlobalDependency.class"/>
- </fileset>
- <fileset dir="${build.resources}/aop/scopeddependency/global">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
- <jar destfile="${build.lib}/aop-scopeddependency-scoped.sar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/aop/scopeddependency/Scoped*.class"/>
- </fileset>
- <fileset dir="${build.resources}/aop/scopeddependency/scoped">
- <include name="**/*.xml"/>
- </fileset>
- </jar>
-
<!-- ok, we have created the loadtime jars, let us now precompile the classes for standalone test -->
<!--
Modified: trunk/testsuite/src/main/org/jboss/test/aop/jdk15annotated/ScopedAnnotatedTester.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/jdk15annotated/ScopedAnnotatedTester.java 2008-08-22 17:09:08 UTC (rev 77366)
+++ trunk/testsuite/src/main/org/jboss/test/aop/jdk15annotated/ScopedAnnotatedTester.java 2008-08-22 17:15:13 UTC (rev 77367)
@@ -37,12 +37,9 @@
public class ScopedAnnotatedTester implements ScopedAnnotatedTesterMBean
{
- public void testBinding() throws Exception
+ public void testBinding() throws Exception
{
System.out.println("***** testBinding() ****");
-
- System.out.println("==================> ASPECTMANAGER " + AspectManager.instance());
-
AspectPerVM vm = null;
AspectPerClass perClass = null;
AspectPerClass perClass2 = null;
Modified: trunk/testsuite/src/main/org/jboss/test/aop/test/AOPTestSetup.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/aop/test/AOPTestSetup.java 2008-08-22 17:09:08 UTC (rev 77366)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/AOPTestSetup.java 2008-08-22 17:15:13 UTC (rev 77367)
@@ -46,11 +46,6 @@
this.jar = jar;
}
- public AOPTestSetup(TestSuite suite) throws Exception
- {
- super(suite);
- }
-
protected void setUp() throws Exception
{
super.setUp();
@@ -59,10 +54,7 @@
getServer().setAttribute(aspectManager, enableTransformer);
try
{
- if (jar != null)
- {
- redeploy(jar);
- }
+ redeploy(jar);
}
catch(Exception e)
{
@@ -84,10 +76,7 @@
Exception undeployException = null;
try
{
- if (jar != null)
- {
- undeploy(jar);
- }
+ undeploy(jar);
}
catch(Exception e)
{
Copied: trunk/testsuite/src/resources/aop/jdk15annotated/META-INF/jboss-aop.xml (from rev 77360, trunk/testsuite/src/resources/aop/jdk15annotated/META-INF/jboss-aop.xml)
===================================================================
--- trunk/testsuite/src/resources/aop/jdk15annotated/META-INF/jboss-aop.xml (rev 0)
+++ trunk/testsuite/src/resources/aop/jdk15annotated/META-INF/jboss-aop.xml 2008-08-22 17:15:13 UTC (rev 77367)
@@ -0,0 +1,2 @@
+<aop>
+</aop>
Copied: trunk/testsuite/src/resources/aop/jdk15annotated/scoped2/META-INF/jboss-aop.xml (from rev 77360, trunk/testsuite/src/resources/aop/jdk15annotated/scoped2/META-INF/jboss-aop.xml)
===================================================================
--- trunk/testsuite/src/resources/aop/jdk15annotated/scoped2/META-INF/jboss-aop.xml (rev 0)
+++ trunk/testsuite/src/resources/aop/jdk15annotated/scoped2/META-INF/jboss-aop.xml 2008-08-22 17:15:13 UTC (rev 77367)
@@ -0,0 +1,3 @@
+<aop>
+ <loader-repository>aop.loading:loader=scopedannotated2</loader-repository>
+</aop>
More information about the jboss-cvs-commits
mailing list