Author: thomas.diesler(a)jboss.com Date: 2007-07-16 08:11:33 -0400 (Mon, 16 Jul 2007) New Revision: 3889 Modified: trunk/build/ant-import/build-testsuite.xml Log: More work on as42/40 test classpath Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-07-16 11:54:17 UTC (rev 3888) +++ trunk/build/ant-import/build-testsuite.xml 2007-07-16 12:11:33 UTC (rev 3889) @@ -172,9 +172,16 @@ <pathelement location="${jboss.server.lib}/servlet-api.jar"/> </path> - <!-- This classpath MUST NOT contain any local jars from thirdparty --> + <!-- + 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 for + --> <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}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jaxb-impl.jar"/> @@ -191,7 +198,6 @@ <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/mail.jar"/> <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/wsdl4j.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"/> @@ -219,9 +225,16 @@ <pathelement location="${jboss.server.lib}/javax.servlet.jar"/> </path> - <!-- This classpath MUST NOT contain any local jars from thirdparty --> + <!-- + 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 for + --> <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"/> @@ -235,7 +248,6 @@ <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/mail.jar"/> <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/wsdl4j.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"/>