[jbossws-commits] JBossWS SVN: r5696 - framework/trunk/src/test/ant-import.

Author: thomas.diesler(a)jboss.com Date: 2008-02-15 06:27:43 -0500 (Fri, 15 Feb 2008) New Revision: 5696 Modified: framework/trunk/src/test/ant-import/build-testsuite.xml Log: Remove tests-classpath40 Modified: framework/trunk/src/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/src/test/ant-import/build-testsuite.xml 2008-02-15 11:22:42 UTC (rev 5695) +++ framework/trunk/src/test/ant-import/build-testsuite.xml 2008-02-15 11:27:43 UTC (rev 5696) @@ -110,78 +110,8 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42,tests-classpath-jboss40,tests-classpath-jboss40-no-ejb3"/> + <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42"/> - <target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50"> - - <path id="tests.javac.classpath"> - <path refid="ws.stack.classpath"/> - <path refid="tests.extra.classpath"/> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-ejb3.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-xml-binding.jar"/> - <pathelement location="${jboss.client}/mail.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 'tests.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 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. - --> - <path id="tests.client.classpath"> - <path refid="ws.stack.classpath"/> - <path refid="tests.extra.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-wsit-tools.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-xml-binding.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss50.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-container.jar"/> - <pathelement location="${jboss.lib}/jboss-vfs.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.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.deployers}/jbossweb.deployer/jbossweb.jar"/> - </path> - </target> - <target name="tests-classpath-jboss42" depends="tests-prepare" if="jbossws.integration.jboss42"> <path id="tests.javac.classpath"> @@ -247,115 +177,73 @@ </path> </target> - <target name="tests-classpath-jboss40" depends="tests-prepare" if="jbossws.integration.jboss40"> + <target name="tests-classpath-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50"> + <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/> <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> <pathelement location="${jboss.client}/jaxws-tools.jar"/> <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.client}/jboss-common-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3x.jar"/> + <pathelement location="${jboss.client}/jboss-common-core.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-j2ee.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-xml-binding.jar"/> <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/jbosssx-client.jar"/> - <pathelement location="${jboss.server.lib}/javax.servlet.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 'tests.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 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. + The 'tests.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 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. --> <path id="tests.client.classpath"> <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/> - <pathelement location="${jboss.client}/commons-logging.jar"/> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-xjc.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> - <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3x.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-saaj.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss40.jar"/> - <pathelement location="${jboss.client}/jboss-remoting.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <!-- FIXME jars should be available in the client dir --> - <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-tomcat55.sar/tomcat-coyote.jar"/> - <pathelement location="${jboss.server.deploy}/jbossweb-tomcat55.sar/tomcat-http.jar"/> - <pathelement location="${jboss.server.deploy}/jbossweb-tomcat55.sar/tomcat-util.jar"/> - </path> - </target> - - <target name="tests-classpath-jboss40-no-ejb3" depends="tests-prepare" if="jbossws.integration.jboss405.no.ejb3"> - <path id="tests.javac.classpath"> - <path refid="ws.stack.classpath"/> - <path refid="tests.extra.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-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-common-client.jar"/> - <pathelement location="${jboss.client}/jboss-j2ee.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-xml-binding.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/jbosssx-client.jar"/> - <pathelement location="${jboss.server.lib}/javax.servlet.jar"/> - </path> - - <!-- - The 'tests.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 'tests.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. - --> - <path id="tests.client.classpath"> - <path refid="ws.stack.classpath"/> - <path refid="tests.extra.classpath"/> - <pathelement location="${jboss.client}/commons-logging.jar"/> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-xjc.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss50.jar"/> <pathelement location="${jboss.client}/jaxws-tools.jar"/> <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> - <pathelement location="${jboss.client}/jboss-saaj.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss40.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/mail.jar"/> <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.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-container.jar"/> + <pathelement location="${jboss.lib}/jboss-vfs.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.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.deployers}/jbossweb.deployer/jbossweb.jar"/> </path> </target>