Author: richard.opalka(a)jboss.com Date: 2009-05-28 03:29:35 -0400 (Thu, 28 May 2009) New Revision: 10128 Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt Log: adding AS 5.2.x support Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2009-05-27 15:38:31 UTC (rev 10127) +++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2009-05-28 07:29:35 UTC (rev 10128) @@ -24,6 +24,9 @@ <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> @@ -108,7 +111,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss60,tests-classpath-jboss51,tests-classpath-jboss50"> + <target name="tests-classpath" depends="tests-classpath-jboss60,tests-classpath-jboss52,tests-classpath-jboss51,tests-classpath-jboss50"> <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/> @@ -278,6 +281,84 @@ </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}/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}/jbossall-client.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss520.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"/> + <!-- 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.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}"/> + <!-- WS-RM backports server dependencies --> + <pathelement location="${jboss.server.deploy}/jbossweb.sar/jbossweb.jar"/> + <pathelement location="${jboss.server.deployers}/jbossweb.deployer/jbossweb.jar"/> + </path> + </target> + <target name="tests-classpath-jboss60" depends="tests-prepare" if="jbossws.integration.jboss60"> <path id="integration.target.javac.classpath"> @@ -323,7 +404,7 @@ <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss510.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss600.jar"/> <pathelement location="${jboss.client}/jaxws-tools.jar"/> <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> Modified: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt 2009-05-27 15:38:31 UTC (rev 10127) +++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsrunclient/jars.txt 2009-05-28 07:29:35 UTC (rev 10128) @@ -1,7 +1,7 @@ -jbossws-jboss423.jar jbossws-jboss50.jar jbossws-jboss500.jar jbossws-jboss501.jar jbossws-jboss510.jar +jbossws-jboss520.jar jbossws-jboss60.jar jbossws-jboss600.jar