[jboss-cvs] JBossAS SVN: r108130 - in trunk/testsuite: src/main/org/jboss/test/jca/test and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: smcgowan at redhat.com
Date: 2010-09-13 22:31:32 -0400 (Mon, 13 Sep 2010)
New Revision: 108130

Modified:
   trunk/testsuite/imports/sections/jca.xml
   trunk/testsuite/src/main/org/jboss/test/jca/test/ScopedRARNoJBossAppUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/jca/test/ScopedRARUnitTestCase.java
Log:
JBAS-8236 - more testsuite fixes

Modified: trunk/testsuite/imports/sections/jca.xml
===================================================================
--- trunk/testsuite/imports/sections/jca.xml	2010-09-14 00:39:06 UTC (rev 108129)
+++ trunk/testsuite/imports/sections/jca.xml	2010-09-14 02:31:32 UTC (rev 108130)
@@ -284,7 +284,7 @@
             <include name="*.xml"/>
          </metainf>      
       </jar>   
-      <jar destfile="${build.lib}/testscopedrar.jar">
+      <jar destfile="${build.lib}/testscopedrar1.jar">
          
          <fileset dir="${build.classes}">
             <include name="org/jboss/test/jca/mbean/Scoped*"/>
@@ -304,7 +304,7 @@
             <include name="*.xml"/>
          </metainf>      
       </jar>   
-      <jar destfile="${build.lib}/testscopedrar-nojbossapp.jar">
+      <jar destfile="${build.lib}/testscopedrar-nojbossapp1.jar">
          
          <fileset dir="${build.classes}">
             <include name="org/jboss/test/jca/mbean/Scoped*"/>

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/ScopedRARNoJBossAppUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/ScopedRARNoJBossAppUnitTestCase.java	2010-09-14 00:39:06 UTC (rev 108129)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/ScopedRARNoJBossAppUnitTestCase.java	2010-09-14 02:31:32 UTC (rev 108130)
@@ -46,7 +46,7 @@
       deploy("testscopedrar-nojbossapp.ear");
       try
       {
-         deploy("testscopedrar-nojbossapp.jar");
+         deploy("testscopedrar-nojbossapp1.jar");
          try
          {
             ObjectName name = new ObjectName("jboss.test:test=Scoped");
@@ -55,7 +55,7 @@
          }
          finally
          {
-            undeploy("testscopedrar-nojbossapp.jar");
+            undeploy("testscopedrar-nojbossapp1.jar");
          }
       }
       finally

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/ScopedRARUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/ScopedRARUnitTestCase.java	2010-09-14 00:39:06 UTC (rev 108129)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/ScopedRARUnitTestCase.java	2010-09-14 02:31:32 UTC (rev 108130)
@@ -45,7 +45,7 @@
       deploy("testscopedrar.ear");
       try
       {
-         deploy("testscopedrar.jar");
+         deploy("testscopedrar1.jar");
          try
          {
             ObjectName name = new ObjectName("jboss.test:test=Scoped");
@@ -54,7 +54,7 @@
          }
          finally
          {
-            undeploy("testscopedrar.jar");
+            undeploy("testscopedrar1.jar");
          }
       }
       finally