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

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

Author: wolfc
Date: 2010-08-31 09:28:03 -0400 (Tue, 31 Aug 2010)
New Revision: 107915

Modified:
   trunk/testsuite/imports/sections/classloader.xml
   trunk/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java
Log:
JBAS-7556: make sure each standalone deployment has an unique name

Modified: trunk/testsuite/imports/sections/classloader.xml
===================================================================
--- trunk/testsuite/imports/sections/classloader.xml	2010-08-31 13:09:27 UTC (rev 107914)
+++ trunk/testsuite/imports/sections/classloader.xml	2010-08-31 13:28:03 UTC (rev 107915)
@@ -263,7 +263,7 @@
       </jar>
       
       <!-- Build the shared-jndi.war/sar -->
-      <jar destfile="${build.lib}/shared-jndi.sar">
+      <jar destfile="${build.lib}/shared-jndi1.sar">
          <metainf dir="${build.resources}/classloader/scoping/naming/xml">
             <include name="jboss-service.xml"/>
          </metainf>
@@ -272,7 +272,7 @@
                name="org/jboss/test/classloader/scoping/naming/service/*"/>
          </fileset>
       </jar>
-      <war destfile="${build.lib}/shared-jndi.war"
+      <war destfile="${build.lib}/shared-jndi2.war"
          webxml="${build.resources}/classloader/scoping/naming/xml/web.xml">
          <webinf dir="${build.resources}/classloader/scoping/naming/xml">
             <include name="jboss-web.xml"/>

Modified: trunk/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java	2010-08-31 13:09:27 UTC (rev 107914)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/test/ScopingUnitTestCase.java	2010-08-31 13:28:03 UTC (rev 107915)
@@ -21,24 +21,24 @@
  */
 package org.jboss.test.classloader.test;
 
-import java.net.URL;
-import java.io.InputStream;
-import java.io.IOException;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpMethodBase;
+import org.jboss.mx.loading.ClassLoaderUtils;
+import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
+import org.jboss.mx.loading.RepositoryClassLoader;
+import org.jboss.mx.loading.UnifiedLoaderRepository3;
+import org.jboss.system.ServiceMBean;
 import org.jboss.test.JBossTestCase;
 import org.jboss.test.classloader.scoping.override.ejb.log4j113.StatelessSession;
 import org.jboss.test.classloader.scoping.override.ejb.log4j113.StatelessSessionHome;
 import org.jboss.test.util.web.HttpUtils;
-import org.jboss.system.ServiceMBean;
-import org.jboss.mx.loading.HeirarchicalLoaderRepository3;
-import org.jboss.mx.loading.RepositoryClassLoader;
-import org.jboss.mx.loading.UnifiedLoaderRepository3;
-import org.jboss.mx.loading.ClassLoaderUtils;
 
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
 /** Unit tests for class and resource scoping
  *
  * @author Scott.Stark at jboss.org
@@ -330,9 +330,9 @@
       getLog().debug("+++ testSharedJNDI");
       try
       {
-         deploy("shared-jndi.sar");
-         deploy("shared-jndi.war");
-         URL servletURL = new URL("http://" + getServerHost() + ":8080/shared-jndi/LookupServlet");
+         deploy("shared-jndi1.sar");
+         deploy("shared-jndi2.war");
+         URL servletURL = new URL("http://" + getServerHost() + ":8080/shared-jndi2/LookupServlet");
          InputStream reply = (InputStream) servletURL.getContent();
          getLog().debug("Accessed: "+servletURL);
          logReply(reply);
@@ -344,8 +344,8 @@
       }
       finally
       {
-         undeploy("shared-jndi.war");
-         undeploy("shared-jndi.sar");
+         undeploy("shared-jndi2.war");
+         undeploy("shared-jndi1.sar");
       }
    }