[jboss-cvs] JBossAS SVN: r77361 - 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 10:32:25 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-08-22 10:32:19 -0400 (Fri, 22 Aug 2008)
New Revision: 77361
Removed:
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:
[JBAS-5879] Upgrade aop to 2.0.0.CR16 - org.jboss.test.naming.test.SimpleUnitTestCase fails in the smoke tests, but it failed before this upgrade
Modified: trunk/testsuite/imports/sections/aop.xml
===================================================================
--- trunk/testsuite/imports/sections/aop.xml 2008-08-22 14:17:51 UTC (rev 77360)
+++ trunk/testsuite/imports/sections/aop.xml 2008-08-22 14:32:19 UTC (rev 77361)
@@ -264,9 +264,6 @@
<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}">
@@ -290,9 +287,6 @@
<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}">
@@ -324,9 +318,6 @@
<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}">
@@ -658,49 +649,46 @@
</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 14:17:51 UTC (rev 77360)
+++ trunk/testsuite/src/main/org/jboss/test/aop/jdk15annotated/ScopedAnnotatedTester.java 2008-08-22 14:32:19 UTC (rev 77361)
@@ -37,9 +37,12 @@
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 14:17:51 UTC (rev 77360)
+++ trunk/testsuite/src/main/org/jboss/test/aop/test/AOPTestSetup.java 2008-08-22 14:32:19 UTC (rev 77361)
@@ -46,6 +46,11 @@
this.jar = jar;
}
+ public AOPTestSetup(TestSuite suite) throws Exception
+ {
+ super(suite);
+ }
+
protected void setUp() throws Exception
{
super.setUp();
@@ -54,7 +59,10 @@
getServer().setAttribute(aspectManager, enableTransformer);
try
{
- redeploy(jar);
+ if (jar != null)
+ {
+ redeploy(jar);
+ }
}
catch(Exception e)
{
@@ -76,7 +84,10 @@
Exception undeployException = null;
try
{
- undeploy(jar);
+ if (jar != null)
+ {
+ undeploy(jar);
+ }
}
catch(Exception e)
{
Deleted: trunk/testsuite/src/resources/aop/jdk15annotated/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/jdk15annotated/META-INF/jboss-aop.xml 2008-08-22 14:17:51 UTC (rev 77360)
+++ trunk/testsuite/src/resources/aop/jdk15annotated/META-INF/jboss-aop.xml 2008-08-22 14:32:19 UTC (rev 77361)
@@ -1,2 +0,0 @@
-<aop>
-</aop>
Deleted: trunk/testsuite/src/resources/aop/jdk15annotated/scoped2/META-INF/jboss-aop.xml
===================================================================
--- trunk/testsuite/src/resources/aop/jdk15annotated/scoped2/META-INF/jboss-aop.xml 2008-08-22 14:17:51 UTC (rev 77360)
+++ trunk/testsuite/src/resources/aop/jdk15annotated/scoped2/META-INF/jboss-aop.xml 2008-08-22 14:32:19 UTC (rev 77361)
@@ -1,3 +0,0 @@
-<aop>
- <loader-repository>aop.loading:loader=scopedannotated2</loader-repository>
-</aop>
More information about the jboss-cvs-commits
mailing list