Author: alessio.soldano(a)jboss.com
Date: 2008-03-13 20:44:03 -0400 (Thu, 13 Mar 2008)
New Revision: 5972
Modified:
framework/trunk/src/test/ant-import/build-testsuite.xml
Log:
[JBWS-1888] define some new path id
Modified: framework/trunk/src/test/ant-import/build-testsuite.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-testsuite.xml 2008-03-14 00:36:19 UTC (rev
5971)
+++ framework/trunk/src/test/ant-import/build-testsuite.xml 2008-03-14 00:44:03 UTC (rev
5972)
@@ -110,13 +110,22 @@
</tstamp>
</target>
- <target name="tests-classpath"
depends="tests-classpath-jboss50,tests-classpath-jboss42"/>
+ <target name="tests-classpath"
depends="tests-classpath-jboss50,tests-classpath-jboss42">
+ <path id="tests.javac.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <path refid="integration.target.javac.classpath"/>
+ </path>
+ <path id="tests.client.classpath">
+ <path refid="ws.stack.classpath"/>
+ <path refid="tests.extra.classpath"/>
+ <path refid="integration.target.client.classpath"/>
+ </path>
+ </target>
<target name="tests-classpath-jboss42" depends="tests-prepare"
if="jbossws.integration.jboss42">
- <path id="tests.javac.classpath">
- <path refid="ws.stack.classpath"/>
- <path refid="tests.extra.classpath"/>
+ <path id="integration.target.javac.classpath">
<pathelement location="${jboss.client}/activation.jar"/>
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
@@ -143,9 +152,7 @@
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"/>
+ <path id="integration.target.client.classpath">
<pathelement location="${jboss.client}/activation.jar"/>
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
@@ -179,9 +186,7 @@
<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"/>
+ <path id="integration.target.javac.classpath">
<pathelement location="${jboss.client}/activation.jar"/>
<pathelement location="${jboss.client}/jaxws-tools.jar"/>
<pathelement location="${jboss.client}/jboss-wsit-tools.jar"/>
@@ -208,9 +213,7 @@
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"/>
+ <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"/>
@@ -516,7 +519,7 @@
<taskdef name="eclipseClasspathGenerator"
classname="org.jboss.ws.tools.ant.EclipseClasspathTask"
classpathref="ws.stack.classpath"/>
<taskdef name="eclipseProjectGenerator"
classname="org.jboss.ws.tools.ant.EclipseProjectTask"
classpathref="ws.stack.classpath"/>
<taskdef name="eclipseJUnitTestGenerator"
classname="org.jboss.ws.tools.ant.EclipseJUnitTestsTask"
classpathref="ws.stack.classpath"/>
- <eclipseClasspathGenerator pathId="tests.eclipse.classpath"
excludesFile="${excludesfile}" />
+ <eclipseClasspathGenerator pathId="tests.eclipse.classpath"
excludesFile="${excludesfile}" srcPath="tests/java" />
<eclipseProjectGenerator projectName="JBossWS Testsuite" />
<eclipseJUnitTestGenerator projectName="JBossWS Testsuite"
projectWorkingDir="${tests.output.dir}"