[jbossws-commits] JBossWS SVN: r11238 - in framework/trunk/testsuite/test: resources/jaxws/smoke/tools/wsrunclient and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-12-09 15:46:03 -0500 (Wed, 09 Dec 2009)
New Revision: 11238

Modified:
   framework/trunk/testsuite/test/ant-import/build-testsuite.xml
   framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt
Log:
[JBWS-2848] fixing framework

Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-testsuite.xml	2009-12-09 20:41:08 UTC (rev 11237)
+++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml	2009-12-09 20:46:03 UTC (rev 11238)
@@ -24,12 +24,12 @@
     <condition property="jboss.home" value="${jboss510.home}">
       <equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
     </condition>
-    <condition property="jboss.home" value="${jboss520.home}">
-      <equals arg1="${jbossws.integration.target}" arg2="jboss520"/>
-    </condition>
     <condition property="jboss.home" value="${jboss600.home}">
       <equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
     </condition>
+    <condition property="jboss.home" value="${jboss601.home}">
+      <equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
+    </condition>
     
     <!-- Verify required properties that must be set before this file is imported -->
     <fail message="Tests output dir not set." unless="tests.output.dir"/>
@@ -111,7 +111,7 @@
     </tstamp>
   </target>
   
-  <target name="tests-classpath" depends="tests-classpath-jboss60,tests-classpath-jboss52,tests-classpath-jboss51,tests-classpath-jboss50">
+  <target name="tests-classpath" depends="tests-classpath-jboss60,tests-classpath-jboss51,tests-classpath-jboss50">
     <path id="tests.javac.classpath">
       <path refid="ws.stack.classpath"/>
       <path refid="integration.target.javac.classpath"/>
@@ -278,84 +278,6 @@
     </path>
   </target>
 
-  <target name="tests-classpath-jboss52" depends="tests-prepare" if="jbossws.integration.jboss52">
-    
-    <path id="integration.target.javac.classpath">
-      <pathelement location="${jboss.client}/activation.jar"/>
-      <pathelement location="${jboss.client}/jaxws-tools.jar"/>
-      <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
-      <pathelement location="${jboss.client}/jboss-appclient.jar"/>
-      <pathelement location="${jboss.client}/jboss-common-core.jar"/>
-      <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
-      <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
-      <pathelement location="${jboss.client}/jboss-logging-spi.jar"/>
-      <pathelement location="${jboss.client}/jboss-metadata.jar"/>
-      <pathelement location="${jboss.client}/jboss-remoting.jar"/>
-      <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
-      <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
-      <pathelement location="${jboss.client}/jbossxb.jar"/>
-      <pathelement location="${jboss.client}/mail.jar"/>
-      <pathelement location="${jboss.client}/stax-api.jar"/>
-      <pathelement location="${jboss.client}/wsdl4j.jar"/>
-      <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/>
-      <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
-      <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
-    </path>
-    
-    <!-- 
-    The 's.client.classpath' contains jars that are available in the target container's client directory.
-    There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
-    
-    The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
-    The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
-    -->
-    <path id="integration.target.client.classpath">
-      <pathelement location="${jboss.client}/activation.jar"/>
-      <pathelement location="${jboss.client}/javassist.jar"/>
-      <pathelement location="${jboss.client}/jaxb-api.jar"/>
-      <pathelement location="${jboss.client}/jaxb-impl.jar"/>
-      <pathelement location="${jboss.client}/jaxb-xjc.jar"/>
-      <pathelement location="${jboss.client}/jaxws-tools.jar"/>
-      <pathelement location="${jboss.client}/jboss-appclient.jar"/>
-      <pathelement location="${jboss.client}/jboss-container-metadata.jar"/>
-      <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/>
-      <pathelement location="${jboss.client}/jboss-metadata.jar"/>
-      <pathelement location="${jboss.client}/jboss-remoting.jar"/>
-      <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
-      <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
-      <pathelement location="${jboss.client}/jbossxb.jar"/>
-      <pathelement location="${jboss.client}/jbossall-client.jar"/>
-      <pathelement location="${jboss.client}/jaxws-tools.jar"/>
-      <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
-      <pathelement location="${jboss.client}/log4j.jar"/>
-      <pathelement location="${jboss.client}/mail.jar"/>
-      <pathelement location="${jboss.client}/stax-api.jar"/>
-      <pathelement location="${jboss.client}/trove.jar"/>
-      <pathelement location="${jboss.client}/jboss-javaee.jar"/>
-      <!-- FIXME jars should be available in the client dir -->
-      <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/>
-      <pathelement location="${jboss.lib}/jboss-classloader.jar"/>
-      <pathelement location="${jboss.lib}/jboss-classloading.jar"/>
-      <pathelement location="${jboss.lib}/jboss-classloading-vfs.jar"/>
-      <pathelement location="${jboss.lib}/jboss-container.jar"/>
-      <pathelement location="${jboss.lib}/jboss-dependency.jar"/>
-      <pathelement location="${jboss.lib}/jboss-vfs.jar"/>
-      <pathelement location="${jboss.lib}/jboss-kernel.jar"/>
-      <pathelement location="${jboss.lib}/jboss-reflect.jar"/>
-      <pathelement location="${jboss.server.lib}/jboss.jar"/>
-      <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
-      <pathelement location="${jboss.server.lib}/hibernate3.jar"/>
-      <pathelement location="${jboss.server.lib}/jnpserver.jar"/>
-      <pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/>
-      <pathelement location="${jboss.server.lib}/hibernate-core.jar"/>
-      <pathelement location="${jboss.server.lib}/servlet-api.jar"/>
-      <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
-      <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
-      <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
-      <pathelement location="${tools.jar}"/>
-    </path>
-  </target>
-
   <target name="tests-classpath-jboss60" depends="tests-prepare" if="jbossws.integration.jboss60">
     
     <path id="integration.target.javac.classpath">

Modified: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt	2009-12-09 20:41:08 UTC (rev 11237)
+++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt	2009-12-09 20:46:03 UTC (rev 11238)
@@ -2,6 +2,7 @@
 jbossws-jboss500.jar
 jbossws-jboss501.jar
 jbossws-jboss510.jar
-jbossws-jboss520.jar
 jbossws-jboss60.jar
 jbossws-jboss600.jar
+jbossws-jboss601.jar
+jbossws-jboss610.jar
\ No newline at end of file