JBossWS SVN: r1436 - tags
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-15 10:42:01 -0500 (Wed, 15 Nov 2006)
New Revision: 1436
Removed:
tags/jbossws-1.0.4.GA/
Log:
jbossws-1.0.4.GA -r1435
17 years, 7 months
- 1
- 0
JBossWS SVN: r1435 - in branches/jbossws-1.0: . src/ant src/main/resources/samples src/main/resources/samples/common src/main/resources/samples/jaxrpc/secureejb src/main/resources/samples/jaxrpc/wsbpel src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-15 10:39:59 -0500 (Wed, 15 Nov 2006)
New Revision: 1435
Added:
branches/jbossws-1.0/src/ant/build-release.xml
branches/jbossws-1.0/src/main/resources/samples/common/build-thirdparty.xml
branches/jbossws-1.0/src/main/resources/samples/version.properties
Modified:
branches/jbossws-1.0/ant.properties.example
branches/jbossws-1.0/build.xml
branches/jbossws-1.0/src/ant/build-samples.xml
branches/jbossws-1.0/src/ant/build-thirdparty.xml
branches/jbossws-1.0/src/main/resources/samples/ant.properties.example
branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
branches/jbossws-1.0/version.properties
Log:
Automate release steps
Samples use thirdparty get
Modified: branches/jbossws-1.0/ant.properties.example
===================================================================
--- branches/jbossws-1.0/ant.properties.example 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/ant.properties.example 2006-11-15 15:39:59 UTC (rev 1435)
@@ -13,18 +13,22 @@
jboss.server.instance=default
# Tomcat Home
-#tomcat.home=/usr/java/tomcat
-#tomcat.manager.username=manager
-#tomcat.manager.password=manager
+tomcat.home=/usr/java/tomcat
+tomcat.manager.username=manager
+tomcat.manager.password=manager
# The target server the test endpoints are deployed to
# This can be [jboss|tomcat]
jbossws.target.server=jboss
# JBoss Repository
-jboss.local.repository=/home/tdiesler/cvs/jboss.local.repository
+#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
jboss.repository=http://repository.jboss.com
+# JBossWS Release
+jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
+jboss.local.repository=/home/tdiesler/cvs/jboss.local.repository
+
# Force thirdparty HTTP get
#force.thirdparty.get=true
Modified: branches/jbossws-1.0/build.xml
===================================================================
--- branches/jbossws-1.0/build.xml 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/build.xml 2006-11-15 15:39:59 UTC (rev 1435)
@@ -15,6 +15,7 @@
<import file="${basedir}/src/ant/build-thirdparty.xml"/>
<import file="${basedir}/src/ant/build-samples.xml"/>
+ <import file="${basedir}/src/ant/build-release.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
@@ -64,14 +65,16 @@
<target name="prepare">
- <echo message="jboss.home = ${jboss.home}"/>
+ <echo message="jboss.jdk15.home = ${jboss.jdk15.home}"/>
+ <echo message="jboss.jdk14.home = ${jboss.jdk14.home}"/>
<echo message="tomcat.home = ${tomcat.home}"/>
<echo/>
- <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/>
+ <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
<available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/>
- <available property="jboss.available" file="${jboss.client}/jboss-client.jar"/>
+ <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/>
<available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/>
+ <available property="jboss.available" file="${jboss.client}/jboss-client.jar"/>
<checksum file="version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
<checksum file="version.properties" fileext=".md5"/>
@@ -578,144 +581,6 @@
<delete dir="${build.lib.dir}/build"/>
</target>
- <!-- ================================================================== -->
- <!-- Release -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws to the server specified like this: -Dserver=default -->
- <target name="release" depends="all" description="Release to jboss.local.repository">
-
- <!-- jbossws -->
- <property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/>
- <mkdir dir="${jbossws.dir}/lib"/>
- <copy todir="${jbossws.dir}/lib" overwrite="true">
- <fileset dir="${build.lib.dir}">
- <include name="jbossws.sar"/>
- <include name="jbossws-client.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- <copy tofile="${jbossws.dir}/component-info.xml" file="${src.etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true">
- <filterset>
- <filtersfile file="version.properties"/>
- </filterset>
- </copy>
-
- <!-- jbossws14 -->
- <property name="jbossws14.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/>
- <mkdir dir="${jbossws14.dir}/lib"/>
- <copy todir="${jbossws14.dir}/lib" overwrite="true">
- <fileset dir="${build.lib.dir}">
- <include name="jbossws14.sar"/>
- <include name="jbossws14-client.jar"/>
- <include name="jboss-jaxws14.jar"/>
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- <copy tofile="${jbossws14.dir}/component-info.xml" file="${src.etc.dir}/jbossws14-component-info.xml" filtering="true" overwrite="true">
- <filterset>
- <filtersfile file="version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Misc. -->
- <!-- ================================================================== -->
-
- <!-- Build the bin dist -->
- <target name="build-bin-dist" description="Build the binary distribution"
- depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs">
-
- <mkdir dir="${build.bin.dist}"/>
- <mkdir dir="${build.bin.dist}/bin"/>
- <mkdir dir="${build.bin.dist}/samples"/>
- <mkdir dir="${build.bin.dist}/docs/html"/>
- <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.5"/>
- <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.4"/>
- <mkdir dir="${build.bin.dist}/lib/tomcat/common/endorsed"/>
- <mkdir dir="${build.bin.dist}/lib/tomcat/common/lib"/>
- <mkdir dir="${build.bin.dist}/lib/tomcat/webapps"/>
-
- <copy todir="${build.bin.dist}" file="${src.etc.dir}/JBossORG-EULA.txt" overwrite="true"/>
- <copy todir="${build.bin.dist}" filtering="true" overwrite="true">
- <fileset dir="${src.dist.dir}"/>
- <filterset>
- <filtersfile file="version.properties"/>
- </filterset>
- </copy>
- <copy todir="${build.bin.dist}/bin">
- <fileset dir="${src.etc.dir}">
- <include name="wstools.bat"/>
- <include name="wstools.sh"/>
- </fileset>
- </copy>
-
- <!-- samples -->
- <copy todir="${build.bin.dist}" file="${build.dir}/${samples.target}.zip" overwrite="true"/>
-
- <!-- documentation -->
- <copy todir="${build.bin.dist}/docs/html" overwrite="true">
- <fileset dir="${docs.userguide.dir}/build/en/html"/>
- </copy>
- <copy todir="${build.bin.dist}/docs" overwrite="true">
- <fileset dir="${docs.userguide.dir}/build/en/pdf"/>
- </copy>
-
- <!-- lib/jdk1.5 -->
- <copy todir="${build.bin.dist}/lib/jboss-jdk1.5" overwrite="true">
- <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/>
- </copy>
-
- <!-- lib/jdk1.4 -->
- <copy todir="${build.bin.dist}/lib/jboss-jdk1.4" overwrite="true">
- <fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/>
- </copy>
-
- <!-- lib/tomcat -->
- <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="serializer.jar"/>
- <include name="xalan.jar"/>
- <include name="xercesImpl.jar"/>
- </fileset>
- </copy>
- <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="activation.jar"/>
- <include name="log4j.jar"/>
- <include name="mailapi.jar"/>
- </fileset>
- <fileset dir="${build.lib.dir}">
- <include name="jbossws-core.jar"/>
- <include name="jbossws-tomcat-integration.jar"/>
- <include name="jbossws-thirdparty.jar"/>
- </fileset>
- </copy>
- <copy todir="${build.bin.dist}/lib/tomcat/webapps" overwrite="true">
- <fileset dir="${build.lib.dir}" includes="jbossws.war"/>
- </copy>
-
- <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/>
- </target>
-
- <!-- Build the src dist -->
- <target name="build-src-dist" description="Build the source distribution">
- <mkdir dir="${build.src.dist}/jbossws-${version.id}-src"/>
- <copy todir="${build.src.dist}/jbossws-${version.id}-src">
- <fileset dir="${basedir}">
- <include name="ant.properties.example"/>
- <include name="version.properties"/>
- <include name="build.xml"/>
- <include name="src/**"/>
- </fileset>
- </copy>
- <zip destfile="${build.dir}/jbossws-${version.id}-src.zip" basedir="${build.src.dist}"
- includes="jbossws-${version.id}/**"/>
- </target>
<target name="clean" depends="prepare" description="Cleans up most generated files.">
<delete dir="${build.dir}"/>
</target>
Added: branches/jbossws-1.0/src/ant/build-release.xml
===================================================================
--- branches/jbossws-1.0/src/ant/build-release.xml 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/src/ant/build-release.xml 2006-11-15 15:39:59 UTC (rev 1435)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="release" name="JBossWS Release">
+
+ <target name="release" depends="all,release-to-repository,release-to-portal" description="Release JBossWS">
+ <echo message="*********************************************"/>
+ <echo message="* Released: jbossws-${version.id}"/>
+ <echo message="*"/>
+ <echo message="* Almost there, please do these steps manually"/>
+ <echo message="*"/>
+ <echo message="* 1) Create SVN tag: jbossws-${version.id}"/>
+ <echo message="* 2) Update portal-content/project.xml"/>
+ <echo message="* 3) Update portal-content/counter.xml"/>
+ <echo message="* 4) Commit the portal-content"/>
+ <echo message="* 5) Write a stick post on the user forum"/>
+ <echo message="* 6) Release the jbossws-${version.id} version in JIRA"/>
+ <echo message="* 7) Post a message to jbossws-announce(a)lists.jboss.org"/>
+ <echo message="* 8) Post a message to thecore(a)jboss.org"/>
+ <echo message="*"/>
+ <echo message="*********************************************"/>
+ </target>
+
+ <!-- Release to jboss.local.repository -->
+ <target name="release-to-repository" depends="module-jars,module-jars14" description="Release to jboss.local.repository">
+
+ <!-- jbossws -->
+ <property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/>
+ <mkdir dir="${jbossws.dir}/lib"/>
+ <copy todir="${jbossws.dir}/lib" overwrite="true">
+ <fileset dir="${build.lib.dir}">
+ <include name="jbossws.sar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-jboss-integration.jar"/>
+ <include name="jbossws-tomcat-integration.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ <copy tofile="${jbossws.dir}/component-info.xml" file="${src.etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true">
+ <filterset>
+ <filtersfile file="version.properties"/>
+ </filterset>
+ </copy>
+
+ <!-- jbossws14 -->
+ <property name="jbossws14.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/>
+ <mkdir dir="${jbossws14.dir}/lib"/>
+ <copy todir="${jbossws14.dir}/lib" overwrite="true">
+ <fileset dir="${build.lib.dir}">
+ <include name="jbossws14.sar"/>
+ <include name="jbossws14-client.jar"/>
+ <include name="jbossws14-jboss-integration.jar"/>
+ <include name="jbossws14-tomcat-integration.jar"/>
+ <include name="jboss-jaxws14.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ <copy tofile="${jbossws14.dir}/component-info.xml" file="${src.etc.dir}/jbossws14-component-info.xml" filtering="true" overwrite="true">
+ <filterset>
+ <filtersfile file="version.properties"/>
+ </filterset>
+ </copy>
+
+ </target>
+
+ <!-- Release to portal content -->
+ <target name="check-portal-content" depends="prepare" unless="jbossws.portal.content.available">
+ <echo message="*********************************************"/>
+ <echo message="* Not available: ${jbossws.portal.content}"/>
+ <echo message="*********************************************"/>
+ </target>
+ <target name="release-to-portal" depends="check-portal-content" description="Release to portal-content" if="jbossws.portal.content.available">
+
+ <property name="portal.freezone" value="${jbossws.portal.content}/freezone"/>
+ <property name="portal.userguide" value="${portal.freezone}/user-guide"/>
+ <property name="portal.downloads" value="${jbossws.portal.content}/downloads"/>
+
+ <!-- Copy user guide -->
+ <copy todir="${portal.userguide}" overwrite="true">
+ <fileset dir="${docs.userguide.dir}/build">
+ <include name="en/**"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy downloads -->
+ <copy todir="${portal.downloads}" overwrite="true">
+ <fileset dir="${build.dir}">
+ <include name="jbossws-${version.id}.zip"/>
+ <include name="jbossws-src-${version.id}.zip"/>
+ <include name="jbossws-samples-${version.id}.zip"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy Release Notes -->
+ <copy tofile="${portal.downloads}/ReleaseNotes-${version.id}.txt" file="${build.bin.dist}/ReleaseNotes.txt" overwrite="true"/>
+ <copy tofile="${portal.downloads}/Install-${version.id}.txt" file="${build.bin.dist}/Install.txt" overwrite="true"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Build distributions -->
+ <!-- ================================================================== -->
+
+ <!-- Build the bin dist -->
+ <target name="build-bin-dist" description="Build the binary distribution"
+ depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs">
+
+ <mkdir dir="${build.bin.dist}"/>
+ <mkdir dir="${build.bin.dist}/bin"/>
+ <mkdir dir="${build.bin.dist}/docs/html"/>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.5"/>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.4"/>
+ <mkdir dir="${build.bin.dist}/lib/tomcat/common/endorsed"/>
+ <mkdir dir="${build.bin.dist}/lib/tomcat/common/lib"/>
+ <mkdir dir="${build.bin.dist}/lib/tomcat/webapps"/>
+
+ <copy todir="${build.bin.dist}" file="${src.etc.dir}/JBossORG-EULA.txt" overwrite="true"/>
+ <copy todir="${build.bin.dist}" filtering="true" overwrite="true">
+ <fileset dir="${src.dist.dir}"/>
+ <filterset>
+ <filtersfile file="version.properties"/>
+ </filterset>
+ </copy>
+ <copy todir="${build.bin.dist}/bin">
+ <fileset dir="${src.etc.dir}">
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </copy>
+
+ <!-- samples -->
+ <copy todir="${build.bin.dist}" file="${build.dir}/${samples.target}.zip" overwrite="true"/>
+
+ <!-- documentation -->
+ <copy todir="${build.bin.dist}/docs/html" overwrite="true">
+ <fileset dir="${docs.userguide.dir}/build/en/html"/>
+ </copy>
+ <copy todir="${build.bin.dist}/docs" overwrite="true">
+ <fileset dir="${docs.userguide.dir}/build/en/pdf"/>
+ </copy>
+
+ <!-- lib/jdk1.5 -->
+ <copy todir="${build.bin.dist}/lib/jboss-jdk1.5" overwrite="true">
+ <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/>
+ </copy>
+
+ <!-- lib/jdk1.4 -->
+ <copy todir="${build.bin.dist}/lib/jboss-jdk1.4" overwrite="true">
+ <fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/>
+ </copy>
+
+ <!-- lib/tomcat -->
+ <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="serializer.jar"/>
+ <include name="xalan.jar"/>
+ <include name="xercesImpl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="activation.jar"/>
+ <include name="log4j.jar"/>
+ <include name="mailapi.jar"/>
+ </fileset>
+ <fileset dir="${build.lib.dir}">
+ <include name="jbossws-core.jar"/>
+ <include name="jbossws-tomcat-integration.jar"/>
+ <include name="jbossws-thirdparty.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.bin.dist}/lib/tomcat/webapps" overwrite="true">
+ <fileset dir="${build.lib.dir}" includes="jbossws.war"/>
+ </copy>
+
+ <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/>
+ </target>
+
+ <!-- Build the src dist -->
+ <target name="build-src-dist" description="Build the source distribution">
+ <mkdir dir="${build.src.dist}/jbossws-src-${version.id}"/>
+ <copy todir="${build.src.dist}/jbossws-src-${version.id}">
+ <fileset dir="${basedir}">
+ <include name="ant.properties.example"/>
+ <include name="version.properties"/>
+ <include name="build.xml"/>
+ <include name="src/**"/>
+ <include name="docs/user-guide/**"/>
+ </fileset>
+ </copy>
+ <zip destfile="${build.dir}/jbossws-src-${version.id}.zip" basedir="${build.src.dist}"
+ includes="jbossws-src-${version.id}/**"/>
+ </target>
+
+</project>
Property changes on: branches/jbossws-1.0/src/ant/build-release.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.0/src/ant/build-samples.xml
===================================================================
--- branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-15 15:39:59 UTC (rev 1435)
@@ -21,29 +21,25 @@
<property name="samples.target" value="jbossws-samples-${version.id}"/>
<property name="build.src.samples.dir" value="${build.dir}/${samples.target}"/>
- <copy todir="${build.src.samples.dir}">
+ <copy todir="${build.src.samples.dir}" filtering="yes">
<fileset dir="${src.samples.dir}">
<include name="common/imported-build.xml"/>
+ <include name="common/build-thirdparty.xml"/>
<include name="ant.properties.example"/>
+ <include name="version.properties"/>
<include name="**/build.xml"/>
</fileset>
+ <filterset>
+ <filtersfile file="version.properties"/>
+ </filterset>
</copy>
- <mkdir dir="${build.src.samples.dir}/lib"/>
- <copy todir="${build.src.samples.dir}/lib">
- <fileset dir="${jboss.client}">
- <include name="commons-logging.jar"/>
- <include name="jbossall-client.jar"/>
- <include name="mail.jar"/>
- <include name="jboss-aop-jdk50-client.jar"/>
- <include name="jboss-aspect-jdk50-client.jar"/>
- <include name="jboss-ejb3-client.jar"/>
- </fileset>
- <fileset dir="${jboss.server.deploy}/ejb3.deployer">
- <include name="jboss-annotations-ejb3.jar"/>
- <include name="jboss-ejb3x.jar"/>
- </fileset>
+ <!--
+ <copy todir="${build.src.samples.dir}/thirdparty" overwrite="true">
<fileset dir="${build.lib.dir}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
<include name="jbossws-jboss-integration.jar"/>
<include name="jbossws-tomcat-integration.jar"/>
@@ -51,19 +47,9 @@
<include name="jbossws14-jboss-integration.jar"/>
<include name="jbossws14-tomcat-integration.jar"/>
</fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="activation.jar"/>
- <include name="commons-collections.jar"/>
- <include name="dom4j.jar"/>
- <include name="javassist.jar"/>
- <include name="jbossretro-rt.jar"/>
- <include name="jboss-backport-concurrent.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="log4j.jar"/>
- <include name="servlet-api.jar"/>
- </fileset>
</copy>
-
+ -->
+
<!-- samples/common -->
<mkdir dir="${build.src.samples.dir}/common/java"/>
<mkdir dir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples"/>
@@ -275,7 +261,6 @@
<copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/resources">
<fileset dir="${test.resources.dir}/jaxrpc/samples/wsbpel" />
</copy>
- <copy todir="${build.src.samples.dir}/lib" file="${thirdparty.dir}/jbpm-bpel.sar" />
<!-- samples/wseventing -->
<mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/java"/>
@@ -349,7 +334,11 @@
<!-- Build the samples zip -->
<zip destfile="${build.dir}/${samples.target}.zip">
- <fileset dir="${build.dir}" includes="${samples.target}/**"/>
+ <fileset dir="${build.dir}">
+ <include name="${samples.target}/**"/>
+ <exclude name="${samples.target}/output/**"/>
+ <exclude name="${samples.target}/thirdparty/**"/>
+ </fileset>
</zip>
</target>
Modified: branches/jbossws-1.0/src/ant/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.0/src/ant/build-thirdparty.xml 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/src/ant/build-thirdparty.xml 2006-11-15 15:39:59 UTC (rev 1435)
@@ -27,13 +27,13 @@
<get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbossas/core-libs/${jbossas}/lib/jboss.jar" dest="${thirdparty.dir}/jboss.jar" usetimestamp="true" verbose="true"/>
Modified: branches/jbossws-1.0/src/main/resources/samples/ant.properties.example
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-11-15 15:39:59 UTC (rev 1435)
@@ -1,14 +1,14 @@
# JBossWS samples build properties
#
-# JBoss Home
+# The Required JBoss Home
#jboss.jdk15.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
#jboss.jdk14.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA
# The JBoss server instance
jboss.server.instance=default
-# Tomcat Home
+# The Optional Tomcat Home
#tomcat.home=/usr/java/tomcat
#tomcat.manager.username=manager
#tomcat.manager.password=manager
@@ -16,3 +16,10 @@
# The target server the test endpoints are deployed to
# This can be [jboss|tomcat]
jbossws.target.server=jboss
+
+# Force thirdparty HTTP get
+#force.thirdparty.get=true
+
+# JBoss Repository
+#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository
+jboss.repository=http://repository.jboss.com
Added: branches/jbossws-1.0/src/main/resources/samples/common/build-thirdparty.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/common/build-thirdparty.xml 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/src/main/resources/samples/common/build-thirdparty.xml 2006-11-15 15:39:59 UTC (rev 1435)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id:build-thirdparty.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ -->
+
+<project name="JBossWS-Thirdparty">
+
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
+
+ <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath">
+ </target>
+
+ <target name="thirdparty-get" depends="init" if="force.thirdparty.get"
+ description="Gets the thirdparty libraries">
+
+ <mkdir dir="${thirdparty.dir}"/>
+ <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jboss-jaxws.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jboss-saaj.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-client.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-jboss-integration.jar" dest="${thirdparty.dir}/jbossws-jboss-integration.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-tomcat-integration.jar" dest="${thirdparty.dir}/jbossws-tomcat-integration.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws14/${jboss-jbossws}/lib/jboss-jaxws14.jar" dest="${thirdparty.dir}/jboss-jaxws14.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws14/${jboss-jbossws}/lib/jbossws14-client.jar" dest="${thirdparty.dir}/jbossws14-client.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws14/${jboss-jbossws}/lib/jbossws14-jboss-integration.jar" dest="${thirdparty.dir}/jbossws14-jboss-integration.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws14/${jboss-jbossws}/lib/jbossws14-tomcat-integration.jar" dest="${thirdparty.dir}/jbossws14-tomcat-integration.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jbossas/core-libs/${jbossas}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
+ <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mailapi.jar" dest="${thirdparty.dir}/mailapi.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
+ </target>
+
+ <target name="thirdparty-classpath">
+
+ <!-- jbossws vs. jbossws14 -->
+ <condition property="jbossws.version" value="jbossws14">
+ <not>
+ <isset property="HAVE_JDK_1.5"/>
+ </not>
+ </condition>
+ <property name="jbossws.version" value="jbossws"/>
+
+ <!-- jboss-jaxws vs. jboss-jaxws14 -->
+ <condition property="jaxws.version" value="jboss-jaxws14">
+ <not>
+ <isset property="HAVE_JDK_1.5"/>
+ </not>
+ </condition>
+ <property name="jaxws.version" value="jboss-jaxws"/>
+
+ <path id="client.classpath">
+ <fileset dir="${thirdparty.dir}">
+ <include name="activation.jar"/>
+ <include name="commons-logging.jar"/>
+ <include name="concurrent.jar"/>
+ <include name="javassist.jar"/>
+ <include name="jboss-common.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jboss-xml-binding.jar"/>
+ <include name="jbossretro-rt.jar"/>
+ <include name="jboss-backport-concurrent.jar"/>
+ <include name="log4j.jar"/>
+ <include name="mail.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="xml-apis.jar"/>
+ <include name="${jbossws.version}-client.jar"/>
+ <include name="${jaxws.version}.jar"/>
+ </fileset>
+ </path>
+
+ <!-- In case of jdk1.4, use a dummy location -->
+ <property name="jboss.ejb3.deployer" value="${thirdparty.dir}"/>
+
+ <path id="compile.classpath">
+ <path refid="client.classpath"/>
+ <fileset dir="${jboss.client}">
+ <include name="jbosssx-client.jar"/>
+ </fileset>
+ <fileset dir="${jboss.ejb3.deployer}">
+ <include name="jboss-annotations-ejb3.jar"/>
+ <include name="jboss-ejb3x.jar"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="jboss-j2ee.jar"/>
+ <include name="mailapi.jar"/>
+ <include name="${jbossws.version}-jboss-integration.jar"/>
+ <include name="${jbossws.version}-tomcat-integration.jar"/>
+ </fileset>
+ </path>
+
+ <path id="tests.classpath">
+ <path refid="client.classpath"/>
+ <fileset dir="${jboss.client}">
+ <include name="jboss-aop-jdk50-client.jar"/>
+ <include name="jboss-aspect-jdk50-client.jar"/>
+ <include name="jboss-ejb3-client.jar"/>
+ <include name="jbossall-client.jar"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="${jbossws.version}-jboss-integration.jar"/>
+ <include name="${jbossws.version}-tomcat-integration.jar"/>
+ <include name="servlet-api.jar"/>
+ </fileset>
+ </path>
+
+ </target>
+
+</project>
Property changes on: branches/jbossws-1.0/src/main/resources/samples/common/build-thirdparty.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-15 15:39:59 UTC (rev 1435)
@@ -4,21 +4,30 @@
<project>
- <!--
- Init
- -->
- <target name="init">
+ <import file="${basedir}/common/build-thirdparty.xml"/>
+
+ <!-- Prepare-->
+ <target name="prepare">
<property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
<property name="common.java" value="${basedir}/common/java"/>
<property name="common.resources" value="${basedir}/common/resources"/>
<property name="build.tests.dir" value="${basedir}/output"/>
+ <property name="thirdparty.dir" value="${basedir}/thirdparty"/>
<!-- JDK Detection -->
<available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
-
+
+ <!-- Force Thirdparty Get -->
+ <condition property="force.thirdparty.get">
+ <not>
+ <available file="${thirdparty.dir}" type="dir"/>
+ </not>
+ </condition>
+
<!-- Target Server [jboss|tomcat] -->
<property name="jbossws.target.server.${jbossws.target.server}" value="true"/>
<condition property="only-on-jboss">
@@ -30,42 +39,7 @@
<isset property="HAVE_JDK_1.5"/>
</and>
</condition>
-
- <!-- JBossWS Version -->
- <condition property="jbossws.version" value="jbossws14">
- <not>
- <isset property="HAVE_JDK_1.5"/>
- </not>
- </condition>
- <condition property="jbossws.version" value="jbossws">
- <isset property="HAVE_JDK_1.5"/>
- </condition>
- <!-- JBoss Home -->
- <condition property="jboss.home" value="${jboss.jdk14.home}">
- <not>
- <isset property="HAVE_JDK_1.5"/>
- </not>
- </condition>
- <condition property="jboss.home" value="${jboss.jdk15.home}">
- <isset property="HAVE_JDK_1.5"/>
- </condition>
-
- <property name="jboss.client" value="${jboss.home}/client"/>
- <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
- <property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
-
- <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/>
- <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/>
-
- <!-- Java Endorsed -->
- <condition property="jbossws.endorsed.dirs" value="${jboss.home}/lib/endorsed">
- <isset property="jbossws.target.server.jboss"/>
- </condition>
- <condition property="jbossws.endorsed.dirs" value="${tomcat.home}/common/endorsed">
- <isset property="jbossws.target.server.tomcat"/>
- </condition>
-
<!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
otherwise and initialize the node0/node1 cluster hostnames to localhost
and ${hostname} by default. If you cannot route multicast traffic between
@@ -88,48 +62,32 @@
<property name="node0.http.url" value="http://${node0}:8080"/>
<property name="node0.jndi.url" value="jnp://${node0}:1099"/>
- <path id="client.classpath">
- <fileset dir="${basedir}/lib">
- <include name="activation.jar"/>
- <include name="commons-logging.jar"/>
- <include name="javassist.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="jbossall-client.jar"/>
- <include name="jbossretro-rt.jar"/>
- <include name="jboss-backport-concurrent.jar"/>
- <include name="${jbossws.version}-client.jar"/>
- <include name="log4j.jar"/>
- <include name="mail.jar"/>
- </fileset>
- </path>
+ <!-- Use -Ddebug=true for client debugging -->
+ <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006">
+ <isset property="debug"/>
+ </condition>
+ <condition property="remote.debug.line" value="">
+ <not>
+ <isset property="debug"/>
+ </not>
+ </condition>
- <path id="compile.classpath">
- <path refid="client.classpath"/>
- <fileset dir="${basedir}/lib">
- <include name="jboss-annotations-ejb3.jar"/>
- <include name="jboss-ejb3x.jar"/>
- </fileset>
- <pathelement location="${basedir}/lib/${jbossws.version}-jboss-integration.jar"/>
- <pathelement location="${basedir}/lib/${jbossws.version}-tomcat-integration.jar"/>
- </path>
+ </target>
+
+ <!-- Init-->
+ <target name="init" depends="prepare,check-jboss,check-tomcat">
- <path id="tests.classpath">
- <path refid="client.classpath"/>
- <fileset dir="${basedir}/lib">
- <include name="jboss-aop-jdk50-client.jar"/>
- <include name="jboss-aspect-jdk50-client.jar"/>
- <include name="jboss-ejb3-client.jar"/>
- </fileset>
- <pathelement location="${basedir}/lib/${jbossws.version}-jboss-integration.jar"/>
- <pathelement location="${basedir}/lib/${jbossws.version}-tomcat-integration.jar"/>
- <pathelement location="${basedir}/lib/servlet-api.jar"/>
- </path>
-
- <echo message="jboss.home = ${jboss.home}"/>
- <echo message="tomcat.home = ${tomcat.home}"/>
- <echo message="java.home = ${java.home}"/>
- <echo message="node0 = ${node0}"/>
+ <echo message="jboss.jdk15.home = ${jboss.jdk15.home}"/>
+ <echo message="jboss.jdk14.home = ${jboss.jdk14.home}"/>
+ <echo message="tomcat.home = ${tomcat.home}"/>
+ <echo message="java.home = ${java.home}"/>
+ <!--echo message="java.endorsed.dirs = ${jbossws.endorsed.dirs}"/-->
+ <echo message="node0 = ${node0}"/>
<echo/>
+ <echo message="***************************"/>
+ <echo message="* ${chapter}"/>
+ <echo message="***************************"/>
+ <echo/>
<mkdir dir="${build.tests.dir}/classes"/>
<mkdir dir="${build.tests.dir}/resources"/>
@@ -140,22 +98,70 @@
<mkdir dir="${build.tests.dir}/wstools/resources"/>
<touch file="${build.tests.dir}/log/samples.log"/>
+
</target>
- <!--
- Compile the java sources
- -->
- <target name="compile" depends="init" description="compile the sources" if="HAVE_JDK_1.4">
+ <!-- Check JBoss -->
+ <target name="check-jboss">
+
+ <condition property="jboss.home" value="${jboss.jdk14.home}">
+ <not>
+ <isset property="HAVE_JDK_1.5"/>
+ </not>
+ </condition>
+ <condition property="jboss.home" value="${jboss.jdk15.home}">
+ <isset property="HAVE_JDK_1.5"/>
+ </condition>
+
+ <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/>
+ <fail message="JBoss not available: ${jboss.home}" unless="jboss.available"/>
+
+ <!-- Java Endorsed -->
+ <condition property="jbossws.endorsed.dirs" value="${jboss.home}/lib/endorsed">
+ <isset property="jbossws.target.server.jboss"/>
+ </condition>
+
+ <property name="jboss.lib" value="${jboss.home}/lib"/>
+ <property name="jboss.client" value="${jboss.home}/client"/>
+ <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/>
+ <property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
+ <property name="jboss.server.lib" value="${jboss.server}/lib"/>
+
+ <condition property="jboss.ejb3.deployer" value="${jboss.server.deploy}/ejb3.deployer">
+ <isset property="HAVE_JDK_1.5"/>
+ </condition>
+
+ </target>
+
+ <!-- Check tomcat -->
+ <target name="check-tomcat" if="jbossws.target.server.tomcat">
+
+ <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/>
+ <condition property="cannot.use.tomcat">
+ <and>
+ <isset property="jbossws.target.server.tomcat"/>
+ <not>
+ <isset property="tomcat.available"/>
+ </not>
+ </and>
+ </condition>
+ <fail message="Tomcat not available: ${tomcat.home}" if="cannot.use.tomcat"/>
+
+ <!-- Java Endorsed -->
+ <property name="jbossws.endorsed.dirs" value="${tomcat.home}/common/endorsed"/>
+
+ </target>
+
+ <!-- Compile the java sources -->
+ <target name="compile" depends="init,thirdparty"
+ description="compile the sources" if="HAVE_JDK_1.4">
<javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on">
<src path="${common.java}"/>
<src path="${java.dir}"/>
</javac>
</target>
-
- <!--
- Compile the java sources with jdk-1.5
- -->
- <target name="compile15" depends="init" description="compile the sources" if="HAVE_JDK_1.5">
+ <target name="compile15" depends="init,thirdparty"
+ description="compile the sources" if="HAVE_JDK_1.5">
<mkdir dir="${build.tests.dir}/classes"/>
<javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on">
<src path="${common.java}"/>
@@ -228,7 +234,7 @@
<target name="one-test" depends="init" if="test" description="run a single test">
<junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}">
- <!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006" /-->
+ <jvmarg line="${remote.debug.line}"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="tomcat.home" value="${tomcat.home}"/>
<sysproperty key="jbosstest.host.name" value="${node0}"/>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml 2006-11-15 15:39:59 UTC (rev 1435)
@@ -28,7 +28,8 @@
<!--
Build the test deployments
-->
- <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
+ <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated"
+ description="build the deployments">
<!-- jaxrpc-samples-secureejb -->
<jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb.jar">
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-11-15 15:39:59 UTC (rev 1435)
@@ -3,126 +3,119 @@
<!-- $Id$ -->
<project default="main" basedir="../.." name="JBossWS Examples">
-
- <property name="chapter" value="jaxrpc/wsbpel" />
- <property name="sample.path" value="jaxrpc/samples/wsbpel" />
- <property name="java.dir" value="${basedir}/${chapter}/java" />
- <property name="resources.dir" value="${basedir}/${chapter}/resources" />
-
- <import file="${basedir}/common/imported-build.xml" />
-
- <target name="init-jbpmbpel">
+
+ <property name="chapter" value="jaxrpc/wsbpel"/>
+ <property name="sample.path" value="jaxrpc/samples/wsbpel"/>
+ <property name="java.dir" value="${basedir}/${chapter}/java"/>
+ <property name="resources.dir" value="${basedir}/${chapter}/resources"/>
+
+ <import file="${basedir}/common/imported-build.xml"/>
+
+ <target name="init-jbpmbpel" depends="init">
+
<!-- Check that jBPM BPEL has been deployed -->
- <property name="jboss.server.deploy.jbpmbpel"
- value="${jboss.server.deploy}/jbpm-bpel.sar" />
- <available property="jbpmbpel.available"
- file="${jboss.server.deploy.jbpmbpel}" />
- <antcall target="deploy-jbpmbpel" />
-
+ <property name="jboss.server.deploy.jbpmbpel" value="${jboss.server.deploy}/jbpm-bpel.sar"/>
+ <available property="jbpmbpel.available" file="${jboss.server.deploy.jbpmbpel}" type="dir"/>
+ <antcall target="deploy-jbpmbpel"/>
+
<!-- The jBPM BPEL classpath -->
<path id="jbpmbpel.classpath">
- <path refid="client.classpath" />
- <fileset dir="${basedir}/lib">
- <include name="dom4j.jar" />
- <include name="commons-collections.jar" />
+ <path refid="client.classpath"/>
+ <fileset dir="${jboss.lib}">
+ <include name="commons-logging.jar"/>
</fileset>
+ <fileset dir="${jboss.server.lib}">
+ <include name="dom4j.jar"/>
+ <include name="commons-collections.jar"/>
+ </fileset>
<fileset dir="${jboss.server.deploy.jbpmbpel}">
- <include name="jbpm*.jar" />
- <include name="commons-lang*.jar" />
- <include name="jaxen*.jar" />
+ <include name="jbpm*.jar"/>
+ <include name="commons-lang*.jar"/>
+ <include name="jaxen*.jar"/>
</fileset>
- <path location="${jboss.server.deploy.jbpmbpel}" />
- <path location="${common.resources}" />
+ <path location="${jboss.server.deploy.jbpmbpel}"/>
+ <path location="${common.resources}"/>
</path>
</target>
-
+
<target name="deploy-jbpmbpel" unless="jbpmbpel.available">
- <mkdir dir="${jboss.server.deploy.jbpmbpel}" />
- <unjar dest="${jboss.server.deploy.jbpmbpel}"
- src="${basedir}/lib/jbpm-bpel.sar" />
+ <mkdir dir="${jboss.server.deploy.jbpmbpel}"/>
+ <unjar dest="${jboss.server.deploy.jbpmbpel}" src="${thirdparty.dir}/jbpm-bpel.sar"/>
</target>
-
- <target name="generate-sources"
- depends="init-jbpmbpel"
- description="Generate the deployment resources.">
-
+
+ <target name="generate-sources" depends="init-jbpmbpel" description="Generate the deployment resources.">
+
<!-- Package the BPEL process and related WSDL interfaces -->
<zip destfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
- <fileset dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
+ <fileset dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel"/>
</zip>
-
+
<!-- Define the servicegen ant task -->
- <taskdef name="servicegen"
- classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
- <classpath refid="jbpmbpel.classpath" />
+ <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
+ <classpath refid="jbpmbpel.classpath"/>
</taskdef>
-
+
<!-- Generate binding and service elements -->
<servicegen processfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
- outputdir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" />
-
+ outputdir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"/>
+
<!-- Define the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath>
- <path refid="client.classpath" />
- <path location="${build.tests.dir}" />
- <path location="${common.resources}" />
+ <path refid="client.classpath"/>
+ <path location="${build.tests.dir}"/>
+ <path location="${common.resources}"/>
</classpath>
</taskdef>
-
+
<!-- samples/wsbpel -->
- <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
- config="${resources.dir}/hello/wstools-config.xml" />
-
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${resources.dir}/hello/wstools-config.xml"/>
+
<move todir="${build.tests.dir}/wstools/java">
- <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
- includes="org/**" />
+ <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" includes="org/**"/>
</move>
</target>
-
+
<!-- Build the test deployments -->
- <target name="jars"
- depends="compile,copy-resources,generate-sources,compile-generated,copy-generated"
- description="build the deployments">
-
+ <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
+
<!-- jaxrpc-samples-wsbpel -->
- <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
- webxml="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
<classes dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class" />
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class"/>
</classes>
<webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="webservices.xml" />
- <include name="classes/bpel-application.xml" />
+ <include name="webservices.xml"/>
+ <include name="classes/bpel-application.xml"/>
</webinf>
<webinf dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="jaxrpc-mapping.xml" />
- <include name="wsdl/**" />
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
</webinf>
</war>
-
+
<jar destfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
<fileset dir="${build.tests.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
- <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/>
</fileset>
<metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
- <include name="application-client.xml" />
- <include name="jboss-client.xml" />
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
</metainf>
<metainf dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
- <include name="jaxrpc-mapping.xml" />
+ <include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
</target>
-
+
<!-- Run the testsuite -->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${sample.path}" />
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
-
+
</project>
\ No newline at end of file
Added: branches/jbossws-1.0/src/main/resources/samples/version.properties
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/version.properties 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/src/main/resources/samples/version.properties 2006-11-15 15:39:59 UTC (rev 1435)
@@ -0,0 +1,21 @@
+
+# $Id: version.properties 1420 2006-11-14 12:44:10Z thomas.diesler(a)jboss.com $
+
+# thirdparty library versions
+apache-collections=@apache-collections@
+apache-log4j=@apache-log4j@
+apache-logging=@apache-logging@
+ibm-wsdl4j=@ibm-wsdl4j@
+javassist=@javassist@
+jbpm-bpel=@jbpm-bpel@
+jbossas=@jbossas@
+jboss-backport-concurrent=@jboss-backport-concurrent@
+jboss-common=@jboss-common@
+jboss-jbossretro=@jboss-jbossretro@
+jboss-jbossws=(a)version.id@
+jboss-jbossxb=@jboss-jbossxb@
+oswego-concurrent=@oswego-concurrent@
+sun-jaf=@sun-jaf@
+sun-javamail=@sun-javamail@
+sun-servlet=@sun-servlet@
+
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2006-11-15 15:39:59 UTC (rev 1435)
@@ -33,11 +33,11 @@
import junit.framework.Test;
-import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.jaxrpc.ServiceExt;
import org.jboss.ws.metadata.HandlerMetaData;
+import org.jboss.ws.utils.ObjectNameFactory;
/**
* Test dynamic handlers
Modified: branches/jbossws-1.0/version.properties
===================================================================
--- branches/jbossws-1.0/version.properties 2006-11-15 00:17:51 UTC (rev 1434)
+++ branches/jbossws-1.0/version.properties 2006-11-15 15:39:59 UTC (rev 1435)
@@ -26,9 +26,9 @@
apache-ant=1.6.5
apache-collections=3.1
apache-log4j=1.2.8
+apache-logging=1.0.5.GA-jboss
apache-xalan=j_2.7.0
apache-xerces=2.7.1
-dom4j=1.6.1jboss
jboss-backport-concurrent=2.1.0.GA
jboss-jbossretro=1.0.2.GA
jbossas=4.0.4.GA
17 years, 7 months
- 1
- 0
JBossWS SVN: r1434 - tags
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-14 19:17:51 -0500 (Tue, 14 Nov 2006)
New Revision: 1434
Added:
tags/jbossws-1.0.4.GA/
Log:
jbossws-1.0.4.GA -r1433
Copied: tags/jbossws-1.0.4.GA (from rev 1433, branches/jbossws-1.0)
17 years, 7 months
- 1
- 0
JBossWS SVN: r1433 - in branches/jbossws-1.0/src: ant main/resources/samples/common main/resources/samples/jaxrpc/jsr109pojo
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-14 19:15:13 -0500 (Tue, 14 Nov 2006)
New Revision: 1433
Modified:
branches/jbossws-1.0/src/ant/build-samples.xml
branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml
Log:
Fix ejb3 classpath
Modified: branches/jbossws-1.0/src/ant/build-samples.xml
===================================================================
--- branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-14 23:36:12 UTC (rev 1432)
+++ branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-15 00:15:13 UTC (rev 1433)
@@ -39,6 +39,10 @@
<include name="jboss-aspect-jdk50-client.jar"/>
<include name="jboss-ejb3-client.jar"/>
</fileset>
+ <fileset dir="${jboss.server.deploy}/ejb3.deployer">
+ <include name="jboss-annotations-ejb3.jar"/>
+ <include name="jboss-ejb3x.jar"/>
+ </fileset>
<fileset dir="${build.lib.dir}">
<include name="jbossws-client.jar"/>
<include name="jbossws-jboss-integration.jar"/>
Modified: branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-14 23:36:12 UTC (rev 1432)
+++ branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-15 00:15:13 UTC (rev 1433)
@@ -105,6 +105,10 @@
<path id="compile.classpath">
<path refid="client.classpath"/>
+ <fileset dir="${basedir}/lib">
+ <include name="jboss-annotations-ejb3.jar"/>
+ <include name="jboss-ejb3x.jar"/>
+ </fileset>
<pathelement location="${basedir}/lib/${jbossws.version}-jboss-integration.jar"/>
<pathelement location="${basedir}/lib/${jbossws.version}-tomcat-integration.jar"/>
</path>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml 2006-11-14 23:36:12 UTC (rev 1432)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml 2006-11-15 00:15:13 UTC (rev 1433)
@@ -44,6 +44,7 @@
<webinf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
+ <include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
17 years, 7 months
- 1
- 0
JBossWS SVN: r1432 - in branches/jbossws-1.0/src/test/resources/jaxrpc/samples: jsr109ejb/rpclit/META-INF jsr109pojo/rpclit/WEB-INF
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-14 18:36:12 -0500 (Tue, 14 Nov 2006)
New Revision: 1432
Modified:
branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml
Log:
Implement wsdl-publish-location
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2006-11-14 23:21:02 UTC (rev 1431)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2006-11-14 23:36:12 UTC (rev 1432)
@@ -3,12 +3,14 @@
<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
+
+ <webservices>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-publish-location>file:@wsdl-publish-location@/jsr109ejb</wsdl-publish-location>
+ </webservice-description>
+ </webservices>
- <webservice-description>
- <webservice-description-name>TestService</webservice-description-name>
- <wsdl-publish-location>file:@wsdl-publish-location@/jsr109ejb</wsdl-publish-location>
- </webservice-description>
-
<enterprise-beans>
<session>
<ejb-name>TestService</ejb-name>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml 2006-11-14 23:21:02 UTC (rev 1431)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml 2006-11-14 23:36:12 UTC (rev 1432)
@@ -3,8 +3,10 @@
<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
<jboss-web>
+
<webservice-description>
<webservice-description-name>TestService</webservice-description-name>
<wsdl-publish-location>file:@wsdl-publish-location@/jsr109pojo</wsdl-publish-location>
</webservice-description>
+
</jboss-web>
\ No newline at end of file
17 years, 7 months
- 1
- 0
JBossWS SVN: r1431 - branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-14 18:21:02 -0500 (Tue, 14 Nov 2006)
New Revision: 1431
Added:
branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml
Log:
Implement wsdl-publish-location
Added: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml 2006-11-14 23:06:21 UTC (rev 1430)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml 2006-11-14 23:21:02 UTC (rev 1431)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-publish-location>file:@wsdl-publish-location@/jsr109pojo</wsdl-publish-location>
+ </webservice-description>
+</jboss-web>
\ No newline at end of file
Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 7 months
- 1
- 0
JBossWS SVN: r1430 - in branches/jbossws-1.0: . src/main/java/org/jboss/ws/integration/jboss src/main/java/org/jboss/ws/metadata/j2ee src/main/resources/samples/common src/main/resources/samples/jaxrpc/docstyle src/main/resources/samples/jaxrpc/dynamichandler src/main/resources/samples/jaxrpc/exception src/main/resources/samples/jaxrpc/handler src/main/resources/samples/jaxrpc/holder src/main/resources/samples/jaxrpc/jmstransport src/main/resources/samples/jaxrpc/jsr109ejb src/main/resourc
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-14 18:06:21 -0500 (Tue, 14 Nov 2006)
New Revision: 1430
Modified:
branches/jbossws-1.0/.classpath
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ApplicationMetaDataAdaptor.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/WebMetaDataAdaptor.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedApplicationMetaData.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java
branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/docstyle/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/dynamichandler/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/exception/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/handler/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/holder/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jmstransport/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109ejb/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/message/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/oneway/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/rpcstyle/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/swa/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wseventing/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxws/jsr181ejb/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxws/jsr181pojo/build.xml
branches/jbossws-1.0/src/main/resources/samples/jaxws/wsaddressing/build.xml
branches/jbossws-1.0/src/test/ant/build-interop-artifacts.xml
branches/jbossws-1.0/src/test/ant/build-interop-jars.xml
branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml
branches/jbossws-1.0/src/test/build.xml
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java
branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
Log:
Implement wsdl-publish-location
Change ${build.test.dir} to ${build.tests.dir}
Modified: branches/jbossws-1.0/.classpath
===================================================================
--- branches/jbossws-1.0/.classpath 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/.classpath 2006-11-14 23:06:21 UTC (rev 1430)
@@ -25,7 +25,7 @@
<classpathentry kind="lib" path="thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.5"/>
<classpathentry kind="lib" path="thirdparty/ant.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss.jar" sourcepath="/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/server/src/main"/>
<classpathentry kind="lib" path="thirdparty/jboss-j2ee.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-jmx.jar"/>
<classpathentry kind="lib" path="thirdparty/jbosssx.jar"/>
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ApplicationMetaDataAdaptor.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ApplicationMetaDataAdaptor.java 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ApplicationMetaDataAdaptor.java 2006-11-14 23:06:21 UTC (rev 1430)
@@ -32,11 +32,13 @@
import org.jboss.metadata.EjbPortComponentMetaData;
import org.jboss.metadata.MessageDrivenMetaData;
import org.jboss.metadata.SessionMetaData;
+import org.jboss.metadata.WebMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter;
/**
* Build container independent application meta data
@@ -54,10 +56,21 @@
umd.setConfigFile(apmd.getConfigFile());
umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot());
umd.setSecurityDomain(apmd.getSecurityDomain());
- //umd.setWsdlPublishLocationMap(apmd.getWsdlPublishLocationMap());
+ umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd));
return umd;
}
+ private static PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd)
+ {
+ return new PublishLocationAdapter ()
+ {
+ public String getWsdlPublishLocationByName(String name)
+ {
+ return apmd.getWsdlPublishLocationByName(name);
+ }
+ };
+ }
+
private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData)
{
List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>();
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/WebMetaDataAdaptor.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/WebMetaDataAdaptor.java 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/WebMetaDataAdaptor.java 2006-11-14 23:06:21 UTC (rev 1430)
@@ -27,6 +27,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.WebSecurityMetaData;
@@ -34,6 +35,7 @@
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter;
import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection;
/**
@@ -54,14 +56,25 @@
umd.setConfigFile(wmd.getConfigFile());
umd.setContextLoader(wmd.getContextLoader());
umd.setSecurityDomain(wmd.getSecurityDomain());
- //umd.setWsdlPublishLocationMap(wmd.getWsdlPublishLocationMap());
- umd.setSecurityMetaData(buildUnifiedWebSecurityMetaData(wmd.getSecurityContraints()));
+ umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd));
+ umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints()));
return umd;
}
- protected static List<UnifiedWebSecurityMetaData> buildUnifiedWebSecurityMetaData(final Iterator securityConstraints)
+ private static PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd)
{
+ return new PublishLocationAdapter ()
+ {
+ public String getWsdlPublishLocationByName(String name)
+ {
+ return wmd.getWsdlPublishLocationByName(name);
+ }
+ };
+ }
+
+ private static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints)
+ {
ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>();
while (securityConstraints.hasNext())
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedApplicationMetaData.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedApplicationMetaData.java 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedApplicationMetaData.java 2006-11-14 23:06:21 UTC (rev 1430)
@@ -24,10 +24,8 @@
//$Id: UnifiedApplicationMetaData.java 316 2006-05-12 17:09:42Z thomas.diesler(a)jboss.com $
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
/**
* The container independent top level meta data from the jboss.xml and ejb-jar.xml descriptor.
@@ -48,7 +46,7 @@
/** The security-domain value assigned to the application */
private String securityDomain;
/** A HashMap<String, String> for webservice description publish locations */
- private Map<String, String> wsdlPublishLocationMap = new HashMap<String, String>();
+ private PublishLocationAdapter publishLocationAdapter;
public UnifiedBeanMetaData getBeanByEjbName(String ejbName)
{
@@ -112,14 +110,22 @@
this.securityDomain = securityDomain;
}
- public void setWsdlPublishLocationMap(Map<String, String> wsdlPublishLocationMap)
+ public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter)
{
- this.wsdlPublishLocationMap = wsdlPublishLocationMap;
+ this.publishLocationAdapter = publishLocationAdapter;
}
public String getWsdlPublishLocationByName(String name)
{
- // if not found, the we will use default
- return wsdlPublishLocationMap.get(name);
+ String publishLocation = null;
+ if (publishLocationAdapter != null)
+ publishLocation = publishLocationAdapter.getWsdlPublishLocationByName(name);
+ return publishLocation;
+
}
+
+ public interface PublishLocationAdapter
+ {
+ String getWsdlPublishLocationByName(String name);
+ }
}
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-11-14 23:06:21 UTC (rev 1430)
@@ -50,10 +50,10 @@
/** The security-domain value assigned to the application */
private String securityDomain;
/** A HashMap<String, String> for webservice description publish locations */
- private Map<String, String> wsdlPublishLocationMap = new HashMap<String, String>();
+ private PublishLocationAdapter publishLocationAdapter;
/** web.xml security-constraints */
private List<UnifiedWebSecurityMetaData> securityMetaData;
-
+
public String getContextRoot()
{
return contextRoot;
@@ -133,16 +133,23 @@
{
this.securityMetaData = securityMetaData;
}
-
- public void setWsdlPublishLocationMap(Map<String, String> wsdlPublishLocationMap)
+
+ public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter)
{
- this.wsdlPublishLocationMap = wsdlPublishLocationMap;
+ this.publishLocationAdapter = publishLocationAdapter;
}
public String getWsdlPublishLocationByName(String name)
{
- // if not found, the we will use default
- return wsdlPublishLocationMap.get(name);
- }
-
+ String publishLocation = null;
+ if (publishLocationAdapter != null)
+ publishLocation = publishLocationAdapter.getWsdlPublishLocationByName(name);
+ return publishLocation;
+
+ }
+
+ public interface PublishLocationAdapter
+ {
+ String getWsdlPublishLocationByName(String name);
+ }
}
Modified: branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -13,7 +13,7 @@
<property name="common.java" value="${basedir}/common/java"/>
<property name="common.resources" value="${basedir}/common/resources"/>
- <property name="build.test.dir" value="${basedir}/output"/>
+ <property name="build.tests.dir" value="${basedir}/output"/>
<!-- JDK Detection -->
<available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
@@ -127,22 +127,22 @@
<echo message="node0 = ${node0}"/>
<echo/>
- <mkdir dir="${build.test.dir}/classes"/>
- <mkdir dir="${build.test.dir}/resources"/>
- <mkdir dir="${build.test.dir}/reports"/>
- <mkdir dir="${build.test.dir}/libs"/>
- <mkdir dir="${build.test.dir}/log"/>
- <mkdir dir="${build.test.dir}/wstools/java"/>
- <mkdir dir="${build.test.dir}/wstools/resources"/>
+ <mkdir dir="${build.tests.dir}/classes"/>
+ <mkdir dir="${build.tests.dir}/resources"/>
+ <mkdir dir="${build.tests.dir}/reports"/>
+ <mkdir dir="${build.tests.dir}/libs"/>
+ <mkdir dir="${build.tests.dir}/log"/>
+ <mkdir dir="${build.tests.dir}/wstools/java"/>
+ <mkdir dir="${build.tests.dir}/wstools/resources"/>
- <touch file="${build.test.dir}/log/samples.log"/>
+ <touch file="${build.tests.dir}/log/samples.log"/>
</target>
<!--
Compile the java sources
-->
<target name="compile" depends="init" description="compile the sources" if="HAVE_JDK_1.4">
- <javac destdir="${build.test.dir}/classes" classpathref="compile.classpath" debug="on">
+ <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on">
<src path="${common.java}"/>
<src path="${java.dir}"/>
</javac>
@@ -152,8 +152,8 @@
Compile the java sources with jdk-1.5
-->
<target name="compile15" depends="init" description="compile the sources" if="HAVE_JDK_1.5">
- <mkdir dir="${build.test.dir}/classes"/>
- <javac destdir="${build.test.dir}/classes" classpathref="compile.classpath" debug="on">
+ <mkdir dir="${build.tests.dir}/classes"/>
+ <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on">
<src path="${common.java}"/>
<src path="${java.dir}"/>
</javac>
@@ -163,9 +163,9 @@
Compile the generated java sources
-->
<target name="compile-generated" depends="init" description="compile the generated sources">
- <mkdir dir="${build.test.dir}/classes"/>
- <javac destdir="${build.test.dir}/classes" classpathref="compile.classpath" debug="on">
- <src path="${build.test.dir}/wstools/java"/>
+ <mkdir dir="${build.tests.dir}/classes"/>
+ <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on">
+ <src path="${build.tests.dir}/wstools/java"/>
</javac>
</target>
@@ -174,17 +174,18 @@
-->
<target name="copy-resources" depends="init" description="copy the resources">
<!-- copy resource files -->
- <copy todir="${build.test.dir}/resources/${sample.path}">
+ <copy todir="${build.tests.dir}/resources/${sample.path}">
<fileset dir="${resources.dir}">
<include name="**/*.wsdl"/>
<include name="**/*.xml"/>
</fileset>
<filterset>
<filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="wsdl-publish-location" value="${build.tests.dir}/wsdl-publish"/>
</filterset>
</copy>
<!-- copy binary files -->
- <copy todir="${build.test.dir}/resources/${sample.path}">
+ <copy todir="${build.tests.dir}/resources/${sample.path}">
<fileset dir="${resources.dir}">
<exclude name="**/*.wsdl"/>
<exclude name="**/*.xml"/>
@@ -197,14 +198,14 @@
-->
<target name="copy-generated" depends="init" description="copy the resources">
<!-- copy generated resource files -->
- <copy todir="${build.test.dir}/resources">
- <fileset dir="${build.test.dir}/wstools/resources">
+ <copy todir="${build.tests.dir}/resources">
+ <fileset dir="${build.tests.dir}/wstools/resources">
<include name="${sample.path}/**/*.wsdl"/>
<include name="${sample.path}/**/*.xml"/>
</fileset>
</copy>
<!-- copy override resource files -->
- <copy todir="${build.test.dir}/resources" overwrite="true">
+ <copy todir="${build.tests.dir}/resources" overwrite="true">
<fileset dir="${common.resources}/overrides">
<include name="${sample.path}/**/*.wsdl"/>
<include name="${sample.path}/**/*.xml"/>
@@ -222,13 +223,13 @@
-->
<target name="one-test" depends="init" if="test" description="run a single test">
- <junit printsummary="yes" showoutput="yes" dir="${build.test.dir}">
+ <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}">
<!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006" /-->
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="tomcat.home" value="${tomcat.home}"/>
<sysproperty key="jbosstest.host.name" value="${node0}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="log.dir" value="${build.test.dir}/log"/>
+ <sysproperty key="log.dir" value="${build.tests.dir}/log"/>
<sysproperty key="java.endorsed.dirs" value="${jbossws.endorsed.dirs}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/>
@@ -236,27 +237,27 @@
<sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
<sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
- <sysproperty key="org.jboss.ws.wsse.keyStore" value="${build.test.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.test.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
<sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
<classpath>
- <pathelement path="${build.test.dir}/classes"/>
+ <pathelement path="${build.tests.dir}/classes"/>
<pathelement path="${common.resources}"/>
<path refid="tests.classpath"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
- <test fork="yes" todir="${build.test.dir}/reports" name="${test}"/>
+ <test fork="yes" todir="${build.tests.dir}/reports" name="${test}"/>
</junit>
- <junitreport todir="${build.test.dir}/reports">
- <fileset dir="${build.test.dir}/reports">
+ <junitreport todir="${build.tests.dir}/reports">
+ <fileset dir="${build.tests.dir}/reports">
<include name="TEST-*.xml"/>
</fileset>
- <report format="frames" todir="${build.test.dir}/reports/html"/>
+ <report format="frames" todir="${build.tests.dir}/reports/html"/>
</junitreport>
</target>
@@ -267,12 +268,12 @@
-->
<target name="test" depends="init" if="test" description="run a collection of tests">
- <junit printsummary="yes" showoutput="yes" dir="${build.test.dir}">
+ <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}">
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="tomcat.home" value="${tomcat.home}"/>
<sysproperty key="jbosstest.host.name" value="${node0}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="log.dir" value="${build.test.dir}/log"/>
+ <sysproperty key="log.dir" value="${build.tests.dir}/log"/>
<sysproperty key="java.endorsed.dirs" value="${jbossws.endorsed.dirs}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/>
@@ -280,20 +281,20 @@
<sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/>
<sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
- <sysproperty key="org.jboss.ws.wsse.keyStore" value="${build.test.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.test.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
+ <sysproperty key="org.jboss.ws.wsse.keyStore" value="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/>
+ <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/>
<sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
<sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
<classpath>
- <pathelement path="${build.test.dir}/classes"/>
+ <pathelement path="${build.tests.dir}/classes"/>
<pathelement path="${common.resources}"/>
<path refid="tests.classpath"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
- <batchtest fork="yes" todir="${build.test.dir}/reports">
+ <batchtest fork="yes" todir="${build.tests.dir}/reports">
<fileset dir="${java.dir}">
<include name="org/jboss/test/ws/${test}/**/*TestCase.java"/>
</fileset>
@@ -306,11 +307,11 @@
Generate the test report
-->
<target name="tests-report" depends="init" description="generate the test report">
- <junitreport todir="${build.test.dir}/reports">
- <fileset dir="${build.test.dir}/reports">
+ <junitreport todir="${build.tests.dir}/reports">
+ <fileset dir="${build.tests.dir}/reports">
<include name="TEST-*.xml"/>
</fileset>
- <report format="frames" todir="${build.test.dir}/reports/html"/>
+ <report format="frames" todir="${build.tests.dir}/reports/html"/>
</junitreport>
</target>
@@ -324,7 +325,7 @@
Clean the build
-->
<target name="clean" depends="init" description="clean the build">
- <delete dir="${build.test.dir}"/>
+ <delete dir="${build.tests.dir}"/>
</target>
</project>
\ No newline at end of file
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/docstyle/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/docstyle/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/docstyle/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,18 +16,18 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/docstyle/bare -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF"
config="${resources.dir}/bare/wstools-config.xml"/>
<!-- samples/docstyle/wrapped -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"
config="${resources.dir}/wrapped/wstools-config.xml"/>
- <move todir="${build.test.dir}/wstools/java">
- <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"
+ <move todir="${build.tests.dir}/wstools/java">
+ <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"
includes="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/*.java"/>
</move>
@@ -39,60 +39,60 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-docstyle-bare -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-docstyle-wrapped -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/dynamichandler/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/dynamichandler/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/dynamichandler/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/dynaminchandler -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,28 +31,28 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-dynamichandler -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/exception/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/exception/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/exception/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/exception -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,29 +31,29 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-exception -->
- <war destfile="${build.test.dir}/libs/jaxrpc-samples-exception.war" webxml="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxrpc-samples-exception.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-exception-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-exception-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/exception/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/handler/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/handler/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/handler/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/handler -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,28 +31,28 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-handler -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-handler.war" webxml="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-handler.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-handler-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-handler-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/handler/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/holder/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/holder/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/holder/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/holder -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,26 +31,26 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-holder -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-holder.war" webxml="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-holder.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-holder-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-holder-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/holder/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jmstransport/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jmstransport/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jmstransport/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/jmstransport -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,12 +31,12 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-jmstransport -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jmstransport.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jmstransport.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="webservices.xml"/>
@@ -44,11 +44,11 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jmstransport.sar">
- <fileset dir="${build.test.dir}/libs">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jmstransport.sar">
+ <fileset dir="${build.tests.dir}/libs">
<include name="jaxrpc-samples-jmstransport.jar"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109ejb/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109ejb/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109ejb/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,15 +16,15 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/jsr109ejb/doclit -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"
config="${resources.dir}/doclit/wstools-config.xml"/>
<!-- samples/jsr109ejb/rpclit -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"
config="${resources.dir}/rpclit/wstools-config.xml"/>
</target>
@@ -35,13 +35,13 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-jsr109ejb-rpc -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -49,12 +49,12 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -63,14 +63,14 @@
</jar>
<!-- jaxrpc-samples-jsr109ejb-doc -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -78,13 +78,13 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,15 +16,15 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/jsr109pojo/doclit -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"
config="${resources.dir}/doclit/wstools-config.xml"/>
<!-- samples/jsr109pojo/rpclit -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"
config="${resources.dir}/rpclit/wstools-config.xml"/>
</target>
@@ -35,58 +35,58 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-jsr109pojo-rpc -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-jsr109pojo-doc -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/message/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/message/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/message/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/message -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,26 +31,26 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-message -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-message.war" webxml="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-message.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-message-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-message-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/message/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/message/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/mtom - ->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/mtom/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/mtom/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
-->
@@ -32,23 +32,23 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-mtom -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-mtom-client.jar">
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/META-INF">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-mtom-client.jar">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/oneway/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/oneway/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/oneway/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/oneway -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,26 +31,26 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-oneway -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-oneway.war" webxml="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-oneway.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-oneway-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-oneway-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/rpcstyle/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/rpcstyle/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/rpcstyle/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/rpcstyle -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,26 +31,26 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-rpcstyle -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/secureejb -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,14 +31,14 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-secureejb -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-secureejb.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/secureejb/META-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="ejb-jar.xml"/>
@@ -46,13 +46,13 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-secureejb-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/secureejb/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/swa/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/swa/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/swa/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/swa - ->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/swa/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/swa/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
-->
@@ -32,26 +32,26 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-swa -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-swa.war" webxml="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-swa.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-swa-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-swa-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/swa/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -47,8 +47,8 @@
description="Generate the deployment resources.">
<!-- Package the BPEL process and related WSDL interfaces -->
- <zip destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
- <fileset dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
+ <zip destfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
+ <fileset dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
</zip>
<!-- Define the servicegen ant task -->
@@ -58,24 +58,24 @@
</taskdef>
<!-- Generate binding and service elements -->
- <servicegen processfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
- outputdir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" />
+ <servicegen processfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
+ outputdir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" />
<!-- Define the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath>
<path refid="client.classpath" />
- <path location="${build.test.dir}" />
+ <path location="${build.tests.dir}" />
<path location="${common.resources}" />
</classpath>
</taskdef>
<!-- samples/wsbpel -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
config="${resources.dir}/hello/wstools-config.xml" />
- <move todir="${build.test.dir}/wstools/java">
- <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
+ <move todir="${build.tests.dir}/wstools/java">
+ <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
includes="org/**" />
</move>
</target>
@@ -86,33 +86,33 @@
description="build the deployments">
<!-- jaxrpc-samples-wsbpel -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
- webxml="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
+ webxml="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class" />
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="webservices.xml" />
<include name="classes/bpel-application.xml" />
</webinf>
- <webinf dir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <webinf dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="jaxrpc-mapping.xml" />
<include name="wsdl/**" />
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
<include name="application-client.xml" />
<include name="jboss-client.xml" />
</metainf>
- <metainf dir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <metainf dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="jaxrpc-mapping.xml" />
</metainf>
</jar>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wseventing/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wseventing/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wseventing/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,12 +16,12 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
- <classpath path="${build.test.dir}"/>
+ <classpath path="${build.tests.dir}/classes"/>
+ <classpath path="${build.tests.dir}"/>
</taskdef>
<!-- samples/wseventing
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wseventing/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wseventing/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
-->
@@ -33,26 +33,26 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-eventing.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wseventing.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wseventing.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/ws/samples/wseventing/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wseventing/*.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wseventing-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wseventing-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/ws/samples/wseventing/*.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -16,11 +16,11 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
+ <classpath path="${build.tests.dir}/classes"/>
</taskdef>
<!-- samples/wssecurity -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,74 +31,74 @@
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
<!-- jaxrpc-samples-wssecurity-sign -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-wssecurity-encrypt -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jboss-web.xml"/>
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxws/jsr181ejb/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxws/jsr181ejb/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxws/jsr181ejb/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -17,12 +17,12 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
- <classpath path="${build.test.dir}"/>
+ <classpath path="${build.tests.dir}/classes"/>
+ <classpath path="${build.tests.dir}"/>
</taskdef>
<!-- samples/jsr181ejb -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -34,20 +34,20 @@
description="build the deployments" if="HAVE_JDK_1.5">
<!-- jaxws-samples-jsr181ejb -->
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181ejb.ejb3">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181ejb.ejb3">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/>
<include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
</fileset>
- <fileset dir="${build.test.dir}/resources/jaxws/samples/jsr181ejb">
+ <fileset dir="${build.tests.dir}/resources/jaxws/samples/jsr181ejb">
<include name="config/ServerHandlers.xml"/>
</fileset>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181ejb-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181ejb-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxws/jsr181pojo/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxws/jsr181pojo/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxws/jsr181pojo/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -17,12 +17,12 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
- <classpath path="${build.test.dir}"/>
+ <classpath path="${build.tests.dir}/classes"/>
+ <classpath path="${build.tests.dir}"/>
</taskdef>
<!-- samples/jsr181pojo -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -34,16 +34,16 @@
description="build the deployments" if="HAVE_JDK_1.5">
<!-- jaxws-samples-jsr181pojo -->
- <war warfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${build.test.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/>
</classes>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181pojo/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
Modified: branches/jbossws-1.0/src/main/resources/samples/jaxws/wsaddressing/build.xml
===================================================================
--- branches/jbossws-1.0/src/main/resources/samples/jaxws/wsaddressing/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/main/resources/samples/jaxws/wsaddressing/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -17,12 +17,12 @@
<!-- Define a taskdef for the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="compile.classpath"/>
- <classpath path="${build.test.dir}/classes"/>
- <classpath path="${build.test.dir}"/>
+ <classpath path="${build.tests.dir}/classes"/>
+ <classpath path="${build.tests.dir}"/>
</taskdef>
<!-- samples/wsaddressing -->
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF"
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -33,22 +33,22 @@
description="build the deployments" if="HAVE_JDK_1.5">
<!-- jaxws-samples-wsaddressing -->
- <war warfile="${build.test.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${build.test.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${build.tests.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
<include name="jaxws-handlers.xml"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-samples-wsaddressing-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-samples-wsaddressing-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/wsaddressing/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/wsaddressing/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jbossws-client-config.xml"/>
Modified: branches/jbossws-1.0/src/test/ant/build-interop-artifacts.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-interop-artifacts.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/test/ant/build-interop-artifacts.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -61,7 +61,7 @@
<wscompile
keep="true"
client="true"
- base="${build.test.dir}/classes"
+ base="${build.tests.dir}/classes"
sourceBase="${test.java.dir}"
nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}"
mapping="${test.resources.dir}/interop/@{company}/(a){module}/WEB-INF/jaxrpc-mapping.xml"
@@ -100,7 +100,7 @@
keep="true"
import="@{import}"
server="@{server}"
- base="${build.test.dir}/classes"
+ base="${build.tests.dir}/classes"
sourceBase="${test.java.dir}"
nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}"
mapping="${test.resources.dir}/interop/@{company}/(a){module}/WEB-INF/jaxrpc-mapping.xml"
@@ -143,9 +143,9 @@
CLIENT AND ENDPOINT GENERATION
-->
<target name="prepare-interop">
- <mkdir dir="${build.test.dir}/libs/"/>
- <mkdir dir="${build.test.dir}/classes/"/>
- <mkdir dir="${build.test.dir}/reports/"/>
+ <mkdir dir="${build.tests.dir}/libs/"/>
+ <mkdir dir="${build.tests.dir}/classes/"/>
+ <mkdir dir="${build.tests.dir}/reports/"/>
<uptodate property="create.required" targetfile="${wsdl.update.marker}" >
<srcfiles dir= "${test.resources.dir}/interop" includes="**/WEB-INF/jaxrpc-mapping.xml"/>
@@ -295,8 +295,8 @@
</target>
<target name="compile" depends="prepare-interop, init">
- <mkdir dir="${build.test.dir}/classes"/>
- <javac srcdir="${test.java.dir}" destdir="${build.test.dir}/classes"
+ <mkdir dir="${build.tests.dir}/classes"/>
+ <javac srcdir="${test.java.dir}" destdir="${build.tests.dir}/classes"
classpathref="build.classpath"
source="1.5"
nowarn="off"
@@ -317,7 +317,7 @@
<target name="deploy-soapwsdl">
<copy todir="${jboss.home}/server/default/deploy/">
- <fileset dir="${build.test.dir}/libs">
+ <fileset dir="${build.tests.dir}/libs">
<include name="*interop*_Service.war"/>
</fileset>
</copy>
@@ -325,7 +325,7 @@
<target name="deploy-addressing">
<copy todir="${jboss.home}/server/default/deploy/">
- <fileset dir="${build.test.dir}/libs">
+ <fileset dir="${build.tests.dir}/libs">
<include name="*interop-wsa10*.war"/>
</fileset>
</copy>
@@ -333,7 +333,7 @@
<target name="deploy-security">
<copy todir="${jboss.home}/server/default/deploy/">
- <fileset dir="${build.test.dir}/libs">
+ <fileset dir="${build.tests.dir}/libs">
<include name="*interop-wsse*.war"/>
</fileset>
</copy>
@@ -341,7 +341,7 @@
<target name="deploy-mtom">
<copy todir="${jboss.home}/server/default/deploy/">
- <fileset dir="${build.test.dir}/libs">
+ <fileset dir="${build.tests.dir}/libs">
<include name="*interop-mtom*.war"/>
</fileset>
</copy>
@@ -349,7 +349,7 @@
<target name="clean">
<delete>
- <fileset dir="${build.test.dir}/classes">
+ <fileset dir="${build.tests.dir}/classes">
<include name="**/interop/**/*"/>
</fileset>
</delete>
@@ -361,7 +361,7 @@
</delete>
<delete>
- <fileset dir="${build.test.dir}/libs">
+ <fileset dir="${build.tests.dir}/libs">
<include name="*interop*"/>
</fileset>
</delete>
Modified: branches/jbossws-1.0/src/test/ant/build-interop-jars.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-interop-jars.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/test/ant/build-interop-jars.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -18,11 +18,11 @@
<target name="build-interop-jars">
- <mkdir dir="${build.test.dir}/libs/"/>
+ <mkdir dir="${build.tests.dir}/libs/"/>
<!-- BaseDataTypesDocLitB client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-BaseDataTypesDocLitB-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitB-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitB/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -38,9 +38,9 @@
</jar>
<!-- BaseDataTypesDocLitB_Service.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-BaseDataTypesDocLitB_Service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitB_Service.war"
webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitB_Service/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
@@ -57,8 +57,8 @@
</war>
<!-- BaseDataTypesDocLitW client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-BaseDataTypesDocLitW-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitW-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitW/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -74,8 +74,8 @@
</jar>
<!-- BaseDataTypesRpcLit client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-BaseDataTypesRpcLit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesRpcLit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesRpcLit/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -91,8 +91,8 @@
</jar>
<!-- ComplexDataTypesDocLitB client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -108,8 +108,8 @@
</jar>
<!-- ComplexDataTypesDocLitW client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -125,8 +125,8 @@
</jar>
<!-- ComplexDataTypesRpcLit client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -142,9 +142,9 @@
</jar>
<!-- BaseDataTypesDocLitW_Service.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-BaseDataTypesDocLitW_Service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesDocLitW_Service.war"
webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesDocLitW_Service/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
@@ -161,9 +161,9 @@
</war>
<!-- BaseDataTypesRpcLit_Service.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-BaseDataTypesRpcLit_Service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-BaseDataTypesRpcLit_Service.war"
webxml="${test.resources.dir}/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/BaseDataTypesRpcLit_Service/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
@@ -180,13 +180,13 @@
</war>
<!-- ComplexDataTypesDocLitB_Service.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB_Service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitB_Service.war"
webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/>
</classes>
<webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitB_Service/WEB-INF">
@@ -202,13 +202,13 @@
</war>
<!-- ComplexDataTypesDocLitW_Service.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW_Service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesDocLitW_Service.war"
webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/>
</classes>
<webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesDocLitW_Service/WEB-INF">
@@ -224,13 +224,13 @@
</war>
<!-- ComplexDataTypesRpcLit_Service.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit_Service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-ComplexDataTypesRpcLit_Service.war"
webxml="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/soapwsdl/ComplexDataTypesShared/**/*.class"/>
</classes>
<webinf dir="${test.resources.dir}/interop/microsoft/soapwsdl/ComplexDataTypesRpcLit_Service/WEB-INF">
@@ -246,8 +246,8 @@
</war>
<!-- wsa10 client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-wsa10-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-wsa10-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/addressing/wsa10/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -263,9 +263,9 @@
</jar>
<!-- wsaTestService.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-wsa10-service.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-wsa10-service.war"
webxml="${test.resources.dir}/interop/microsoft/addressing/wsaTestService/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/addressing/wsaTestService/**/*.class"/>
</classes>
<webinf dir="${test.resources.dir}/interop/microsoft/addressing/wsaTestService/WEB-INF">
@@ -281,8 +281,8 @@
<!-- wsse10 sign client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-wsse10-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-wsse10-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/security/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -299,9 +299,9 @@
</jar>
<!-- wsse10Sign.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-wsse10Sign.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-wsse10Sign.war"
webxml="${test.resources.dir}/interop/microsoft/security/wsse10/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/security/wsse10/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
@@ -322,8 +322,8 @@
</war>
<!-- wsse10Encrypt client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-wsse10Encrypt-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/security/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
@@ -340,9 +340,9 @@
</jar>
<!-- wsse10Encrypt.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-wsse10Encrypt.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-wsse10Encrypt.war"
webxml="${test.resources.dir}/interop/microsoft/security/wsse10Encrypt/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/security/wsse10Encrypt/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
@@ -363,9 +363,9 @@
</war>
<!-- mtom-utf8.war -->
- <war warfile="${build.test.dir}/libs/jbossws-interop-mtomUTF8.war"
+ <war warfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8.war"
webxml="${test.resources.dir}/interop/microsoft/mtom/utf8/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</classes>
@@ -381,8 +381,8 @@
</war>
<!-- mtom-utf8 client -->
- <jar jarfile="${build.test.dir}/libs/jbossws-interop-mtomUTF8-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jbossws-interop-mtomUTF8-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/interop/microsoft/mtom/utf8/**/*.class"/>
<include name="org/jboss/test/ws/interop/microsoft/*.class"/>
</fileset>
Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -19,59 +19,59 @@
<target name="build-jars" description="Build the jaxrpc deployments">
<!-- jaxrpc-anonymous -->
- <war warfile="${build.test.dir}/libs/jaxrpc-anonymous.war" webxml="${build.test.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-anonymous.war" webxml="${build.tests.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/anonymous/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/anonymous/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-anonymous-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-anonymous-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/>
<include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/anonymous/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/anonymous/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/anonymous/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/anonymous/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-benchmark -->
- <war warfile="${build.test.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${build.test.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${build.tests.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-benchmark-rpclit.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-benchmark-rpclit.jar">
+ <fileset dir="${build.tests.dir}/classes">
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
<include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/benchmark/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/benchmark/rpclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -79,42 +79,42 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-benchmark-rpclit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-benchmark-rpclit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
<include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/benchmark/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/benchmark/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
- <war warfile="${build.test.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${build.test.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${build.tests.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-benchmark-doclit.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-benchmark-doclit.jar">
+ <fileset dir="${build.tests.dir}/classes">
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
<include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/benchmark/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/benchmark/doclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -122,15 +122,15 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-benchmark-doclit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-benchmark-doclit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/>
<include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/benchmark/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/benchmark/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -139,245 +139,245 @@
</jar>
<!-- jaxrpc-encoded-marshalltest.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-encoded-marshalltest.war" webxml="${build.test.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-encoded-marshalltest.war" webxml="${build.tests.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-encoded-marshalltest-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-encoded-marshalltest-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestImpl.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/encoded/marshalltest/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/encoded/marshalltest/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-encoded-parametermode.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-encoded-parametermode.war" webxml="${build.test.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-encoded-parametermode.war" webxml="${build.tests.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-encoded-parametermode-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-encoded-parametermode-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestImpl.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/encoded/parametermode/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/encoded/parametermode/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-enventry.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-enventry.war" webxml="${build.test.dir}/resources/jaxrpc/enventry/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-enventry.war" webxml="${build.tests.dir}/resources/jaxrpc/enventry/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/enventry/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/enventry/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-enventry.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-enventry.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanEJB.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/enventry/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/enventry/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/enventry/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/enventry/META-INF">
<include name="ejb-jar.xml"/>
<include name="webservices.xml"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-enventry-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-enventry-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/ClientSideHandler.class"/>
<include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/enventry/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/enventry/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/enventry/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/enventry/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-jbws231 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws231.war" webxml="${build.test.dir}/resources/jaxrpc/jbws231/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws231.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws231/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws231/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws231/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws231-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws231-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws231/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws231/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws231/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws231/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws434 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws434.war" webxml="${build.test.dir}/resources/jaxrpc/jbws434/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws434.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws434/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws434/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws434/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws434-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws434-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws434/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws434/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws434/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws434/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws718 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws718.war" webxml="${build.test.dir}/resources/jaxrpc/jbws718/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws718.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws718/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws718/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws718/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws718/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws718/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws718-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws718-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws718/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws718/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws718/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws718/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws718/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws718/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-jbws720 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws720.war" webxml="${build.test.dir}/resources/jaxrpc/jbws720/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws720.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws720/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws720/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws720/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws720-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws720-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws720/*Impl.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws720/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws720/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws720/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws720/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws732 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws732.war" webxml="${build.test.dir}/resources/jaxrpc/jbws732/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws732.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws732/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws732/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws732/WEB-INF">
<include name="bare-mapping.xml"/>
<include name="wrapped-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws732-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws732-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws732/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws732/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws732/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws732/WEB-INF">
<include name="bare-mapping.xml"/>
<include name="wrapped-mapping.xml"/>
<include name="wsdl/**"/>
@@ -385,40 +385,40 @@
</jar>
<!-- jaxrpc-jws775 -->
- <war destfile="${build.test.dir}/libs/jaxrpc-jbws775.war" webxml="${build.test.dir}/resources/jaxrpc/jbws775/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxrpc-jbws775.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws775/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws775/*"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws775/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws775/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws775-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws775-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws775/*"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws775/*Impl.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws775/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws775/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws775/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws775/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws801 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws801.war" webxml="${build.test.dir}/resources/jaxrpc/jbws801/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws801.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws801/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachmentImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachment.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws801/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws801/WEB-INF">
<include name="wsdl/LargeAttachment.wsdl"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
@@ -426,67 +426,67 @@
</war>
<!-- jaxrpc-jbws807 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws807.war" webxml="${build.test.dir}/resources/jaxrpc/jbws807/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws807.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws807/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws807/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws807/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws807-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws807-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws807/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws807/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws807/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws807/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-jbws812 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws812.war" webxml="${build.test.dir}/resources/jaxrpc/jbws812/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws812.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws812/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws812/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws812/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws812-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws812-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws812/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws812/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws812/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws812/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws950 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws950.war" webxml="${build.test.dir}/resources/jaxrpc/jbws950/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws950.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws950/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws950/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws950/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws950/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
@@ -494,14 +494,14 @@
</war>
<!-- jaxrpc-jbws956 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws956.war" webxml="${build.test.dir}/resources/jaxrpc/jbws956/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws956.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws956/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws956/StringArray.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws956/StringArrayArray.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws956/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws956/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
@@ -509,43 +509,43 @@
</war>
<!-- jaxrpc-jbws1010 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1010.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1010/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1010.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1010/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1010/TestEndpointImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1010/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1010/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1010-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1010-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1010/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1010/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1010/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1010/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws1011 -->
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1011.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1011.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityLocal.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityHome.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpointBean.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1011/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1011/META-INF">
<include name="ejb-jar.xml"/>
<include name="jbosscmp-jdbc.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -553,11 +553,11 @@
<include name="wsdl/TestService.wsdl"/>
</metainf>
</jar>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1011-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1011-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1011/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1011/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -566,106 +566,106 @@
</jar>
<!-- jbossws-jbws1093 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1093.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1093.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1093/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1093-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1093-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jbws1093/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1093/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1093/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1093/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1093/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws1107 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1107.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1107.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpointImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1107/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1107/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1107-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1107-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1107/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1107/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1107/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1107/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws1121 -->
- <war destfile="${build.test.dir}/libs/jaxrpc-jbws1121.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1121/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxrpc-jbws1121.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1121/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorldBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1121/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1121/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="jboss-wsse-server.xml"/>
<include name="wsdl/*"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1121">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1121">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1121-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1121-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1121/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1121/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1121/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1121/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/*"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1121">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1121">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</metainf>
</jar>
- <ear destfile="${build.test.dir}/libs/jaxrpc-jbws1121.ear"
- appxml="${build.test.dir}/resources/jaxrpc/jbws1121/META-INF/application.xml">
- <fileset dir="${build.test.dir}/libs">
+ <ear destfile="${build.tests.dir}/libs/jaxrpc-jbws1121.ear"
+ appxml="${build.tests.dir}/resources/jaxrpc/jbws1121/META-INF/application.xml">
+ <fileset dir="${build.tests.dir}/libs">
<include name="jaxrpc-jbws1121-client.jar"/>
<include name="jaxrpc-jbws1121.war"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1121/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1121/META-INF">
<include name="jboss-app.xml"/>
</metainf>
</ear>
<!-- jaxrpc-jbws1124one -->
- <copy todir="${build.test.dir}/resources" overwrite="true">
+ <copy todir="${build.tests.dir}/resources" overwrite="true">
<fileset dir="${test.resources.dir}">
<include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/>
<include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/>
@@ -675,12 +675,12 @@
<filter token="jbws1124.domain" value="jbws1124one"/>
</filterset>
</copy>
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1124one.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1124one.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1124/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1124/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="test-resource.txt"/>
@@ -689,7 +689,7 @@
</webinf>
</war>
<!-- jaxrpc-jbws1124two -->
- <copy todir="${build.test.dir}/resources" overwrite="true">
+ <copy todir="${build.tests.dir}/resources" overwrite="true">
<fileset dir="${test.resources.dir}">
<include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/>
<include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/>
@@ -699,12 +699,12 @@
<filter token="jbws1124.domain" value="jbws1124two"/>
</filterset>
</copy>
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1124two.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1124two.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1124/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1124/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="test-resource.txt"/>
@@ -714,97 +714,97 @@
</war>
<!-- jaxrpc-jbws1125 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1125.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1125/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1125.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1125/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1125/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1125/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1125-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1125-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1125/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1125/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1125/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1125/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-jbws1148 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1148.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1148.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1148/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1148-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-jbws1148-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1148/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1148/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1148/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jbossws-jbws1179 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1179.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1179.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1179/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1179-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1179-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1179/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1179/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1179/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jbossws-jbws1186 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1186.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1186.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1186/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1186/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
@@ -812,8 +812,8 @@
</war>
<!-- jaxrpc-jbws1190 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1190.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1190.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl$1.class"/>
@@ -821,42 +821,42 @@
<include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1190/WEB-INF">
<include name="webservices.xml"/>
<include name="test-mapping.xml"/>
<include name="confidential-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1190-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-jbws1190-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1190/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1190/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1190/WEB-INF">
<include name="test-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpcws-jbws1205 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
<include name="webservices.xml"/>
<include name="simple-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1205-test.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1205-test.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl$*.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/>
@@ -865,122 +865,122 @@
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
<include name="webservices.xml"/>
<include name="test-mapping.xml"/>
<include name="wsdl/**"/>
<include name="jboss-web.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF">
<include name="simple-mapping.xml"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1205-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-jbws1205-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1205/Client/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/Client/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF">
<include name="test-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-jbws1303 -->
- <war warfile="${build.test.dir}/libs/jaxrpc-jbws1303.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1303.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1303/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1303/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1303-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1303-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1303/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1303/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1303/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1303/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-marshall-doclit.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${build.test.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${build.tests.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/*ResponseStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/marshall-doclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/marshall-doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-marshall-doclit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-marshall-doclit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/marshall-doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/marshall-doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/marshall-doclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/marshall-doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-marshall-rpclit.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-marshall-rpclit.war" webxml="${build.test.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-marshall-rpclit.war" webxml="${build.tests.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-marshall-rpclit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-marshall-rpclit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/marshall-rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/marshall-rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-outparam.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-outparam.war" webxml="${build.test.dir}/resources/jaxrpc/outparam/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-outparam.war" webxml="${build.tests.dir}/resources/jaxrpc/outparam/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/outparam/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/outparam/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/outparam/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/outparam/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
@@ -988,211 +988,211 @@
</war>
<!-- jaxrpc-overloaded -->
- <war warfile="${build.test.dir}/libs/jaxrpc-overloaded.war" webxml="${build.test.dir}/resources/jaxrpc/overloaded/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-overloaded.war" webxml="${build.tests.dir}/resources/jaxrpc/overloaded/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/>
<include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/overloaded/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/overloaded/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-overloaded-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-overloaded-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/>
<include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/overloaded/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/overloaded/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/overloaded/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/overloaded/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-docstyle-bare -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-docstyle-wrapped -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-dynamichandler -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-exception -->
- <war destfile="${build.test.dir}/libs/jaxrpc-samples-exception.war" webxml="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxrpc-samples-exception.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-exception-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-exception-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/exception/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-handler -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-handler.war" webxml="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-handler.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-handler-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-handler-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/handler/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-holder -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-holder.war" webxml="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-holder.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-holder-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-holder-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/holder/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-jmstransport -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jmstransport.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jmstransport.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="webservices.xml"/>
@@ -1200,23 +1200,23 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jmstransport.sar">
- <fileset dir="${build.test.dir}/libs">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jmstransport.sar">
+ <fileset dir="${build.tests.dir}/libs">
<include name="jaxrpc-samples-jmstransport.jar"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-jsr109ejb-rpc -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -1224,12 +1224,12 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -1238,14 +1238,14 @@
</jar>
<!-- jaxrpc-samples-jsr109ejb-doc -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -1253,13 +1253,13 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -1268,173 +1268,174 @@
</jar>
<!-- jaxrpc-samples-jsr109pojo-rpc -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
+ <include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-jsr109pojo-doc -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-message -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-message.war" webxml="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-message.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-message-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-message-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/message/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/message/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-mtom -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-mtom-client.jar">
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/META-INF">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-mtom-client.jar">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-oneway -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-oneway.war" webxml="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-oneway.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-oneway-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-oneway-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-rpcstyle -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-secureejb -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-secureejb.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/secureejb/META-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="ejb-jar.xml"/>
@@ -1442,13 +1443,13 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-secureejb-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/secureejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/secureejb/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -1457,69 +1458,69 @@
</jar>
<!-- jaxrpc-samples-swa -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-swa.war" webxml="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-swa.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-swa-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-swa-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/swa/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-wsbpel -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
- webxml="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello.war"
+ webxml="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class" />
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="webservices.xml" />
<include name="classes/bpel-application.xml" />
</webinf>
- <webinf dir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <webinf dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="jaxrpc-mapping.xml" />
<include name="wsdl/**" />
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" />
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" />
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF">
<include name="application-client.xml" />
<include name="jboss-client.xml" />
</metainf>
- <metainf dir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
+ <metainf dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="jaxrpc-mapping.xml" />
</metainf>
</jar>
<!-- jaxrpc-samples-wseventing.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wseventing.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wseventing.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/ws/samples/wseventing/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wseventing/*.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/sysmon.wsdl"/>
@@ -1527,177 +1528,177 @@
<include name="wsdl/jbwse.xsd"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wseventing-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wseventing-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/ws/samples/wseventing/*.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-samples-wssecurity-sign -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-wssecurity-encrypt -->
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
<!-- jaxrpc-samples-store-pass-encrypt.war -->
- <replace file="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${build.test.dir}"/>
- <war warfile="${build.test.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <replace file="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${build.tests.dir}"/>
+ <war warfile="${build.tests.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-webserviceref -->
- <war warfile="${build.test.dir}/libs/jaxrpc-webserviceref.war" webxml="${build.test.dir}/resources/jaxrpc/webserviceref/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-webserviceref.war" webxml="${build.tests.dir}/resources/jaxrpc/webserviceref/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/META-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/webserviceref/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/WEB-INF">
<include name="webservices.xml"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-webserviceref-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-webserviceref-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
- <war destfile="${build.test.dir}/libs/jaxrpc-webserviceref-servlet-client.war" webxml="${build.test.dir}/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxrpc-webserviceref-servlet-client.war" webxml="${build.tests.dir}/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/META-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-webserviceref-ejb-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-webserviceref-ejb-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.class"/>
<include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/webserviceref/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/META-INF">
<include name="ejb-jar.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
@@ -1705,34 +1706,34 @@
</jar>
<!-- jaxrpc-wseventing -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wseventing.war" webxml="${build.test.dir}/resources/jaxrpc/wseventing/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wseventing.war" webxml="${build.tests.dir}/resources/jaxrpc/wseventing/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/ws/eventing/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/wseventing/*.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wseventing/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wseventing-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wseventing-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/ws/eventing/*.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wseventing/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wseventing/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wseventing/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-account-signup.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupImpl.class"/>
@@ -1741,22 +1742,22 @@
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="jboss-wsse-server.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-account-signup.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupImpl.class"/>
@@ -1765,307 +1766,307 @@
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="jboss-wsse-server.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-account-signup-client.jar -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-account-signup-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-account-signup-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/account-signup/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-rpc.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-rpc.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-rpc.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="jboss-wsse-server.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-rpc-client.jar -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-rpc-none-client -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-rpc-none-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-rpc-none-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF-no-wsse">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF-no-wsse">
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-simple-sign-encrypt.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="jboss-web.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/simple-sign-encrypt">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/simple-sign-encrypt">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-simple-encrypt-client.jar -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-simple-sign-encrypt-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-simple-sign-encrypt-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/simple-sign-encrypt">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/simple-sign-encrypt">
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-sign-fault.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-sign-fault.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-sign-fault.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="jboss-web.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/sign-fault">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/sign-fault">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-sign-fault-client.jar -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-sign-fault-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-sign-fault-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/sign-fault">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/sign-fault">
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-sign-encrypt-fault.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="jboss-web.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/sign-encrypt-fault">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/sign-encrypt-fault">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-sign-encrypt-fault-client.jar -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-sign-encrypt-fault-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-sign-encrypt-fault-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/sign-encrypt-fault">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/sign-encrypt-fault">
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-store-pass-encrypt-class-cmd.war -->
- <replace file="${build.test.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${build.test.dir}"/>
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <replace file="${build.tests.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${build.tests.dir}"/>
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/PasswordUtil.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="jboss-web.xml"/>
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd">
<include name="jboss-wsse-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-wsse-web-client.war -->
- <war warfile="${build.test.dir}/libs/jaxrpc-wsse-web-client.war" webxml="${build.test.dir}/resources/jaxrpc/wsse/webclient/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-web-client.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/webclient/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/RpcTestClientServlet.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="jboss-wsse-server.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse/webclient/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/webclient/WEB-INF">
<include name="jboss-web.xml"/>
<include name="jboss-wsse-client.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
<!-- jaxrpc-wsse-username -->
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-username.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-username.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/*Service.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/*EJBEndpoint.class"/>
</fileset>
- <fileset dir="${build.test.dir}/resources">
+ <fileset dir="${build.tests.dir}/resources">
<include name="*.properties"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/username/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/username/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -2073,18 +2074,18 @@
<include name="webservices.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxrpc-wsse-username-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-username-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/wsse/username/*Type.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/username/*Struct.class"/>
<include name="org/jboss/test/ws/jaxrpc/wsse/username/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/wsse/username/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/username/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -2094,122 +2095,122 @@
</jar>
<!-- jaxrpc-xop-doclit without handlers -->
- <war warfile="${build.test.dir}/libs/jaxrpc-xop-doclit.war" webxml="${build.test.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-xop-doclit.war" webxml="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-xop-doclit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-xop-doclit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-xop-doclit with handlers -->
- <war warfile="${build.test.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${build.test.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF">
<include name="webservices.xml"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-xop-doclit_handler-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-xop-doclit_handler-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-xop-rpclit without handlers -->
- <war warfile="${build.test.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${build.test.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-xop-rpclit-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-xop-rpclit-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
<!-- jaxrpc-xop-rpclit with handlers -->
- <war warfile="${build.test.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${build.test.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF">
<include name="webservices.xml"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/>
<include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/>
<exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -19,29 +19,29 @@
<target name="build-jars" description="Build the jaxws deployments" if="HAVE_JDK_1.5">
<!-- jaxws-jbws860 -->
- <war warfile="${build.test.dir}/libs/jaxws-jbws860.war" webxml="${build.test.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jbws860.war" webxml="${build.tests.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws860/*.class"/>
<exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/jbws860/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/jbws860/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
</war>
<!-- jaxws-jbws871 -->
- <war warfile="${build.test.dir}/libs/jaxws-jbws871-rpc.war" webxml="${build.test.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jbws871-rpc.war" webxml="${build.tests.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/>
</classes>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-jbws871-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-jbws871-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"/>
<include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jbws871/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jbws871/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -50,17 +50,17 @@
</jar>
<!-- jaxws-jbws944 -->
- <jar jarfile="${build.test.dir}/libs/jaxws-jbws944.ejb3">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jbws944.ejb3">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/>
<include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/>
</fileset>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-jbws944-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jbws944-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws944/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jbws944/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jbws944/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -69,17 +69,17 @@
</jar>
<!-- jaxws-jbws981 -->
- <jar destfile="${build.test.dir}/libs/jaxws-jbws981.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-jbws981.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/>
<include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/>
</fileset>
</jar>
- <jar destfile="${build.test.dir}/libs/jaxws-jbws981-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-jbws981-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jbws981/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jbws981/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -88,22 +88,22 @@
</jar>
<!-- jaxws-jbws1123 -->
- <war destfile="${build.test.dir}/libs/jaxws-jbws1123.war" webxml="${build.test.dir}/resources/jaxws/jbws1123/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxws-jbws1123.war" webxml="${build.tests.dir}/resources/jaxws/jbws1123/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws1123/MessageBean.class"/>
</classes>
</war>
<!-- jaxws-jbws1178 -->
- <war destfile="${build.test.dir}/libs/jaxws-jbws1178.war" webxml="${build.test.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxws-jbws1178.war" webxml="${build.tests.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/>
</classes>
</war>
<!-- jaxws-jbws1190 -->
- <war destfile="${build.test.dir}/libs/jaxws-jbws1190.war" webxml="${build.test.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war destfile="${build.tests.dir}/libs/jaxws-jbws1190.war" webxml="${build.tests.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/>
@@ -112,35 +112,35 @@
</war>
<!-- jaxws-jsr181-complex -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-complex.war" webxml="${build.test.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-complex.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/complex/*.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/complex/extra/*.class"/>
</classes>
</war>
<!-- jaxws-jsr181-handlerchain -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-handlerchain.war" webxml="${build.test.dir}/resources/jaxws/jsr181/handlerchain/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-handlerchain.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/handlerchain/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/EndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/Endpoint.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/*Handler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/jsr181/handlerchain/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/jsr181/handlerchain/WEB-INF">
<include name="jaxws-handlers.xml"/>
</webinf>
</war>
<!-- jaxws-jsr181-oneway -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-oneway.war" webxml="${build.test.dir}/resources/jaxws/jsr181/oneway/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-oneway.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/oneway/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/oneway/PingEndpointImpl.class"/>
</classes>
</war>
<!-- jaxws-jsr181-soapbinding -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-soapbinding.war" webxml="${build.test.dir}/resources/jaxws/jsr181/soapbinding/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-soapbinding.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/soapbinding/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocBareImpl.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedImpl.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleService.class"/>
@@ -152,15 +152,15 @@
</war>
<!-- jaxws-jsr181-webmethod -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-webmethod.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webmethod/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webmethod.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webmethod/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webmethod/MyWebService.class"/>
</classes>
</war>
<!-- jaxws-jsr181-webparam -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-webparam.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webparam/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webparam.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webparam/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingService.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingDocument*.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webparam/SecurityHeader.class"/>
@@ -168,8 +168,8 @@
</war>
<!-- jaxws-jsr181-webresult -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-webresult.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webresult/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webresult.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webresult/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webresult/CustomerService.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webresult/CustomerRecord.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webresult/USAddress.class"/>
@@ -177,87 +177,87 @@
</war>
<!-- jaxws-jsr181-webservice -->
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-webservice01.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webservice/WEB-INF01/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webservice01.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF01/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean01.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/WEB-INF01">
+ <webinf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF01">
<include name="jboss-web.xml"/>
</webinf>
</war>
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-webservice02.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webservice/WEB-INF02/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webservice02.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF02/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean02.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/WEB-INF02">
+ <webinf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF02">
<include name="jboss-web.xml"/>
<include name="wsdl/**"/>
</webinf>
</war>
- <war warfile="${build.test.dir}/libs/jaxws-jsr181-webservice03.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webservice/WEB-INF03/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webservice03.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF03/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean03.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/WEB-INF03">
+ <webinf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF03">
<include name="jboss-web.xml"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice01.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice01.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean01.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/META-INF01">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF01">
<include name="ejb-jar.xml"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice02.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice02.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean02.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/META-INF02">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF02">
<include name="ejb-jar.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice03.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice03.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean03.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/META-INF03">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF03">
<include name="ejb-jar.xml"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice01.ejb3">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice01.ejb3">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean01.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/>
</fileset>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice02.ejb3">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice02.ejb3">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean02.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/META-INF02">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF02">
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice03.ejb3">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice03.ejb3">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean03.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/>
</fileset>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF">
<include name="application-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="jboss-client.xml"/>
@@ -266,21 +266,21 @@
</jar>
<!-- jaxws-samples-jsr181ejb -->
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181ejb.ejb3">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181ejb.ejb3">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/>
<include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
<include name="jboss-wsse-server.xml"/>
<include name="wsse.*"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181ejb-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181ejb-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -291,16 +291,16 @@
</jar>
<!-- jaxws-samples-jsr181pojo -->
- <war warfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${build.test.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/>
</classes>
</war>
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181pojo/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -309,22 +309,22 @@
</jar>
<!-- jaxws-samples-wsaddressing -->
- <war warfile="${build.test.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${build.test.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${build.tests.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/samples/wsaddressing/WEB-INF">
<include name="jaxws-handlers.xml"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-samples-wsaddressing-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-samples-wsaddressing-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/wsaddressing/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/samples/wsaddressing/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jbossws-client-config.xml"/>
@@ -334,20 +334,20 @@
</jar>
<!-- jaxws-wsaddressing-action -->
- <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${build.tests.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/jaxws/wsaddressing/action/META-INF">
+ <webinf dir="${build.tests.dir}/resources/jaxws/wsaddressing/action/META-INF">
<include name="wsdl/**"/>
</webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/wsaddressing/action/META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/wsaddressing/action/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jbossws-client-config.xml"/>
@@ -357,59 +357,59 @@
</jar>
<!-- jaxws-wsaddressing-replyto -->
- <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
</classes>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-wsaddressing-initial-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-wsaddressing-initial-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxws-jbossws-client-config.xml"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
- <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
</classes>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-wsaddressing-replyto-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jbossws-client-config.xml"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
- <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
+ <war warfile="${build.tests.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml">
+ <classes dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/>
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
</classes>
</war>
- <jar destfile="${build.test.dir}/libs/jaxws-wsaddressing-faultto-client.jar">
- <fileset dir="${build.test.dir}/classes">
+ <jar destfile="${build.tests.dir}/libs/jaxws-wsaddressing-faultto-client.jar">
+ <fileset dir="${build.tests.dir}/classes">
<include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF">
+ <metainf dir="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jbossws-client-config.xml"/>
Modified: branches/jbossws-1.0/src/test/build.xml
===================================================================
--- branches/jbossws-1.0/src/test/build.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/test/build.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -22,7 +22,7 @@
<property name="build.dir" value="${basedir}/output"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.resources.dir" value="${build.dir}/resources"/>
- <property name="build.test.dir" value="${build.dir}/tests"/>
+ <property name="build.tests.dir" value="${build.dir}/tests"/>
<property name="test.dir" value="${basedir}/src/test"/>
<property name="test.etc.dir" value="${test.dir}/etc"/>
<property name="test.java.dir" value="${test.dir}/java"/>
@@ -99,8 +99,8 @@
<fail message="Not available: ${jboss.home}/client/jbossall-client.jar" unless="jbossws.available"/>
- <mkdir dir="${build.test.dir}/log"/>
- <touch file="${build.test.dir}/logtest.log"/>
+ <mkdir dir="${build.tests.dir}/log"/>
+ <touch file="${build.tests.dir}/logtest.log"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
@@ -226,8 +226,8 @@
<target name="compile" depends="compile14, compile15" description="Compile sources"/>
<target name="compile14" depends="init" unless="HAVE_JDK_1.5">
- <mkdir dir="${build.test.dir}/classes"/>
- <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <mkdir dir="${build.tests.dir}/classes"/>
+ <javac destdir="${build.tests.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${test.java.dir}"/>
<exclude name="org/jboss/test/ws/interop/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
@@ -238,8 +238,8 @@
</target>
<target name="compile15" depends="init" if="HAVE_JDK_1.5">
- <mkdir dir="${build.test.dir}/classes"/>
- <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <mkdir dir="${build.tests.dir}/classes"/>
+ <javac destdir="${build.tests.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${test.java.dir}"/>
<exclude name="org/jboss/test/ws/interop/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
@@ -249,19 +249,19 @@
</target>
<target name="compile-generated" depends="init" description="Compile generated sources">
- <mkdir dir="${build.test.dir}/classes"/>
- <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <src path="${build.test.dir}/wstools/java"/>
+ <mkdir dir="${build.tests.dir}/classes"/>
+ <javac destdir="${build.tests.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <src path="${build.tests.dir}/wstools/java"/>
<exclude name="org/jboss/test/ws/interop/**"/>
<classpath refid="javac.classpath"/>
</javac>
</target>
<target name="copy-resources" depends="init" description="Copy the deployment resources.">
- <copy todir="${build.test.dir}/classes" file="${test.etc.dir}/jndi.properties"/>
- <copy todir="${build.test.dir}/classes" file="${test.etc.dir}/log4j.xml"/>
+ <copy todir="${build.tests.dir}/classes" file="${test.etc.dir}/jndi.properties"/>
+ <copy todir="${build.tests.dir}/classes" file="${test.etc.dir}/log4j.xml"/>
<!-- Copy resources -->
- <copy todir="${build.test.dir}/resources">
+ <copy todir="${build.tests.dir}/resources">
<fileset dir="${test.resources.dir}">
<include name="**/*.wsdl"/>
<include name="**/*.xml"/>
@@ -269,10 +269,11 @@
</fileset>
<filterset>
<filter token="jbosstest.host.name" value="${node0}"/>
+ <filter token="wsdl-publish-location" value="${build.tests.dir}/wsdl-publish"/>
</filterset>
</copy>
<!-- Copy binary files -->
- <copy todir="${build.test.dir}/resources">
+ <copy todir="${build.tests.dir}/resources">
<fileset dir="${test.resources.dir}">
<exclude name="**/*.wsdl"/>
<exclude name="**/*.xml"/>
@@ -285,8 +286,8 @@
<!-- ================================================================== -->
<target name="main" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="Build the deployments.">
- <mkdir dir="${build.test.dir}/reports"/>
- <mkdir dir="${build.test.dir}/libs"/>
+ <mkdir dir="${build.tests.dir}/reports"/>
+ <mkdir dir="${build.tests.dir}/libs"/>
<ant antfile="${test.dir}/ant/build-jars-jaxrpc.xml" target="build-jars" inheritall="true"/>
<ant antfile="${test.dir}/ant/build-jars-jaxws.xml" target="build-jars" inheritall="true"/>
</target>
@@ -295,62 +296,62 @@
Generate samples sources
-->
<target name="generate-sources" depends="compile" description="Generate the deployment resources.">
- <mkdir dir="${build.test.dir}/libs"/>
- <zip destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
- <fileset dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
+ <mkdir dir="${build.tests.dir}/libs"/>
+ <zip destfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
+ <fileset dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
</zip>
<taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask">
<classpath refid="jbpmbpel.classpath" />
</taskdef>
- <servicegen processfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
- outputdir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" />
+ <servicegen processfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"
+ outputdir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" />
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
<classpath refid="jbossws.client.classpath"/>
- <classpath location="${build.test.dir}/classes"/>
- <classpath location="${build.test.dir}"/>
+ <classpath location="${build.tests.dir}/classes"/>
+ <classpath location="${build.tests.dir}"/>
</taskdef>
- <mkdir dir="${build.test.dir}/wstools/java"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws718/wstools-config.xml"/>
- <!--wstools dest="${build.test.dir}/wstools/resources/jaxrpc/jbws958/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws958/wstools-config.xml"/-->
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${test.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${test.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml" />
- <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181ejb/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/wstools-config.xml"/>
- <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/>
+ <mkdir dir="${build.tests.dir}/wstools/java"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws718/wstools-config.xml"/>
+ <!--wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/jbws958/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws958/wstools-config.xml"/-->
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${test.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${test.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml" />
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181ejb/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/wstools-config.xml"/>
+ <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/>
- <move todir="${build.test.dir}/wstools/java">
- <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" includes="org/**"/>
- <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
- <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" includes="org/**"/>
+ <move todir="${build.tests.dir}/wstools/java">
+ <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" includes="org/**"/>
+ <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
+ <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" includes="org/**"/>
</move>
</target>
<target name="copy-generated" depends="init" description="Copy the deployment resources.">
<!-- Copy generated resources -->
- <copy todir="${build.test.dir}/resources">
- <fileset dir="${build.test.dir}/wstools/resources">
+ <copy todir="${build.tests.dir}/resources">
+ <fileset dir="${build.tests.dir}/wstools/resources">
<include name="**/*.wsdl"/>
<include name="**/*.xml"/>
</fileset>
</copy>
<!-- Copy resources that cannot (yet) be generated -->
- <copy todir="${build.test.dir}/resources/jaxrpc/samples" overwrite="true">
+ <copy todir="${build.tests.dir}/resources/jaxrpc/samples" overwrite="true">
<fileset dir="${test.resources.dir}/jaxrpc/samples-override"/>
<filterset>
<filter token="jbosstest.host.name" value="${node0}"/>
@@ -418,14 +419,14 @@
<!-- Common test target -->
<target name="tests-main" depends="init">
- <junit printsummary="yes" showoutput="yes" dir="${build.test.dir}">
+ <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}">
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="java.security.policy" value="${test.etc.dir}/tst.policy"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
<sysproperty key="tomcat.home" value="${tomcat.home}"/>
<sysproperty key="jbosstest.host.name" value="${node0}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="build.testlog" value="${build.test.dir}/log"/>
+ <sysproperty key="build.testlog" value="${build.tests.dir}/log"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/>
@@ -440,12 +441,12 @@
<sysproperty key="client.scenario" value="${client.scenario}"/>
<classpath>
<path refid="test.client.classpath"/>
- <pathelement location="${build.test.dir}/classes"/>
+ <pathelement location="${build.tests.dir}/classes"/>
</classpath>
<formatter type="plain" usefile="true"/>
<formatter type="xml" usefile="true"/>
- <batchtest todir="${build.test.dir}/reports" fork="true">
- <fileset dir="${build.test.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/>
+ <batchtest todir="${build.tests.dir}/reports" fork="true">
+ <fileset dir="${build.tests.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/>
</batchtest>
</junit>
</target>
@@ -455,7 +456,7 @@
ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test
-->
<target name="one-test" depends="init" if="test" description="Run a single unit test">
- <junit printsummary="yes" showoutput="yes" dir="${build.test.dir}">
+ <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}">
<jvmarg line="${remote.debug.line}"/>
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="java.security.policy" value="${test.etc.dir}/tst.policy"/>
@@ -463,7 +464,7 @@
<sysproperty key="tomcat.home" value="${tomcat.home}"/>
<sysproperty key="jbosstest.host.name" value="${node0}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="build.testlog" value="${build.test.dir}/log"/>
+ <sysproperty key="build.testlog" value="${build.tests.dir}/log"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/>
@@ -489,11 +490,11 @@
<sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/>
<classpath>
<path refid="test.client.classpath"/>
- <pathelement location="${build.test.dir}/classes"/>
+ <pathelement location="${build.tests.dir}/classes"/>
</classpath>
<formatter type="plain" usefile="true"/>
<formatter type="xml" usefile="true"/>
- <test todir="${build.test.dir}/reports" name="${test}" fork="true"/>
+ <test todir="${build.tests.dir}/reports" name="${test}" fork="true"/>
</junit>
</target>
@@ -503,14 +504,14 @@
<!-- Build the tests report -->
<target name="tests-report" depends="init" description="Build the tests report">
- <junitreport todir="${build.test.dir}/reports">
- <fileset dir="${build.test.dir}/reports">
+ <junitreport todir="${build.tests.dir}/reports">
+ <fileset dir="${build.tests.dir}/reports">
<include name="TEST-*.xml"/>
</fileset>
- <report format="frames" todir="${build.test.dir}/reports/html"/>
+ <report format="frames" todir="${build.tests.dir}/reports/html"/>
</junitreport>
- <zip destfile="${build.test.dir}/test-report-${build.id}.zip">
- <fileset dir="${build.test.dir}" includes="reports/**"/>
+ <zip destfile="${build.tests.dir}/test-report-${build.id}.zip">
+ <fileset dir="${build.tests.dir}" includes="reports/**"/>
</zip>
</target>
@@ -519,7 +520,7 @@
<!-- ================================================================== -->
<target name="clean" description="Delete all generated test files.">
- <delete dir="${build.test.dir}"/>
+ <delete dir="${build.tests.dir}"/>
</target>
</project>
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.java 2006-11-14 23:06:21 UTC (rev 1430)
@@ -21,16 +21,18 @@
*/
package org.jboss.test.ws.jaxrpc.samples.mtom;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
import java.io.File;
-import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
import java.net.URL;
+import javax.activation.DataHandler;
import javax.naming.InitialContext;
import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
import javax.xml.rpc.Stub;
import javax.xml.transform.stream.StreamSource;
-import javax.activation.DataHandler;
import junit.framework.Test;
@@ -38,7 +40,6 @@
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.ws.jaxrpc.ServiceFactoryImpl;
import org.jboss.ws.jaxrpc.StubExt;
-import org.jboss.ws.utils.IOUtils;
/**
* Test SOAP with XOP through the JAXRPC dynamic proxy layer.
@@ -108,7 +109,8 @@
assertNotNull(employee.getLegacyData());
StreamSource xmlStream = (StreamSource)employee.getLegacyData().getContent();
- IOUtils.copyStream(System.out, xmlStream.getInputStream());
+ String content = new BufferedReader(new InputStreamReader(xmlStream.getInputStream())).readLine();
+ assertEquals("<Payroll><Data/></Payroll>", content);
}
private DataHandler getLegacyData()
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss-client.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/TestServiceEJB</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-jsr109ejb-rpc?wsdl</wsdl-override>
+ <wsdl-override>file:@wsdl-publish-location@/jsr109ejb/TestService.wsdl</wsdl-override>
</service-ref>
</jboss-client>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -3,6 +3,12 @@
<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
+
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-publish-location>file:@wsdl-publish-location@/jsr109ejb</wsdl-publish-location>
+ </webservice-description>
+
<enterprise-beans>
<session>
<ejb-name>TestService</ejb-name>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2006-11-14 21:10:50 UTC (rev 1429)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF/jboss-client.xml 2006-11-14 23:06:21 UTC (rev 1430)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/TestServiceJSE</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-jsr109pojo-rpc?wsdl</wsdl-override>
+ <wsdl-override>file:@wsdl-publish-location@/jsr109pojo/TestService.wsdl</wsdl-override>
</service-ref>
</jboss-client>
17 years, 7 months
- 1
- 0
JBossWS SVN: r1429 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/integration/jboss test/java/org/jboss/test/ws/jaxrpc/samples/handler test/resources/jaxrpc/samples/handler test/resources/jaxrpc/samples/handler/META-INF test/resources/jaxrpc/samples-override/handler/WEB-INF
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-14 16:10:50 -0500 (Tue, 14 Nov 2006)
New Revision: 1429
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.java
branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/handler/WEB-INF/webservices.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/samples/handler/META-INF/application-client.xml
branches/jbossws-1.0/src/test/resources/jaxrpc/samples/handler/wstools-config.xml
Log:
Fix handler init params
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java 2006-11-14 20:09:42 UTC (rev 1428)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/ServiceRefMetaDataAdaptor.java 2006-11-14 21:10:50 UTC (rev 1429)
@@ -24,15 +24,15 @@
// $Id: ServiceRefMetaDataAdaptor.java 906 2006-09-06 18:57:40Z thomas.diesler(a)jboss.com $
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.LinkedHashMap;
+import javax.xml.namespace.QName;
+
import org.jboss.webservice.metadata.serviceref.HandlerMetaData;
import org.jboss.webservice.metadata.serviceref.InitParamMetaData;
import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData;
import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
import org.jboss.ws.metadata.HandlerMetaData.HandlerInitParam;
-import org.jboss.ws.metadata.HandlerMetaData.HandlerType;
import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData;
import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
@@ -71,13 +71,11 @@
UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null);
uhmd.setHandlerName(hmd.getHandlerName());
uhmd.setHandlerClass(hmd.getHandlerClass());
- Arrays.asList(hmd.getSoapHeaders());
for(String portname : hmd.getPortNames())
{
uhmd.addPortName(portname);
}
-
for (InitParamMetaData ipmd : hmd.getInitParams())
{
HandlerInitParam ip = new HandlerInitParam();
@@ -85,6 +83,14 @@
ip.setParamValue(ipmd.getParamValue());
uhmd.addInitParam(ip);
}
+ for (QName soapHeader : hmd.getSoapHeaders())
+ {
+ uhmd.addSoapHeader(soapHeader);
+ }
+ for (String soapRole : hmd.getSoapRoles())
+ {
+ uhmd.addSoapRole(soapRole);
+ }
handlers.add(uhmd);
}
usrmd.setHandlers(handlers);
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java 2006-11-14 20:09:42 UTC (rev 1428)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.java 2006-11-14 21:10:50 UTC (rev 1429)
@@ -24,6 +24,7 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.JAXRPCException;
import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.HandlerInfo;
import javax.xml.rpc.handler.MessageContext;
import javax.xml.rpc.handler.soap.SOAPMessageContext;
import javax.xml.soap.SOAPBody;
@@ -35,28 +36,36 @@
import org.jboss.logging.Logger;
+import sun.reflect.ReflectionFactory.GetReflectionFactoryAction;
+
public class ClientSideHandler extends GenericHandler
{
// Provide logging
private static Logger log = Logger.getLogger(ClientSideHandler.class);
- protected QName[] headers = new QName[]{
- new QName("http://somens", "InHeader"),
- new QName("http://somens", "OutHeader"),
- new QName("http://somens", "InOutHeader")
- };
+ protected QName[] headers;
public QName[] getHeaders()
{
return headers;
}
+ public void init(HandlerInfo info)
+ {
+ log.info("init: " + info);
+ headers = info.getHeaders();
+ }
+
public boolean handleRequest(MessageContext msgContext)
{
log.info("handleRequest");
+ QName[] headers = getHeaders();
+ if (headers == null || headers.length != 3)
+ throw new IllegalStateException("Invalid number of headers");
+
try
- {
+ {
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
SOAPHeader soapHeader = soapMessage.getSOAPHeader();
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.java 2006-11-14 20:09:42 UTC (rev 1428)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.java 2006-11-14 21:10:50 UTC (rev 1429)
@@ -24,6 +24,7 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.JAXRPCException;
import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.HandlerInfo;
import javax.xml.rpc.handler.MessageContext;
import javax.xml.rpc.handler.soap.SOAPMessageContext;
import javax.xml.soap.Name;
@@ -42,21 +43,27 @@
// Provide logging
private static Logger log = Logger.getLogger(ServerSideHandler.class);
- protected QName[] headers = new QName[]{
- new QName("http://somens", "InHeader"),
- new QName("http://somens", "OutHeader"),
- new QName("http://somens", "InOutHeader")
- };
+ protected QName[] headers;
public QName[] getHeaders()
{
return headers;
}
+ public void init(HandlerInfo info)
+ {
+ log.info("init: " + info);
+ headers = info.getHeaders();
+ }
+
public boolean handleRequest(MessageContext msgContext)
{
log.info("handleRequest");
+ QName[] headers = getHeaders();
+ if (headers == null || headers.length != 3)
+ throw new IllegalStateException("Invalid number of headers");
+
try
{
SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/handler/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/handler/META-INF/application-client.xml 2006-11-14 20:09:42 UTC (rev 1428)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/handler/META-INF/application-client.xml 2006-11-14 21:10:50 UTC (rev 1429)
@@ -18,6 +18,18 @@
<handler>
<handler-name>HeaderTestHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.samples.handler.ClientSideHandler</handler-class>
+ <init-param>
+ <param-name>ClientParam1</param-name>
+ <param-value>value1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ClientParam2</param-name>
+ <param-value>value2</param-value>
+ </init-param>
+ <soap-header xmlns:ns1='http://somens'>ns1:InHeader</soap-header>
+ <soap-header xmlns:ns1='http://somens'>ns1:OutHeader</soap-header>
+ <soap-header xmlns:ns1='http://somens'>ns1:InOutHeader</soap-header>
+ <soap-role>role1</soap-role>
</handler>
</service-ref>
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/handler/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/handler/wstools-config.xml 2006-11-14 20:09:42 UTC (rev 1428)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/handler/wstools-config.xml 2006-11-14 21:10:50 UTC (rev 1429)
@@ -34,5 +34,17 @@
<handler>
<handler-name>HeaderTestHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.samples.handler.HeaderTestHandler</handler-class>
+ <init-param>
+ <param-name>ServerParam1</param-name>
+ <param-value>value1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ServerParam2</param-name>
+ <param-value>value2</param-value>
+ </init-param>
+ <soap-header xmlns:ns1='http://somens'>ns1:InHeader</soap-header>
+ <soap-header xmlns:ns1='http://somens'>ns1:OutHeader</soap-header>
+ <soap-header xmlns:ns1='http://somens'>ns1:InOutHeader</soap-header>
+ <soap-role>role1</soap-role>
</handler>
-->
Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/handler/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/handler/WEB-INF/webservices.xml 2006-11-14 20:09:42 UTC (rev 1428)
+++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples-override/handler/WEB-INF/webservices.xml 2006-11-14 21:10:50 UTC (rev 1429)
@@ -13,6 +13,18 @@
<handler>
<handler-name>HeaderTestHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.samples.handler.ServerSideHandler</handler-class>
+ <init-param>
+ <param-name>ServerParam1</param-name>
+ <param-value>value1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ServerParam2</param-name>
+ <param-value>value2</param-value>
+ </init-param>
+ <soap-header xmlns:ns1='http://somens'>ns1:InHeader</soap-header>
+ <soap-header xmlns:ns1='http://somens'>ns1:OutHeader</soap-header>
+ <soap-header xmlns:ns1='http://somens'>ns1:InOutHeader</soap-header>
+ <soap-role>role1</soap-role>
</handler>
</port-component>
</webservice-description>
17 years, 7 months
- 1
- 0
JBossWS SVN: r1428 - branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-14 15:09:42 -0500 (Tue, 14 Nov 2006)
New Revision: 1428
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java
Log:
Add Serializable
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java 2006-11-14 19:58:59 UTC (rev 1427)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java 2006-11-14 20:09:42 UTC (rev 1428)
@@ -167,8 +167,10 @@
handlerClass = getHandlerClass();
}
- public static class HandlerInitParam
+ public static class HandlerInitParam implements Serializable
{
+ private static final long serialVersionUID = -8687875291620457318L;
+
// The required <handler-name> element
private String paramName;
// The required <handler-class> element
17 years, 7 months
- 1
- 0
JBossWS SVN: r1427 - in branches/jbossws-1.0/src/main: java/org/jboss/ws/common java/org/jboss/ws/metadata resources/schema
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2006-11-14 14:58:59 -0500 (Tue, 14 Nov 2006)
New Revision: 1427
Modified:
branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java
branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
branches/jbossws-1.0/src/main/resources/schema/jaxrpc-config_2_0.xsd
Log:
Disable MTOM for rpc/encoded
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java 2006-11-14 18:57:35 UTC (rev 1426)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java 2006-11-14 19:58:59 UTC (rev 1427)
@@ -58,7 +58,9 @@
import org.jboss.ws.binding.UnboundHeader;
import org.jboss.ws.jaxrpc.ParameterWrapping;
import org.jboss.ws.jaxrpc.SOAPFaultExceptionHelper;
+import org.jboss.ws.jaxrpc.StubExt;
import org.jboss.ws.jaxrpc.Style;
+import org.jboss.ws.jaxrpc.Use;
import org.jboss.ws.metadata.OperationMetaData;
import org.jboss.ws.metadata.ParameterMetaData;
import org.jboss.ws.metadata.TypesMetaData;
@@ -134,6 +136,10 @@
if (msgContext == null)
throw new WSException("MessageContext not available");
+ // Disable MTOM for rpc/encoded
+ if (opMetaData.isRPCEncoded())
+ msgContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
// Associate current message with message context
SOAPMessageImpl reqMessage = (SOAPMessageImpl)createMessage(opMetaData);
msgContext.setSOAPMessage(reqMessage);
@@ -277,6 +283,10 @@
if (msgContext == null)
throw new WSException("MessageContext not available");
+ // Disable MTOM for rpc/encoded
+ if (opMetaData.isRPCEncoded())
+ msgContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
// Get the namespace registry
NamespaceRegistry namespaceRegistry = msgContext.getNamespaceRegistry();
@@ -389,6 +399,10 @@
if (msgContext == null)
throw new WSException("MessageContext not available");
+ // Disable MTOM for rpc/encoded
+ if (opMetaData.isRPCEncoded())
+ msgContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
// Associate current message with message context
SOAPMessageImpl resMessage = (SOAPMessageImpl)createMessage(opMetaData);
msgContext.setSOAPMessage(resMessage);
@@ -541,6 +555,10 @@
if (msgContext == null)
throw new WSException("MessageContext not available");
+ // Disable MTOM for rpc/encoded
+ if (opMetaData.isRPCEncoded())
+ msgContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
+
SOAPHeader soapHeader = soapEnvelope.getHeader();
SOAPBody soapBody = soapEnvelope.getBody();
Iterator bodyChildren = soapBody.getChildElements();
Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-14 18:57:35 UTC (rev 1426)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-11-14 19:58:59 UTC (rev 1427)
@@ -142,6 +142,11 @@
return getStyle() == Style.RPC && getUse() == Use.LITERAL;
}
+ public boolean isRPCEncoded()
+ {
+ return getStyle() == Style.RPC && getUse() == Use.ENCODED;
+ }
+
public boolean isDocumentBare()
{
return getStyle() == Style.DOCUMENT && getParameterStyle() == ParameterStyle.BARE;
Modified: branches/jbossws-1.0/src/main/resources/schema/jaxrpc-config_2_0.xsd
===================================================================
--- branches/jbossws-1.0/src/main/resources/schema/jaxrpc-config_2_0.xsd 2006-11-14 18:57:35 UTC (rev 1426)
+++ branches/jbossws-1.0/src/main/resources/schema/jaxrpc-config_2_0.xsd 2006-11-14 19:58:59 UTC (rev 1427)
@@ -1,78 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:jboss:jaxrpc-config:2.0"
- xmlns:tns="urn:jboss:jaxrpc-config:2.0"
- xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb"
- xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
-
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:jboss:jaxrpc-config:2.0" xmlns:tns="urn:jboss:jaxrpc-config:2.0"
+ xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+ attributeFormDefault="unqualified" version="1.1">
+
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
This is the schema definition for JBossWS configurations JAXRPC.
It relies on the handler definitions that are part of the standard J2EE-1.4 deployment descriptors.
]]>
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:import namespace="http://java.sun.com/xml/ns/j2ee" schemaLocation="j2ee_web_services_1_1.xsd"/>
-
- <xsd:complexType name="jaxrpcConfigType">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.ws.metadata.config.WSConfig"/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:choice>
- <xsd:element name="endpoint-config" type="tns:endpointConfigType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="client-config" type="tns:clientConfigType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:choice>
- </xsd:complexType>
-
- <xsd:element name="jaxrpc-config" type="tns:jaxrpcConfigType"/>
-
- <xsd:complexType name="endpointConfigType">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.ws.metadata.config.WSEndpointConfig"/>
- </xsd:appinfo>
- </xsd:annotation>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:import namespace="http://java.sun.com/xml/ns/j2ee" schemaLocation="j2ee_web_services_1_1.xsd"/>
+
+ <xsd:complexType name="jaxrpcConfigType">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.ws.metadata.config.WSConfig"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:choice>
+ <xsd:element name="endpoint-config" type="tns:endpointConfigType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="client-config" type="tns:clientConfigType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:choice>
+ </xsd:complexType>
+
+ <xsd:element name="jaxrpc-config" type="tns:jaxrpcConfigType"/>
+
+ <xsd:complexType name="endpointConfigType">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.ws.metadata.config.WSEndpointConfig"/>
+ </xsd:appinfo>
+ </xsd:annotation>
<xsd:complexContent>
<xsd:extension base="tns:commonConfigType"/>
</xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="clientConfigType">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.ws.metadata.config.WSClientConfig"/>
- </xsd:appinfo>
- </xsd:annotation>
+ </xsd:complexType>
+
+ <xsd:complexType name="clientConfigType">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.ws.metadata.config.WSClientConfig"/>
+ </xsd:appinfo>
+ </xsd:annotation>
<xsd:complexContent>
<xsd:extension base="tns:commonConfigType"/>
</xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="commonConfigType">
- <xsd:sequence>
- <xsd:element name="config-name" type="xsd:string"/>
- <xsd:element name="pre-handler-chain" type="tns:handlerChainType" minOccurs="0"/>
- <xsd:element name="post-handler-chain" type="tns:handlerChainType" minOccurs="0"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="handlerChainType">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.ws.metadata.config.WSHandlerChainConfig"/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="handler-chain-name" type="xsd:string"/>
- <xsd:element name="handler" type="j2ee:port-component_handlerType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
-
+ </xsd:complexType>
+
+ <xsd:complexType name="commonConfigType">
+ <xsd:sequence>
+ <xsd:element name="config-name" type="xsd:string"/>
+ <xsd:element name="pre-handler-chain" type="tns:handlerChainType" minOccurs="0"/>
+ <xsd:element name="post-handler-chain" type="tns:handlerChainType" minOccurs="0"/>
+ <xsd:element name="property" type="tns:propertyType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="handlerChainType">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.ws.metadata.config.WSHandlerChainConfig"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="handler-chain-name" type="xsd:string"/>
+ <xsd:element name="handler" type="j2ee:port-component_handlerType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="propertyType">
+ <xsd:sequence>
+ <xsd:element name="property-name" type="xsd:string"/>
+ <xsd:element name="property-value" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
</xsd:schema>
\ No newline at end of file
17 years, 7 months
- 1
- 0