[jboss-svn-commits] JBossWS SVN: r1124 - in branches/tdiesler/jbossws-1.0: . src src/ant src/main/java/org/jboss/ws/integration/tomcat src/main/resources/samples src/main/resources/samples/common src/main/resources/samples/jaxrpc 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/resources/samples/jaxrpc/jsr109pojo src/main/resources/samples/jaxrpc/message src/main/resources/samples/jaxrpc/mtom src/main/resources/samples/jaxrpc/oneway src/main/resources/samples/jaxrpc/rpcstyle src/main/resources/samples/jaxrpc/secureejb src/main/resources/samples/jaxrpc/swa src/main/resources/samples/jaxrpc/wsbpel src/main/resources/samples/jaxrpc/wseventing src/main/resources/samples/jaxrpc/wssecurity src/main/resources/samples/jaxws src! /main/resources/samples/jaxws/jsr181ejb src/main/resources/samples/jaxws/jsr181pojo src/main/resources/samples/jaxws/wsaddressing src/test src/test/ant src/test/resources/jaxws/samples/jsr181pojo
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 3 11:31:30 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-10-03 11:30:32 -0400 (Tue, 03 Oct 2006)
New Revision: 1124
Added:
branches/tdiesler/jbossws-1.0/src/ant/
branches/tdiesler/jbossws-1.0/src/ant/build-samples.xml
branches/tdiesler/jbossws-1.0/src/ant/build-thirdparty.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/docstyle/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/dynamichandler/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/exception/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/handler/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/holder/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jmstransport/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109ejb/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/message/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/oneway/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/rpcstyle/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/swa/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wseventing/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/jsr181ejb/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/jsr181pojo/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/wsaddressing/
Removed:
branches/tdiesler/jbossws-1.0/build-samples.xml
branches/tdiesler/jbossws-1.0/build-thirdparty.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/docstyle/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/dynamichandler/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/exception/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/handler/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/holder/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jmstransport/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jsr109ejb/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jsr109pojo/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jsr181ejb/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jsr181pojo/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/message/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/mtom/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/oneway/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/rpcstyle/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/secureejb/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/swa/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/wsaddressing/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/wsbpel/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/wseventing/
branches/tdiesler/jbossws-1.0/src/main/resources/samples/wssecurity/
branches/tdiesler/jbossws-1.0/src/test/resources/jaxws/samples/jsr181pojo/docwrapped/
Modified:
branches/tdiesler/jbossws-1.0/ant.properties.example
branches/tdiesler/jbossws-1.0/build.xml
branches/tdiesler/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java
branches/tdiesler/jbossws-1.0/src/main/resources/samples/ant.properties.example
branches/tdiesler/jbossws-1.0/src/main/resources/samples/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/common/imported-build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/docstyle/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/dynamichandler/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/exception/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/handler/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/holder/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jmstransport/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109ejb/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/message/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/oneway/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/rpcstyle/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/swa/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wseventing/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/jsr181ejb/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/jsr181pojo/build.xml
branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/wsaddressing/build.xml
branches/tdiesler/jbossws-1.0/src/test/ant/build-jars-jaxws.xml
branches/tdiesler/jbossws-1.0/src/test/build.xml
branches/tdiesler/jbossws-1.0/version.properties
Log:
Fix standalone samples
Modified: branches/tdiesler/jbossws-1.0/ant.properties.example
===================================================================
--- branches/tdiesler/jbossws-1.0/ant.properties.example 2006-10-03 13:57:34 UTC (rev 1123)
+++ branches/tdiesler/jbossws-1.0/ant.properties.example 2006-10-03 15:30:32 UTC (rev 1124)
@@ -6,13 +6,13 @@
#jboss.jdk15.home=/home/tdiesler/svn/jboss/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.GA-ejb3
# Optional JBoss Home
-#jboss.jdk14.home=/home/tdiesler/svn/jboss/jbossas/tags/JBoss_4_0_4_GA/build/output/jboss-4.0.4.GA
+#jboss.jdk14.home=/home/tdiesler/svn/jboss/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA
# The JBoss server instance
jboss.server.instance=default
# Tomcat Home
-#tomcat.home=d:/java/apache/apache-tomcat-5.5.17
+#tomcat.home=/usr/java/apache/apache-tomcat-5.5.17
#tomcat.manager.username=manager
#tomcat.manager.password=manager
Deleted: branches/tdiesler/jbossws-1.0/build-samples.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/build-samples.xml 2006-10-03 13:57:34 UTC (rev 1123)
+++ branches/tdiesler/jbossws-1.0/build-samples.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -1,317 +0,0 @@
-<?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.xml 434 2006-06-02 11:36:22Z thomas.diesler at jboss.com $ -->
-
-<project default="build-samples" name="JBossWS Samples">
-
- <!--
- | Build the samples
- -->
- <target name="build-samples" description="Builds the samples." depends="jars">
-
- <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}">
- <fileset dir="${src.samples.dir}">
- <include name="common/imported-build.xml"/>
- <include name="ant.properties.example"/>
- <include name="**/build.xml"/>
- </fileset>
- </copy>
-
- <!-- samples/common -->
- <mkdir dir="${build.src.samples.dir}/common/java"/>
- <mkdir dir="${build.src.samples.dir}/common/resources/overrides"/>
-
- <copy todir="${build.src.samples.dir}/common/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/*.java"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/common/resources">
- <fileset dir="${src.samples.dir}/common">
- <include name="jndi.properties"/>
- <include name="log4j.xml"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/common/resources/overrides">
- <fileset dir="${test.resources.dir}/samples-override"/>
- </copy>
-
- <!-- samples/docstyle -->
- <mkdir dir="${build.src.samples.dir}/docstyle/java"/>
- <mkdir dir="${build.src.samples.dir}/docstyle/resources"/>
-
- <copy todir="${build.src.samples.dir}/docstyle/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/docstyle/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/docstyle/resources">
- <fileset dir="${test.resources.dir}/samples/docstyle"/>
- </copy>
-
- <!-- samples/dynamichandler -->
- <mkdir dir="${build.src.samples.dir}/dynamichandler/java"/>
- <mkdir dir="${build.src.samples.dir}/dynamichandler/resources"/>
-
- <copy todir="${build.src.samples.dir}/dynamichandler/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/dynamichandler/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/dynamichandler/resources">
- <fileset dir="${test.resources.dir}/samples/dynamichandler"/>
- </copy>
-
- <!-- samples/exception -->
- <mkdir dir="${build.src.samples.dir}/exception/java"/>
- <mkdir dir="${build.src.samples.dir}/exception/resources"/>
-
- <copy todir="${build.src.samples.dir}/exception/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/exception/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/exception/resources">
- <fileset dir="${test.resources.dir}/samples/exception"/>
- </copy>
-
- <!-- samples/handler -->
- <mkdir dir="${build.src.samples.dir}/handler/java"/>
- <mkdir dir="${build.src.samples.dir}/handler/resources"/>
-
- <copy todir="${build.src.samples.dir}/handler/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/handler/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/handler/resources">
- <fileset dir="${test.resources.dir}/samples/handler"/>
- </copy>
-
- <!-- samples/holder -->
- <mkdir dir="${build.src.samples.dir}/holder/java"/>
- <mkdir dir="${build.src.samples.dir}/holder/resources"/>
-
- <copy todir="${build.src.samples.dir}/holder/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/holder/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/holder/resources">
- <fileset dir="${test.resources.dir}/samples/holder"/>
- </copy>
-
- <!-- samples/jmstransport -->
- <mkdir dir="${build.src.samples.dir}/jmstransport/java"/>
- <mkdir dir="${build.src.samples.dir}/jmstransport/resources"/>
-
- <copy todir="${build.src.samples.dir}/jmstransport/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/jmstransport/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jmstransport/resources">
- <fileset dir="${test.resources.dir}/samples/jmstransport"/>
- </copy>
-
- <!-- samples/jsr109ejb -->
- <mkdir dir="${build.src.samples.dir}/jsr109ejb/java"/>
- <mkdir dir="${build.src.samples.dir}/jsr109ejb/resources"/>
-
- <copy todir="${build.src.samples.dir}/jsr109ejb/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/jsr109ejb/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jsr109ejb/resources">
- <fileset dir="${test.resources.dir}/samples/jsr109ejb"/>
- </copy>
-
- <!-- samples/jsr109pojo -->
- <mkdir dir="${build.src.samples.dir}/jsr109pojo/java"/>
- <mkdir dir="${build.src.samples.dir}/jsr109pojo/resources"/>
-
- <copy todir="${build.src.samples.dir}/jsr109pojo/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/jsr109pojo/**/*"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jsr109pojo/resources">
- <fileset dir="${test.resources.dir}/samples/jsr109pojo"/>
- </copy>
-
- <!-- samples/jsr181ejb -->
- <mkdir dir="${build.src.samples.dir}/jsr181ejb/java"/>
- <mkdir dir="${build.src.samples.dir}/jsr181ejb/resources"/>
-
- <copy todir="${build.src.samples.dir}/jsr181ejb/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/jsr181ejb/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jsr181ejb/resources">
- <fileset dir="${test.resources.dir}/samples/jsr181ejb"/>
- </copy>
-
- <!-- samples/jsr181pojo -->
- <mkdir dir="${build.src.samples.dir}/jsr181pojo/java"/>
- <mkdir dir="${build.src.samples.dir}/jsr181pojo/resources"/>
-
- <copy todir="${build.src.samples.dir}/jsr181pojo/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/jsr181pojo/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/jsr181pojo/resources">
- <fileset dir="${test.resources.dir}/samples/jsr181pojo"/>
- </copy>
-
- <!-- samples/message -->
- <mkdir dir="${build.src.samples.dir}/message/java"/>
- <mkdir dir="${build.src.samples.dir}/message/resources"/>
-
- <copy todir="${build.src.samples.dir}/message/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/message/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/message/resources">
- <fileset dir="${test.resources.dir}/samples/message"/>
- </copy>
-
- <!-- samples/mtom -->
- <mkdir dir="${build.src.samples.dir}/mtom/java"/>
- <mkdir dir="${build.src.samples.dir}/mtom/resources"/>
-
- <copy todir="${build.src.samples.dir}/mtom/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/mtom/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/mtom/resources">
- <fileset dir="${test.resources.dir}/samples/mtom"/>
- </copy>
-
- <!-- samples/oneway -->
- <mkdir dir="${build.src.samples.dir}/oneway/java"/>
- <mkdir dir="${build.src.samples.dir}/oneway/resources"/>
-
- <copy todir="${build.src.samples.dir}/oneway/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/oneway/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/oneway/resources">
- <fileset dir="${test.resources.dir}/samples/oneway"/>
- </copy>
-
- <!-- samples/rpcstyle -->
- <mkdir dir="${build.src.samples.dir}/rpcstyle/java"/>
- <mkdir dir="${build.src.samples.dir}/rpcstyle/resources"/>
-
- <copy todir="${build.src.samples.dir}/rpcstyle/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/rpcstyle/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/rpcstyle/resources">
- <fileset dir="${test.resources.dir}/samples/rpcstyle"/>
- </copy>
-
- <!-- samples/secureejb -->
- <mkdir dir="${build.src.samples.dir}/secureejb/java"/>
- <mkdir dir="${build.src.samples.dir}/secureejb/resources"/>
-
- <copy todir="${build.src.samples.dir}/secureejb/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/secureejb/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/secureejb/resources">
- <fileset dir="${test.resources.dir}/samples/secureejb"/>
- </copy>
-
- <!-- samples/swa -->
- <mkdir dir="${build.src.samples.dir}/swa/java"/>
- <mkdir dir="${build.src.samples.dir}/swa/resources"/>
-
- <copy todir="${build.src.samples.dir}/swa/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/swa/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/swa/resources">
- <fileset dir="${test.resources.dir}/samples/swa"/>
- </copy>
-
- <!-- samples/wsaddressing -->
- <mkdir dir="${build.src.samples.dir}/wsaddressing/java"/>
- <mkdir dir="${build.src.samples.dir}/wsaddressing/resources"/>
-
- <copy todir="${build.src.samples.dir}/wsaddressing/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/wsaddressing/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/wsaddressing/resources">
- <fileset dir="${test.resources.dir}/samples/wsaddressing"/>
- </copy>
-
- <!-- samples/wsbpel -->
- <mkdir dir="${build.src.samples.dir}/wsbpel/java"/>
- <mkdir dir="${build.src.samples.dir}/wsbpel/resources"/>
-
- <copy todir="${build.src.samples.dir}/wsbpel/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/wsbpel/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/wsbpel/resources">
- <fileset dir="${test.resources.dir}/samples/wsbpel" />
- </copy>
-
- <!-- samples/wseventing -->
- <mkdir dir="${build.src.samples.dir}/wseventing/java"/>
- <mkdir dir="${build.src.samples.dir}/wseventing/resources"/>
-
- <copy todir="${build.src.samples.dir}/wseventing/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/wseventing/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/wseventing/resources">
- <fileset dir="${test.resources.dir}/samples/wseventing"/>
- </copy>
-
- <!-- samples/wssecurity -->
- <mkdir dir="${build.src.samples.dir}/wssecurity/java"/>
- <mkdir dir="${build.src.samples.dir}/wssecurity/resources"/>
-
- <copy todir="${build.src.samples.dir}/wssecurity/java">
- <fileset dir="${test.java.dir}">
- <include name="org/jboss/test/ws/samples/wssecurity/**"/>
- </fileset>
- </copy>
- <copy todir="${build.src.samples.dir}/wssecurity/resources">
- <fileset dir="${test.resources.dir}/samples/wssecurity"/>
- </copy>
-
- <zip destfile="${build.dir}/${samples.target}.zip">
- <fileset dir="${build.dir}" includes="${samples.target}/**"/>
- </zip>
-
- </target>
-
-</project>
Deleted: branches/tdiesler/jbossws-1.0/build-thirdparty.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/build-thirdparty.xml 2006-10-03 13:57:34 UTC (rev 1123)
+++ branches/tdiesler/jbossws-1.0/build-thirdparty.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -1,106 +0,0 @@
-<?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="init-thirdparty" name="JBossWS-Thirdparty">
-
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
-
- <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath">
- </target>
-
- <target name="thirdparty-get" if="force.thirdparty.get"
- description="Gets the thirdparty libraries">
-
- <mkdir dir="${thirdparty.dir}"/>
- <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-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.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/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}/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/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.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/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" 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}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.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-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy-1.0.jar" dest="${thirdparty.dir}/policy-1.0.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx-lgpl-2.0.6.jar" dest="${thirdparty.dir}/wstx-lgpl-2.0.6.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api-1.0.jar" dest="${thirdparty.dir}/stax-api-1.0.jar" usetimestamp="true" verbose="true"/>
- </target>
-
- <target name="thirdparty-classpath" >
-
- <!-- The combined library classpath -->
- <path id="library.classpath">
- <pathelement location="${thirdparty.dir}/activation.jar"/>
- <pathelement location="${thirdparty.dir}/javassist.jar"/>
- <pathelement location="${thirdparty.dir}/concurrent.jar"/>
- <pathelement location="${thirdparty.dir}/log4j.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-container.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
- <pathelement location="${thirdparty.dir}/junit.jar"/>
- <pathelement location="${thirdparty.dir}/mailapi.jar"/>
- <pathelement location="${thirdparty.dir}/policy-1.0.jar"/>
- <pathelement location="${thirdparty.dir}/qdox.jar"/>
- <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
- <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/>
- <pathelement location="${thirdparty.dir}/xalan.jar"/>
- <pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
- <pathelement location="${thirdparty.dir}/xml-apis.jar"/>
- <pathelement location="${thirdparty.dir}/xmlsec.jar"/>
- <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
- </path>
-
- <!-- The classpath for the jbossws core -->
- <path id="jboss.core.classpath">
- <pathelement location="${jboss.server.lib}/jboss-j2ee.jar"/>
- <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- </path>
-
- <!-- The classpath for the jboss integration -->
- <path id="jboss.integration.classpath">
- <pathelement location="${jboss.lib}/jboss-jmx.jar"/>
- <pathelement location="${jboss.lib}/jboss-system.jar"/>
- <pathelement location="${jboss.server.lib}/jboss.jar"/>
- <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss.server.deploy}/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar"/>
- <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
- <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
- </path>
-
- </target>
-
-</project>
Modified: branches/tdiesler/jbossws-1.0/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/build.xml 2006-10-03 13:57:34 UTC (rev 1123)
+++ branches/tdiesler/jbossws-1.0/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -12,17 +12,17 @@
<!-- $Id$ -->
<project default="main" name="JBossWS">
-
- <import file="${basedir}/build-thirdparty.xml"/>
- <import file="${basedir}/build-samples.xml"/>
-
+
+ <import file="${basedir}/src/ant/build-thirdparty.xml"/>
+ <import file="${basedir}/src/ant/build-samples.xml"/>
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
-
+
<property file="ant.properties"/>
<property file="version.properties"/>
-
+
<property environment="env"/>
<property name="build.dir" value="${basedir}/output"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
@@ -43,9 +43,9 @@
<property name="test.etc.dir" value="${test.dir}/etc"/>
<property name="test.java.dir" value="${test.dir}/java"/>
<property name="test.resources.dir" value="${test.dir}/resources"/>
-
+
<property name="thirdparty.dir" value="${basedir}/thirdparty"/>
-
+
<property name="jboss.home" value="${jboss.jdk15.home}"/>
<property name="jboss.lib" value="${jboss.home}/lib"/>
<property name="jboss.client" value="${jboss.home}/client"/>
@@ -53,59 +53,59 @@
<property name="jboss.server.lib" value="${jboss.server}/lib"/>
<property name="jboss.server.deploy" value="${jboss.server}/deploy"/>
<property name="jboss.thirdparty" value="${jboss.home}/../../../thirdparty"/>
-
+
<property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/>
<property name="tomcat.common.dir" value="${tomcat.home}/common"/>
-
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
-
+
<target name="prepare">
-
+
<echo message="jboss.home = ${jboss.home}"/>
<echo message="tomcat.home = ${tomcat.home}"/>
<echo/>
-
+
<available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/>
<available property="jboss.ejb3.available" file="${jboss.client}/jboss-ejb3-client.jar"/>
<available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/>
-
+
<condition property="force.thirdparty.get">
<not>
<available file="${thirdparty.dir}" type="dir"/>
</not>
</condition>
-
+
<fail message="Not available: ${jboss.client}/jboss-ejb3-client.jar" unless="jboss.ejb3.available"/>
-
+
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
</tstamp>
-
+
</target>
-
+
<target name="init" depends="prepare, thirdparty">
-
+
<!-- The combined compile classpath -->
<path id="core.classpath">
<path refid="library.classpath"/>
<path refid="jboss.core.classpath"/>
</path>
-
+
<!-- The combined integration classpath -->
<path id="integration.classpath">
<path refid="library.classpath"/>
<path refid="jboss.core.classpath"/>
<path refid="jboss.integration.classpath"/>
</path>
-
+
</target>
-
+
<!-- ================================================================== -->
<!-- Compile -->
<!-- ================================================================== -->
-
+
<!--
| Compile everything.
|
@@ -113,28 +113,28 @@
| different type of compile that needs to be performed, short of
| documentation compiles.
-->
-
+
<target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/>
-
+
<!-- Compile java sources -->
<target name="compile-classes" depends="compile-interfaces,compile-core,compile-integration"/>
-
+
<!-- Compile core java sources -->
<target name="compile-interfaces" depends="init">
<mkdir dir="${build.classes14.dir}"/>
- <javac srcdir="${src.java.dir}" destdir="${build.classes14.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
+ <javac srcdir="${src.java.dir}" destdir="${build.classes14.dir}" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
<include name="javax/xml/rpc/**"/>
<include name="javax/xml/soap/**"/>
<classpath refid="core.classpath"/>
</javac>
</target>
-
+
<!-- Compile core java sources -->
<target name="compile-core" depends="compile-interfaces">
<mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}">
<include name="javax/xml/ws/**"/>
<include name="javax/jws/**"/>
<include name="org/jboss/ws/**"/>
@@ -143,19 +143,19 @@
<classpath refid="core.classpath"/>
</javac>
</target>
-
+
<!-- Compile interation java sources -->
<target name="compile-integration" depends="compile-core">
<mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
+ failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/**"/>
<include name="org/jboss/ws/transport/jms/**"/>
<classpath path="${build.classes14.dir}"/>
<classpath refid="integration.classpath"/>
</javac>
</target>
-
+
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
<mkdir dir="${build.etc.dir}"/>
@@ -170,7 +170,7 @@
</filterset>
</copy>
</target>
-
+
<!-- Compile resource files -->
<target name="compile-resources" depends="init">
<mkdir dir="${build.resources.dir}"/>
@@ -178,22 +178,22 @@
<fileset dir="${src.resources.dir}"/>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
-
+
<!--
| Build all jar files.
-->
<target name="jars" description="Builds all jar files." depends="compile,module-jars">
</target>
-
+
<!--
| Build all jar files.
-->
<target name="module-jars">
-
+
<!-- Build jboss-jaxrpc.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-jaxrpc.jar" manifest="${build.etc.dir}/default.mf">
@@ -201,7 +201,7 @@
<include name="javax/xml/rpc/**"/>
</fileset>
</jar>
-
+
<!-- Build jboss-saaj.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-saaj.jar" manifest="${build.etc.dir}/default.mf">
@@ -209,7 +209,7 @@
<include name="javax/xml/soap/**"/>
</fileset>
</jar>
-
+
<!-- Build jboss-jaxws.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-jaxws.jar" manifest="${build.etc.dir}/default.mf">
@@ -218,7 +218,7 @@
<include name="javax/xml/ws/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-core.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jbossws-core.jar" manifest="${build.etc.dir}/default.mf">
@@ -233,7 +233,7 @@
<include name="dtd/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-jboss-integration.jar -->
<jar jarfile="${build.lib.dir}/jbossws-jboss-integration.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes.dir}">
@@ -243,21 +243,21 @@
<include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-tomcat-integration.jar -->
<jar jarfile="${build.lib.dir}/jbossws-tomcat-integration.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes.dir}">
<include name="org/jboss/ws/integration/tomcat/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws.beans -->
<jar jarfile="${build.lib.dir}/jbossws.beans" manifest="${build.etc.dir}/default.mf">
<metainf dir="${build.resources.dir}/jbossws.beans/META-INF">
<include name="jboss-beans.xml"/>
</metainf>
</jar>
-
+
<!-- Build jbossws-client.jar -->
<jar jarfile="${build.lib.dir}/jbossws-client.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes.dir}">
@@ -280,7 +280,7 @@
<include name="wstools-log4j.xml"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-context.war -->
<war warfile="${build.lib.dir}/jbossws-context.war" webxml="${build.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml">
<fileset dir="${build.resources.dir}/jbossws.war">
@@ -291,7 +291,7 @@
<include name="jboss-web.xml"/>
</webinf>
</war>
-
+
<!-- Build jbossws.war -->
<war warfile="${build.lib.dir}/jbossws.war" webxml="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml">
<fileset dir="${build.resources.dir}/jbossws.war">
@@ -306,7 +306,7 @@
<include name="META-INF/standard-jaxrpc-endpoint-config.xml"/>
</fileset>
</war>
-
+
<!-- Build jbossws.sar -->
<jar jarfile="${build.lib.dir}/jbossws.sar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.lib.dir}">
@@ -332,11 +332,11 @@
<include name="META-INF/jboss-service.xml"/>
</fileset>
</jar>
-
+
</target>
-
+
<target name="module-jars14" depends="jbossretro">
-
+
<!-- Build jboss-jaxws14.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jboss-jaxws14.jar" manifest="${build.etc.dir}/default.mf">
@@ -345,7 +345,7 @@
<include name="javax/xml/ws/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws14-core.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jbossws14-core.jar" manifest="${build.etc.dir}/default.mf">
@@ -360,7 +360,7 @@
<include name="dtd/**"/>
</fileset>
</jar>
-
+
<!-- Build jbossws-jboss-integration.jar -->
<jar jarfile="${build.lib.dir}/jbossws14-jboss-integration.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes14.dir}">
@@ -370,7 +370,7 @@
<include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/>
</fileset>
</jar>
-
+
<!-- Build jbossws14-client.jar -->
<jar jarfile="${build.lib.dir}/jbossws14-client.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes14.dir}">
@@ -393,7 +393,7 @@
<include name="wstools-log4j.xml"/>
</fileset>
</jar>
-
+
<!-- Build jbossws14.sar -->
<jar jarfile="${build.lib.dir}/jbossws14.sar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.lib.dir}">
@@ -415,15 +415,15 @@
<include name="META-INF/jboss-service.xml"/>
</fileset>
</jar>
-
+
</target>
-
+
<!--
Retrotranslation
-->
-
+
<target name="jbossretro" depends="compile">
-
+
<!-- Weave the build.classes to build.classes14 -->
<taskdef name="retro" classname="org.jboss.ant.tasks.retro.Retro">
<classpath>
@@ -431,9 +431,9 @@
<pathelement location="${thirdparty.dir}/jbossretro.jar"/>
</classpath>
</taskdef>
-
+
<mkdir dir="${build.classes14.dir}"/>
-
+
<retro destdir="${build.classes14.dir}">
<classpath>
<pathelement location="${build.lib.dir}/jboss-jaxrpc.jar"/>
@@ -448,7 +448,7 @@
<classpath refid="integration.classpath"/>
<src path="${build.classes.dir}"/>
</retro>
-
+
<copy todir="${build.classes14.dir}">
<fileset dir="${build.resources.dir}">
<include name="schema/**"/>
@@ -456,11 +456,11 @@
</fileset>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Documentation -->
<!-- ================================================================== -->
-
+
<!-- Generate the JavaDoc -->
<target name="javadoc" depends="init" description="Generate the Javadoc">
<javadoc destdir="${build.api}" author="true" version="true" use="true" windowtitle="JBossWS API">
@@ -472,11 +472,11 @@
</packageset>
</javadoc>
</target>
-
+
<!-- ================================================================== -->
<!-- Deployment -->
<!-- ================================================================== -->
-
+
<!-- Deploy jbossws to the server -->
<target name="deploy-jbossws" depends="main" description="Deploy jbossws">
<antcall target="deploy-to-server">
@@ -488,13 +488,13 @@
<param name="jbossws" value="jbossws"/>
</antcall>
</target>
-
+
<!-- Deploy jbossws14 to the server -->
<target name="module-jars14-assert" unless="jboss.jdk14.home">
- <echo>ERROR: 'jboss.jdk14.home' is not set. </echo>
- <echo>Make sure to point it to your jboss confiuguration thagt should run under jdk 1.4</echo>
+ <echo>ERROR: 'jboss.jdk14.home' is not set. </echo>
+ <echo>Make sure to point it to your jboss confiuguration thagt should run under jdk 1.4</echo>
</target>
-
+
<target name="deploy-jbossws14" depends="main,module-jars14, module-jars14-assert" description="Deploy jbossws14" if="jboss.jdk14.home">
<antcall target="deploy-to-server">
<param name="jboss.deploy.home" value="${jboss.jdk14.home}"/>
@@ -505,7 +505,7 @@
<param name="jbossws" value="jbossws14"/>
</antcall>
</target>
-
+
<!-- Deploy to jboss -->
<target name="deploy-to-server">
<copy todir="${jboss.deploy.home}/client" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
@@ -513,13 +513,13 @@
<mkdir dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
<unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar" src="${build.lib.dir}/${jbossws}.sar"/>
</target>
-
+
<!-- Deploy to jboss/thirdparty -->
<target name="deploy-to-thirdparty" if="jboss.source.dist.available">
<copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
<copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}.sar" overwrite="true"/>
</target>
-
+
<!-- Deploy to Tomcat -->
<target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat">
<copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
@@ -534,7 +534,7 @@
<copy todir="${tomcat.webapps.dir}" file="${build.lib.dir}/jbossws.war" overwrite="true"/>
<delete dir="${tomcat.webapps.dir}/jbossws"/>
</target>
-
+
<target name="jbossws-thirdparty-jar" unless="jbossws.thirdparty.available">
<!-- Build jbossws-thirdparty.jar -->
<mkdir dir="${build.lib.dir}/build"/>
@@ -554,14 +554,14 @@
</jar>
<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"/>
@@ -579,7 +579,7 @@
<filtersfile file="version.properties"/>
</filterset>
</copy>
-
+
<!-- jbossws14 -->
<property name="jbossws14.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/>
<mkdir dir="${jbossws14.dir}/lib"/>
@@ -598,22 +598,22 @@
</filterset>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Misc. -->
<!-- ================================================================== -->
-
+
<!-- Clean up all build output -->
<target name="clean" depends="prepare" description="Cleans up most generated files.">
<delete dir="${build.dir}"/>
</target>
-
+
<target name="main" description="Executes the default target (most)." depends="most"/>
-
+
<target name="most" description="Builds almost everything." depends="jars"/>
-
+
<target name="all" description="Create a distribution zip file" depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs">
-
+
<mkdir dir="${build.dist.dir}"/>
<mkdir dir="${build.dist.dir}/bin"/>
<mkdir dir="${build.dist.dir}/samples"/>
@@ -623,7 +623,7 @@
<mkdir dir="${build.dist.dir}/lib/tomcat/common/endorsed"/>
<mkdir dir="${build.dist.dir}/lib/tomcat/common/lib"/>
<mkdir dir="${build.dist.dir}/lib/tomcat/webapps"/>
-
+
<copy todir="${build.dist.dir}" filtering="true" overwrite="true">
<fileset dir="${src.dist.dir}"/>
<filterset>
@@ -636,10 +636,10 @@
<include name="wstools.sh"/>
</fileset>
</copy>
-
+
<!-- samples -->
<copy todir="${build.dist.dir}" file="${build.dir}/${samples.target}.zip" overwrite="true"/>
-
+
<!-- documentation -->
<copy todir="${build.dist.dir}/docs/html" overwrite="true">
<fileset dir="${docs.userguide.dir}/build/en/html"/>
@@ -647,17 +647,17 @@
<copy todir="${build.dist.dir}/docs" overwrite="true">
<fileset dir="${docs.userguide.dir}/build/en/pdf"/>
</copy>
-
+
<!-- lib/jdk1.5 -->
<copy todir="${build.dist.dir}/lib/jboss-jdk1.5" overwrite="true">
<fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/>
</copy>
-
+
<!-- lib/jdk1.4 -->
<copy todir="${build.dist.dir}/lib/jboss-jdk1.4" overwrite="true">
<fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/>
</copy>
-
+
<!-- lib/tomcat -->
<copy todir="${build.dist.dir}/lib/tomcat/common/endorsed" overwrite="true">
<fileset dir="${thirdparty.dir}">
@@ -681,13 +681,19 @@
<copy todir="${build.dist.dir}/lib/tomcat/webapps" overwrite="true">
<fileset dir="${build.lib.dir}" includes="jbossws.war"/>
</copy>
-
+
<!-- zip it -->
<zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.dist.dir}"/>
</target>
-
+
+ <target name="build-source-zip" description="Build the source distribution">
+ <zip destfile="${build.dir}/jbossws-${version.id}-src.zip" basedir="${basedir}"
+ includes="src/**">
+ </zip>
+ </target>
+
<target name="build-docs" description="build the documentation">
<ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/>
</target>
-
+
</project>
Added: branches/tdiesler/jbossws-1.0/src/ant/build-samples.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/ant/build-samples.xml 2006-10-03 13:57:34 UTC (rev 1123)
+++ branches/tdiesler/jbossws-1.0/src/ant/build-samples.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -0,0 +1,328 @@
+<?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="build-samples" name="JBossWS Samples">
+
+ <!--
+ | Build the samples
+ -->
+ <target name="build-samples" description="Builds the samples." depends="prepare">
+
+ <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}">
+ <fileset dir="${src.samples.dir}">
+ <include name="common/imported-build.xml"/>
+ <include name="ant.properties.example"/>
+ <include name="**/build.xml"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${build.src.samples.dir}/lib"/>
+ <copy todir="${build.src.samples.dir}/lib">
+ <fileset dir="${build.lib.dir}">
+ <include name="jbossws-jboss-integration.jar"/>
+ <include name="jbossws-tomcat-integration.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- samples/common -->
+ <mkdir dir="${build.src.samples.dir}/common/java"/>
+ <mkdir dir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples"/>
+
+ <copy todir="${build.src.samples.dir}/common/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/*.java"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/common/resources">
+ <fileset dir="${src.samples.dir}/common">
+ <include name="jndi.properties"/>
+ <include name="log4j.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples-override"/>
+ </copy>
+
+ <!-- samples/docstyle -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/docstyle/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/docstyle/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/docstyle"/>
+ </copy>
+
+ <!-- samples/dynamichandler -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/dynamichandler/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/dynamichandler"/>
+ </copy>
+
+ <!-- samples/exception -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/exception/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/exception/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/exception/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/exception/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/exception/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/exception"/>
+ </copy>
+
+ <!-- samples/handler -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/handler/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/handler/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/handler/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/handler/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/handler/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/handler"/>
+ </copy>
+
+ <!-- samples/holder -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/holder/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/holder/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/holder/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/holder/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/holder/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/holder"/>
+ </copy>
+
+ <!-- samples/jmstransport -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/jmstransport/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/jmstransport/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/jmstransport"/>
+ </copy>
+
+ <!-- samples/jsr109ejb -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109ejb/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/jsr109ejb"/>
+ </copy>
+
+ <!-- samples/jsr109pojo -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109pojo/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/jsr109pojo"/>
+ </copy>
+
+ <!-- samples/message -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/message/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/message/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/message/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/message/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/message/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/message"/>
+ </copy>
+
+ <!-- samples/mtom -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/mtom/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/mtom/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/mtom/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/mtom/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/mtom"/>
+ </copy>
+
+ <!-- samples/oneway -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/oneway/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/oneway/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/oneway/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/oneway/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/oneway/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/oneway"/>
+ </copy>
+
+ <!-- samples/rpcstyle -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/rpcstyle/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/rpcstyle"/>
+ </copy>
+
+ <!-- samples/secureejb -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/secureejb/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/secureejb/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/secureejb"/>
+ </copy>
+
+ <!-- samples/swa -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/swa/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/swa/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/swa/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/swa/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/swa/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/swa"/>
+ </copy>
+
+ <!-- samples/wsbpel -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/wsbpel" />
+ </copy>
+
+ <!-- samples/wseventing -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/wseventing/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wseventing/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/wseventing/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/wseventing"/>
+ </copy>
+
+ <!-- samples/wssecurity -->
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/resources">
+ <fileset dir="${test.resources.dir}/jaxrpc/samples/wssecurity"/>
+ </copy>
+
+ <!-- JAXWS samples - - - - - - - - - - - - - - - - - - - - - - -->
+
+ <!-- samples/jsr181ejb -->
+ <mkdir dir="${build.src.samples.dir}/jaxws/jsr181ejb/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxws/jsr181ejb/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/resources">
+ <fileset dir="${test.resources.dir}/jaxws/samples/jsr181ejb"/>
+ </copy>
+
+ <!-- samples/jsr181pojo -->
+ <mkdir dir="${build.src.samples.dir}/jaxws/jsr181pojo/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxws/jsr181pojo/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/resources">
+ <fileset dir="${test.resources.dir}/jaxws/samples/jsr181pojo"/>
+ </copy>
+
+ <!-- samples/wsaddressing -->
+ <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/java"/>
+ <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/resources"/>
+
+ <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/java">
+ <fileset dir="${test.java.dir}">
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/resources">
+ <fileset dir="${test.resources.dir}/jaxws/samples/wsaddressing"/>
+ </copy>
+
+ <!-- Build the samples zip -->
+ <zip destfile="${build.dir}/${samples.target}.zip">
+ <fileset dir="${build.dir}" includes="${samples.target}/**"/>
+ </zip>
+
+ </target>
+
+</project>
Property changes on: branches/tdiesler/jbossws-1.0/src/ant/build-samples.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Copied: branches/tdiesler/jbossws-1.0/src/ant/build-thirdparty.xml (from rev 1102, branches/tdiesler/jbossws-1.0/build-thirdparty.xml)
===================================================================
--- branches/tdiesler/jbossws-1.0/build-thirdparty.xml 2006-10-02 09:31:34 UTC (rev 1102)
+++ branches/tdiesler/jbossws-1.0/src/ant/build-thirdparty.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -0,0 +1,106 @@
+<?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="init-thirdparty" name="JBossWS-Thirdparty">
+
+ <!-- ========= -->
+ <!-- Libraries -->
+ <!-- ========= -->
+
+ <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath">
+ </target>
+
+ <target name="thirdparty-get" if="force.thirdparty.get"
+ description="Gets the thirdparty libraries">
+
+ <mkdir dir="${thirdparty.dir}"/>
+ <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-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.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/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}/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/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.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/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" 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}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.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-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy-1.0.jar" dest="${thirdparty.dir}/policy-1.0.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx-lgpl-2.0.6.jar" dest="${thirdparty.dir}/wstx-lgpl-2.0.6.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api-1.0.jar" dest="${thirdparty.dir}/stax-api-1.0.jar" usetimestamp="true" verbose="true"/>
+ </target>
+
+ <target name="thirdparty-classpath" >
+
+ <!-- The combined library classpath -->
+ <path id="library.classpath">
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/javassist.jar"/>
+ <pathelement location="${thirdparty.dir}/concurrent.jar"/>
+ <pathelement location="${thirdparty.dir}/log4j.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-common.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-container.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
+ <pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
+ <pathelement location="${thirdparty.dir}/junit.jar"/>
+ <pathelement location="${thirdparty.dir}/mailapi.jar"/>
+ <pathelement location="${thirdparty.dir}/policy-1.0.jar"/>
+ <pathelement location="${thirdparty.dir}/qdox.jar"/>
+ <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+ <pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/>
+ <pathelement location="${thirdparty.dir}/xalan.jar"/>
+ <pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
+ <pathelement location="${thirdparty.dir}/xml-apis.jar"/>
+ <pathelement location="${thirdparty.dir}/xmlsec.jar"/>
+ <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
+ </path>
+
+ <!-- The classpath for the jbossws core -->
+ <path id="jboss.core.classpath">
+ <pathelement location="${jboss.server.lib}/jboss-j2ee.jar"/>
+ <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ </path>
+
+ <!-- The classpath for the jboss integration -->
+ <path id="jboss.integration.classpath">
+ <pathelement location="${jboss.lib}/jboss-jmx.jar"/>
+ <pathelement location="${jboss.lib}/jboss-system.jar"/>
+ <pathelement location="${jboss.server.lib}/jboss.jar"/>
+ <pathelement location="${jboss.server.lib}/jbosssx.jar"/>
+ <pathelement location="${jboss.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <pathelement location="${jboss.server.deploy}/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar"/>
+ <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
+ <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
+ <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
+ </path>
+
+ </target>
+
+</project>
Property changes on: branches/tdiesler/jbossws-1.0/src/ant/build-thirdparty.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/tdiesler/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java 2006-10-03 13:57:34 UTC (rev 1123)
+++ branches/tdiesler/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java 2006-10-03 15:30:32 UTC (rev 1124)
@@ -45,7 +45,7 @@
// provide logging
protected final Logger log = Logger.getLogger(wspublish.class);
- public static final String DEFAULT_TOMCAT_SERVICE_ENDPOINT_SERVLET = "org.jboss.ws.integration.other.GenericServiceEndpointServlet";
+ public static final String DEFAULT_TOMCAT_SERVICE_ENDPOINT_SERVLET = TomcatServiceEndpointServlet.class.getName();
public URL process(URL warURL, File destDir, String servletName) throws IOException
{
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/ant.properties.example
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-10-03 13:57:34 UTC (rev 1123)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,16 +2,16 @@
#
# Required JBoss Home
-#jboss.jdk15.home=d:/cvs/jboss-branch/jboss-4.0.x/build/output/jboss-4.0.5.CR1-ejb3
+#jboss.jdk15.home=/home/tdiesler/svn/jboss/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.GA-ejb3
# Optional JBoss Home
-#jboss.jdk14.home=d:/cvs/jboss-archive/jboss-4.0.4/build/output/jboss-4.0.4.GA
+#jboss.jdk14.home=/home/tdiesler/svn/jboss/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA
# The JBoss server instance
jboss.server.instance=default
# Tomcat Home
-#tomcat.home=d:/java/apache/apache-tomcat-5.5.17
+#tomcat.home=/usr/java/apache/apache-tomcat-5.5.17
#tomcat.manager.username=manager
#tomcat.manager.password=manager
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/build.xml 2006-10-03 13:57:34 UTC (rev 1123)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -11,27 +11,27 @@
-->
<target name="jars" description="build the deployments">
- <ant antfile="${basedir}/docstyle/build.xml" target="jars"/>
- <ant antfile="${basedir}/dynamichandler/build.xml" target="jars"/>
- <ant antfile="${basedir}/exception/build.xml" target="jars"/>
- <ant antfile="${basedir}/handler/build.xml" target="jars"/>
- <ant antfile="${basedir}/holder/build.xml" target="jars"/>
- <ant antfile="${basedir}/jmstransport/build.xml" target="jars"/>
- <ant antfile="${basedir}/jsr109ejb/build.xml" target="jars"/>
- <ant antfile="${basedir}/jsr109pojo/build.xml" target="jars"/>
- <ant antfile="${basedir}/jsr181ejb/build.xml" target="jars"/>
- <ant antfile="${basedir}/jsr181pojo/build.xml" target="jars"/>
- <ant antfile="${basedir}/message/build.xml" target="jars"/>
- <ant antfile="${basedir}/mtom/build.xml" target="jars"/>
- <ant antfile="${basedir}/oneway/build.xml" target="jars"/>
- <ant antfile="${basedir}/rpcstyle/build.xml" target="jars"/>
- <ant antfile="${basedir}/secureejb/build.xml" target="jars"/>
- <ant antfile="${basedir}/swa/build.xml" target="jars"/>
- <ant antfile="${basedir}/wsaddressing/build.xml" target="jars"/>
- <ant antfile="${basedir}/wsbpel/build.xml" target="jars"/>
- <ant antfile="${basedir}/wseventing/build.xml" target="jars"/>
- <ant antfile="${basedir}/wssecurity/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/docstyle/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/dynamichandler/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/exception/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/handler/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/holder/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/jmstransport/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/jsr109ejb/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/jsr109pojo/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/message/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/mtom/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/oneway/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/rpcstyle/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/swa/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/wsbpel/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/wseventing/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxws/jsr181ejb/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxws/jsr181pojo/build.xml" target="jars"/>
+ <ant antfile="${basedir}/jaxws/wsaddressing/build.xml" target="jars"/>
</target>
<!--
@@ -39,25 +39,26 @@
-->
<target name="tests" depends="init" description="run the testsuite">
- <ant antfile="${basedir}/docstyle/build.xml" target="tests"/>
- <ant antfile="${basedir}/dynamichandler/build.xml" target="tests"/>
- <ant antfile="${basedir}/exception/build.xml" target="tests"/>
- <ant antfile="${basedir}/handler/build.xml" target="tests"/>
- <ant antfile="${basedir}/holder/build.xml" target="tests"/>
- <ant antfile="${basedir}/jmstransport/build.xml" target="tests"/>
- <ant antfile="${basedir}/jsr109ejb/build.xml" target="tests"/>
- <ant antfile="${basedir}/jsr109pojo/build.xml" target="tests"/>
- <ant antfile="${basedir}/jsr181ejb/build.xml" target="tests"/>
- <ant antfile="${basedir}/jsr181pojo/build.xml" target="tests"/>
- <ant antfile="${basedir}/message/build.xml" target="tests"/>
- <ant antfile="${basedir}/mtom/build.xml" target="tests"/>
- <ant antfile="${basedir}/oneway/build.xml" target="tests"/>
- <ant antfile="${basedir}/rpcstyle/build.xml" target="tests"/>
- <ant antfile="${basedir}/secureejb/build.xml" target="tests"/>
- <ant antfile="${basedir}/swa/build.xml" target="tests"/>
- <ant antfile="${basedir}/wsaddressing/build.xml" target="tests"/>
- <ant antfile="${basedir}/wseventing/build.xml" target="tests"/>
- <ant antfile="${basedir}/wssecurity/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/docstyle/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/dynamichandler/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/exception/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/handler/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/holder/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/jmstransport/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/jsr109ejb/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/jsr109pojo/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/message/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/mtom/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/oneway/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/rpcstyle/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/swa/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/wseventing/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="tests"/>
+
+ <ant antfile="${basedir}/jaxws/jsr181ejb/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxws/jsr181pojo/build.xml" target="tests"/>
+ <ant antfile="${basedir}/jaxws/wsaddressing/build.xml" target="tests"/>
<antcall target="tests-report"/>
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/common/imported-build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-10-03 13:57:34 UTC (rev 1123)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -89,6 +89,8 @@
<path id="compile.classpath">
<path refid="client.classpath"/>
+ <pathelement location="${basedir}/lib/jbossws-jboss-integration.jar"/>
+ <pathelement location="${basedir}/lib/jbossws-tomcat-integration.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
@@ -101,9 +103,8 @@
<include name="jboss-aspect-jdk50-client.jar"/>
<include name="jboss-ejb3-client.jar"/>
</fileset>
- <fileset dir="${tomcat.home}/common/lib">
- <include name="jbossws-tomcat-integration.jar"/>
- </fileset>
+ <pathelement location="${basedir}/lib/jbossws-jboss-integration.jar"/>
+ <pathelement location="${basedir}/lib/jbossws-tomcat-integration.jar"/>
</path>
<echo message="jboss.home = ${jboss.home}"/>
@@ -162,7 +163,7 @@
-->
<target name="copy-resources" depends="init" description="copy the resources">
<!-- copy resource files -->
- <copy todir="${build.test.dir}/resources/samples/${chapter}">
+ <copy todir="${build.test.dir}/resources/${sample.path}">
<fileset dir="${resources.dir}">
<include name="**/*.wsdl"/>
<include name="**/*.xml"/>
@@ -172,7 +173,7 @@
</filterset>
</copy>
<!-- copy binary files -->
- <copy todir="${build.test.dir}/resources/samples/${chapter}">
+ <copy todir="${build.test.dir}/resources/${sample.path}">
<fileset dir="${resources.dir}">
<exclude name="**/*.wsdl"/>
<exclude name="**/*.xml"/>
@@ -187,15 +188,15 @@
<!-- copy generated resource files -->
<copy todir="${build.test.dir}/resources">
<fileset dir="${build.test.dir}/wstools/resources">
- <include name="samples/${chapter}/**/*.wsdl"/>
- <include name="samples/${chapter}/**/*.xml"/>
+ <include name="${sample.path}/**/*.wsdl"/>
+ <include name="${sample.path}/**/*.xml"/>
</fileset>
</copy>
<!-- copy override resource files -->
- <copy todir="${build.test.dir}/resources/samples" overwrite="true">
+ <copy todir="${build.test.dir}/resources" overwrite="true">
<fileset dir="${common.resources}/overrides">
- <include name="${chapter}/**/*.wsdl"/>
- <include name="${chapter}/**/*.xml"/>
+ <include name="${sample.path}/**/*.wsdl"/>
+ <include name="${sample.path}/**/*.xml"/>
</fileset>
<filterset>
<filter token="jbosstest.host.name" value="${node0}"/>
@@ -223,8 +224,8 @@
<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/samples/wssecurity/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.test.dir}/resources/samples/wssecurity/wsse.truststore"/>
+ <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.keyStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
@@ -267,8 +268,8 @@
<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/samples/wssecurity/wsse.keystore"/>
- <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.test.dir}/resources/samples/wssecurity/wsse.truststore"/>
+ <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.keyStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/>
<sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/>
@@ -283,7 +284,7 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/>
<batchtest fork="yes" todir="${build.test.dir}/reports">
<fileset dir="${java.dir}">
- <include name="org/jboss/test/ws/samples/${test}/**/*TestCase.java"/>
+ <include name="org/jboss/test/ws/${test}/**/*TestCase.java"/>
</fileset>
</batchtest>
</junit>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/docstyle (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/docstyle)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/docstyle/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/docstyle/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/docstyle/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="docstyle"/>
+ <property name="chapter" value="jaxrpc/docstyle"/>
+ <property name="sample.path" value="jaxrpc/samples/docstyle"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,15 +20,15 @@
</taskdef>
<!-- samples/docstyle/bare -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/docstyle/bare/WEB-INF"
+ <wstools dest="${build.test.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/samples/docstyle/wrapped/WEB-INF"
+ <wstools dest="${build.test.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/samples/docstyle/wrapped/WEB-INF"
- includes="org/jboss/test/ws/samples/docstyle/wrapped/*.java"/>
+ <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"
+ includes="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/*.java"/>
</move>
</target>
@@ -37,61 +38,61 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-docstyle-bare -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-docstyle-bare.war" webxml="${build.test.dir}/resources/samples/docstyle/bare/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/docstyle/bare/TrivialEndpointJSE.class"/>
- <include name="org/jboss/test/ws/samples/docstyle/bare/TrivialService.class"/>
- <include name="org/jboss/test/ws/samples/docstyle/bare/TrivialOrder.class"/>
- <include name="org/jboss/test/ws/samples/docstyle/bare/TrivialOrderResponse.class"/>
+ <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/samples/docstyle/bare/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-docstyle-bare-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/docstyle/bare/TrivialService.class"/>
- <include name="org/jboss/test/ws/samples/docstyle/bare/TrivialOrder.class"/>
- <include name="org/jboss/test/ws/samples/docstyle/bare/TrivialOrderResponse.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"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/samples/docstyle/bare/META-INF">
+ <metainf dir="${build.test.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/samples/docstyle/bare/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
- <!-- jbossws-samples-docstyle-wrapped -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-docstyle-wrapped.war" webxml="${build.test.dir}/resources/samples/docstyle/wrapped/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/docstyle/wrapped/TrivialEndpointJSE.class"/>
- <include name="org/jboss/test/ws/samples/docstyle/wrapped/TrivialService.class"/>
- <include name="org/jboss/test/ws/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
- <include name="org/jboss/test/ws/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
+ <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/samples/docstyle/wrapped/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-docstyle-wrapped-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/docstyle/wrapped/TrivialService.class"/>
- <include name="org/jboss/test/ws/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
- <include name="org/jboss/test/ws/samples/docstyle/wrapped/TrivialService*ResponseStruct.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"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/samples/docstyle/wrapped/META-INF">
+ <metainf dir="${build.test.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/samples/docstyle/wrapped/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
@@ -104,7 +105,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/dynamichandler (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/dynamichandler)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/dynamichandler/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/dynamichandler/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/dynamichandler/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="dynamichandler"/>
+ <property name="chapter" value="jaxrpc/dynamichandler"/>
+ <property name="sample.path" value="jaxrpc/samples/dynamichandler"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,7 +20,7 @@
</taskdef>
<!-- samples/dynaminchandler -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/dynamichandler/WEB-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -29,29 +30,29 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-dynamichandler -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-dynamichandler.war" webxml="${build.test.dir}/resources/samples/dynamichandler/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/dynamichandler/*Service.class"/>
- <include name="org/jboss/test/ws/samples/dynamichandler/*ServiceBean.class"/>
- <include name="org/jboss/test/ws/samples/dynamichandler/*Handler.class"/>
+ <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/samples/dynamichandler/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-dynamichandler-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-dynamichandler-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/dynamichandler/*Service.class"/>
- <include name="org/jboss/test/ws/samples/dynamichandler/*Handler.class"/>
+ <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/samples/dynamichandler/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/samples/dynamichandler/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/dynamichandler/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
@@ -64,7 +65,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite" if="only-on-jboss">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/exception (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/exception)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/exception/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/exception/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/exception/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="exception"/>
+ <property name="chapter" value="jaxrpc/exception"/>
+ <property name="sample.path" value="jaxrpc/samples/exception"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,7 +20,7 @@
</taskdef>
<!-- samples/exception -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/exception/WEB-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -29,30 +30,30 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-exception -->
- <war destfile="${build.test.dir}/libs/jbossws-samples-exception.war" webxml="${build.test.dir}/resources/samples/exception/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/exception/*Exception.class"/>
- <include name="org/jboss/test/ws/samples/exception/ServerHandler.class"/>
- <include name="org/jboss/test/ws/samples/exception/ExceptionServiceInterface.class"/>
- <include name="org/jboss/test/ws/samples/exception/ExceptionBeanImpl.class"/>
+ <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/samples/exception/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-exception-client.jar">
+ <jar destfile="${build.test.dir}/libs/jaxrpc-samples-exception-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/exception/*Exception.class"/>
- <include name="org/jboss/test/ws/samples/exception/ExceptionServiceInterface.class"/>
+ <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/samples/exception/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/exception/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/samples/exception/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/exception/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
@@ -65,7 +66,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/handler (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/handler)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/handler/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/handler/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/handler/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="handler"/>
+ <property name="chapter" value="jaxrpc/handler"/>
+ <property name="sample.path" value="jaxrpc/samples/handler"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,7 +20,7 @@
</taskdef>
<!-- samples/handler -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/handler/WEB-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -29,29 +30,29 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-handler -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-handler.war" webxml="${build.test.dir}/resources/samples/handler/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/handler/*Service.class"/>
- <include name="org/jboss/test/ws/samples/handler/*ServiceBean.class"/>
- <include name="org/jboss/test/ws/samples/handler/ServerSideHandler.class"/>
+ <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/samples/handler/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-handler-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-handler-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/handler/*Service.class"/>
- <include name="org/jboss/test/ws/samples/handler/ClientSideHandler.class"/>
+ <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/samples/handler/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/handler/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/samples/handler/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/handler/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
@@ -64,7 +65,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/holder (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/holder)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/holder/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/holder/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/holder/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="holder"/>
+ <property name="chapter" value="jaxrpc/holder"/>
+ <property name="sample.path" value="jaxrpc/samples/holder"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,7 +20,7 @@
</taskdef>
<!-- samples/holder -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/holder/WEB-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -29,27 +30,27 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-holder -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-holder.war" webxml="${build.test.dir}/resources/samples/holder/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/holder/*Service.class"/>
- <include name="org/jboss/test/ws/samples/holder/*ServiceBean.class"/>
+ <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/samples/holder/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-holder-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-holder-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/holder/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/samples/holder/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/holder/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/samples/holder/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/holder/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
@@ -62,7 +63,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jmstransport (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/jmstransport)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jmstransport/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/jmstransport/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jmstransport/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="jmstransport"/>
+ <property name="chapter" value="jaxrpc/jmstransport"/>
+ <property name="sample.path" value="jaxrpc/samples/jmstransport"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,7 +20,7 @@
</taskdef>
<!-- samples/jmstransport -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/jmstransport/META-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -29,13 +30,13 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-jmstransport -->
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-jmstransport.jar">
+ <!-- jaxrpc-samples-jmstransport -->
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jmstransport.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/jmstransport/Organization.class"/>
- <include name="org/jboss/test/ws/samples/jmstransport/OrganizationJMSEndpoint.class"/>
+ <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/samples/jmstransport/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="webservices.xml"/>
@@ -43,11 +44,11 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-jmstransport.sar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jmstransport.sar">
<fileset dir="${build.test.dir}/libs">
- <include name="jbossws-samples-jmstransport.jar"/>
+ <include name="jaxrpc-samples-jmstransport.jar"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/samples/jmstransport/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jmstransport/META-INF">
<include name="jboss-service.xml"/>
</metainf>
</jar>
@@ -59,7 +60,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite" if="only-on-jboss">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109ejb (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/jsr109ejb)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109ejb/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/jsr109ejb/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109ejb/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="jsr109ejb"/>
+ <property name="chapter" value="jaxrpc/jsr109ejb"/>
+ <property name="sample.path" value="jaxrpc/samples/jsr109ejb"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,11 +20,11 @@
</taskdef>
<!-- samples/jsr109ejb/doclit -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/jsr109ejb/doclit/META-INF"
+ <wstools dest="${build.test.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/samples/jsr109ejb/rpclit/META-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"
config="${resources.dir}/rpclit/wstools-config.xml"/>
</target>
@@ -33,14 +34,14 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-jsr109ejb-rpc -->
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-jsr109ejb-rpc.jar">
+ <!-- jaxrpc-samples-jsr109ejb-rpc -->
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/samples/jsr109ejb/*Service.class"/>
- <include name="org/jboss/test/ws/samples/jsr109ejb/*EJBEndpoint.class"/>
+ <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/samples/jsr109ejb/rpclit/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -48,12 +49,12 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-jsr109ejb-rpc-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/samples/jsr109ejb/*Service.class"/>
+ <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/samples/jsr109ejb/rpclit/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -61,15 +62,15 @@
</metainf>
</jar>
- <!-- jbossws-samples-jsr109ejb-doc -->
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-jsr109ejb-doc.jar">
+ <!-- jaxrpc-samples-jsr109ejb-doc -->
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/samples/jsr109ejb/*Struct.class"/>
- <include name="org/jboss/test/ws/samples/jsr109ejb/*Service.class"/>
- <include name="org/jboss/test/ws/samples/jsr109ejb/*EJBEndpoint.class"/>
+ <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/samples/jsr109ejb/doclit/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -77,13 +78,13 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-jsr109ejb-doc-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/samples/jsr109ejb/*Struct.class"/>
- <include name="org/jboss/test/ws/samples/jsr109ejb/*Service.class"/>
+ <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/samples/jsr109ejb/doclit/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -98,7 +99,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite" if="only-on-jboss">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/jsr109pojo)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/jsr109pojo/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="jsr109pojo"/>
+ <property name="chapter" value="jaxrpc/jsr109pojo"/>
+ <property name="sample.path" value="jaxrpc/samples/jsr109pojo"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,11 +20,11 @@
</taskdef>
<!-- samples/jsr109pojo/doclit -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/jsr109pojo/doclit/WEB-INF"
+ <wstools dest="${build.test.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/samples/jsr109pojo/rpclit/WEB-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"
config="${resources.dir}/rpclit/wstools-config.xml"/>
</target>
@@ -33,59 +34,59 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-jsr109pojo-rpc -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-jsr109pojo-rpc.war" webxml="${build.test.dir}/resources/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/samples/jsr109pojo/*Service.class"/>
- <include name="org/jboss/test/ws/samples/jsr109pojo/*JSEEndpoint.class"/>
+ <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/samples/jsr109pojo/rpclit/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-jsr109pojo-rpc-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/samples/jsr109pojo/*Service.class"/>
+ <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/samples/jsr109pojo/rpclit/META-INF">
+ <metainf dir="${build.test.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/samples/jsr109pojo/rpclit/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
- <!-- jbossws-samples-jsr109pojo-doc -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-jsr109pojo-doc.war" webxml="${build.test.dir}/resources/samples/jsr109pojo/doclit/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/samples/jsr109pojo/*Struct.class"/>
- <include name="org/jboss/test/ws/samples/jsr109pojo/*Service.class"/>
- <include name="org/jboss/test/ws/samples/jsr109pojo/*JSEEndpoint.class"/>
+ <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/samples/jsr109pojo/doclit/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-jsr109pojo-doc-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/samples/jsr109pojo/*Struct.class"/>
- <include name="org/jboss/test/ws/samples/jsr109pojo/*Service.class"/>
+ <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/samples/jsr109pojo/doclit/META-INF">
+ <metainf dir="${build.test.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/samples/jsr109pojo/doclit/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
@@ -98,7 +99,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/message (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/message)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/message/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/message/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/message/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="message"/>
+ <property name="chapter" value="jaxrpc/message"/>
+ <property name="sample.path" value="jaxrpc/samples/message"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,7 +20,7 @@
</taskdef>
<!-- samples/message -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/message/WEB-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -29,27 +30,27 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-message -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-message.war" webxml="${build.test.dir}/resources/samples/message/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/message/*Service.class"/>
- <include name="org/jboss/test/ws/samples/message/*ServiceBean.class"/>
+ <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/samples/message/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-message-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-message-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/message/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/samples/message/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/message/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/samples/message/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/message/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
@@ -62,7 +63,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/mtom)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/mtom/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/mtom/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="mtom"/>
+ <property name="chapter" value="jaxrpc/mtom"/>
+ <property name="sample.path" value="jaxrpc/samples/mtom"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,7 +20,7 @@
</taskdef>
<!-- samples/mtom - ->
- <wstools dest="${build.test.dir}/wstools/resources/samples/mtom/WEB-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/mtom/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
-->
@@ -30,24 +31,24 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-mtom -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-mtom.war" webxml="${build.test.dir}/resources/samples/mtom/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/mtom/XOPTestImpl.class"/>
- <include name="org/jboss/test/ws/samples/mtom/XOPTest.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/samples/mtom/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-mtom-client.jar">
- <metainf dir="${build.test.dir}/resources/samples/mtom/META-INF">
+ <jar destfile="${build.test.dir}/libs/jaxrpc-samples-mtom-client.jar">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/samples/mtom/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/mtom/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
@@ -60,7 +61,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/oneway (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/oneway)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/oneway/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/oneway/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/oneway/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="oneway"/>
+ <property name="chapter" value="jaxrpc/oneway"/>
+ <property name="sample.path" value="jaxrpc/samples/oneway"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,7 +20,7 @@
</taskdef>
<!-- samples/oneway -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/oneway/WEB-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -29,27 +30,27 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-oneway -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-oneway.war" webxml="${build.test.dir}/resources/samples/oneway/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/oneway/*Service.class"/>
- <include name="org/jboss/test/ws/samples/oneway/*ServiceBean.class"/>
+ <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/samples/oneway/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-oneway-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-oneway-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/oneway/*Service.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/samples/oneway/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/samples/oneway/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/oneway/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
@@ -62,7 +63,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/rpcstyle (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/rpcstyle)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/rpcstyle/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/rpcstyle/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/rpcstyle/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="rpcstyle"/>
+ <property name="chapter" value="jaxrpc/rpcstyle"/>
+ <property name="sample.path" value="jaxrpc/samples/rpcstyle"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,7 +20,7 @@
</taskdef>
<!-- samples/rpcstyle -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/rpcstyle/WEB-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -29,27 +30,27 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-rpcstyle -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-rpcstyle.war" webxml="${build.test.dir}/resources/samples/rpcstyle/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/rpcstyle/TrivialEndpointJSE.class"/>
- <include name="org/jboss/test/ws/samples/rpcstyle/TrivialService.class"/>
+ <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/samples/rpcstyle/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-rpcstyle-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-rpcstyle-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/rpcstyle/TrivialService.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/samples/rpcstyle/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/samples/rpcstyle/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
@@ -62,7 +63,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/secureejb)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/secureejb/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="secureejb"/>
+ <property name="chapter" value="jaxrpc/secureejb"/>
+ <property name="sample.path" value="jaxrpc/samples/secureejb"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,7 +20,7 @@
</taskdef>
<!-- samples/secureejb -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/secureejb/META-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -29,15 +30,15 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-secureejb -->
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-secureejb.jar">
+ <!-- jaxrpc-samples-secureejb -->
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-secureejb.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/secureejb/OrganizationService.class"/>
- <include name="org/jboss/test/ws/samples/secureejb/OrganizationHome.class"/>
- <include name="org/jboss/test/ws/samples/secureejb/OrganizationRemote.class"/>
- <include name="org/jboss/test/ws/samples/secureejb/OrganizationImpl.class"/>
+ <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/samples/secureejb/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/secureejb/META-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="webservices.xml"/>
<include name="ejb-jar.xml"/>
@@ -45,13 +46,13 @@
<include name="wsdl/**"/>
</metainf>
</jar>
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-secureejb-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-secureejb-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/secureejb/OrganizationService.class"/>
- <include name="org/jboss/test/ws/samples/secureejb/OrganizationHome.class"/>
- <include name="org/jboss/test/ws/samples/secureejb/OrganizationRemote.class"/>
+ <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/samples/secureejb/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/secureejb/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -66,7 +67,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite" if="only-on-jboss">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/swa (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/swa)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/swa/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/swa/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/swa/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="swa"/>
+ <property name="chapter" value="jaxrpc/swa"/>
+ <property name="sample.path" value="jaxrpc/samples/swa"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,7 +20,7 @@
</taskdef>
<!-- samples/swa - ->
- <wstools dest="${build.test.dir}/wstools/resources/samples/swa/WEB-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/swa/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
-->
@@ -30,27 +31,27 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-swa -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-swa.war" webxml="${build.test.dir}/resources/samples/swa/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/swa/AttachmentImpl.class"/>
- <include name="org/jboss/test/ws/samples/swa/Attachment.class"/>
+ <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/samples/swa/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-swa-client.jar">
+ <jar destfile="${build.test.dir}/libs/jaxrpc-samples-swa-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/swa/Attachment.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/samples/swa/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/swa/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/samples/swa/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/swa/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
@@ -63,7 +64,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/wsbpel)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/wsbpel/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="wsbpel" />
+ <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" />
@@ -12,8 +13,8 @@
<target name="zip-processes">
<!-- Zip the BPEL process and related WSDL interfaces -->
- <zip destfile="${build.test.dir}/libs/jbossws-samples-wsbpel-hello-process.zip">
- <fileset dir="${build.test.dir}/resources/samples/wsbpel/hello/bpel" />
+ <zip destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip">
+ <fileset dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" />
</zip>
</target>
@@ -49,8 +50,8 @@
</taskdef>
<!-- Generate binding and service elements -->
- <servicegen processfile="${build.test.dir}/libs/jbossws-samples-wsbpel-hello-process.zip"
- outputdir="${build.test.dir}/wstools/resources/samples/wsbpel/hello/WEB-INF/wsdl" />
+ <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" />
<!-- Define the wstools ant task -->
<taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools">
@@ -62,11 +63,11 @@
</taskdef>
<!-- samples/wsbpel -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/wsbpel/hello/WEB-INF"
+ <wstools dest="${build.test.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/samples/wsbpel/hello/WEB-INF"
+ <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"
includes="org/**" />
</move>
</target>
@@ -79,34 +80,34 @@
if="jbpmbpel.available"
description="build the deployments">
- <!-- jbossws-samples-wsbpel -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-wsbpel-hello.war"
- webxml="${build.test.dir}/resources/samples/wsbpel/hello/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/wsbpel/hello/HelloWorldService.class" />
- <include name="org/jboss/test/ws/samples/wsbpel/hello/Greeter.class" />
- <include name="org/jboss/test/ws/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.test.dir}/resources/samples/wsbpel/hello/WEB-INF">
+ <webinf dir="${build.test.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/samples/wsbpel/hello/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-wsbpel-hello-client.jar">
+ <jar destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/wsbpel/hello/HelloWorldService.class" />
- <include name="org/jboss/test/ws/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.test.dir}/resources/samples/wsbpel/hello/META-INF">
+ <metainf dir="${build.test.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/samples/wsbpel/hello/WEB-INF">
+ <metainf dir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="jaxrpc-mapping.xml" />
</metainf>
</jar>
@@ -119,7 +120,7 @@
<classpath refid="jbpmbpel.classpath" />
</taskdef>
<!-- Store the process definition in the jBPM database -->
- <storeprocess processfile="${build.test.dir}/libs/jbossws-samples-wsbpel-hello-process.zip" />
+ <storeprocess processfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" />
</target>
<!--
@@ -130,7 +131,7 @@
description="run the testsuite"
if="jbpmbpel.available">
<antcall target="test">
- <param name="test" value="${chapter}" />
+ <param name="test" value="${sample.path}" />
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wseventing (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/wseventing)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wseventing/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/wseventing/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wseventing/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="wseventing"/>
+ <property name="chapter" value="jaxrpc/wseventing"/>
+ <property name="sample.path" value="jaxrpc/samples/wseventing"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -20,7 +21,7 @@
</taskdef>
<!-- samples/wseventing
- <wstools dest="${build.test.dir}/wstools/resources/samples/wseventing/WEB-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wseventing/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
-->
@@ -31,27 +32,27 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-eventing.war -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-eventing.war" webxml="${build.test.dir}/resources/samples/wseventing/WEB-INF/web.xml">
+ <!-- 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">
<include name="org/jboss/ws/samples/wseventing/*.class"/>
- <include name="org/jboss/test/ws/samples/wseventing/*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wseventing/*.class"/>
</classes>
- <webinf dir="${build.test.dir}/resources/samples/wseventing/WEB-INF">
+ <webinf dir="${build.test.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/jbossws-samples-eventing-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wseventing-client.jar">
<fileset dir="${build.test.dir}/classes">
<include name="org/jboss/ws/samples/wseventing/*.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/samples/wseventing/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- <metainf dir="${build.test.dir}/resources/samples/wseventing/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wseventing/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
</metainf>
@@ -64,7 +65,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/wssecurity)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/wssecurity/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxrpc/wssecurity/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="wssecurity"/>
+ <property name="chapter" value="jaxrpc/wssecurity"/>
+ <property name="sample.path" value="jaxrpc/samples/wssecurity"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -19,7 +20,7 @@
</taskdef>
<!-- samples/wssecurity -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/wssecurity/WEB-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -29,116 +30,116 @@
-->
<target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments">
- <!-- jbossws-samples-wssecurity-sign -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-wssecurity-sign.war" webxml="${build.test.dir}/resources/samples/wssecurity/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/samples/wssecurity/HelloJavaBean.class"/>
- <include name="org/jboss/test/ws/samples/wssecurity/UserType.class"/>
+ <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/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.test.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/samples/wssecurity/simple-sign">
+ <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-sign">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/samples/wssecurity">
+ <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-wssecurity-sign-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/samples/wssecurity/UserType.class"/>
+ <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/samples/wssecurity/simple-sign/META-INF">
+ <metainf dir="${build.test.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/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
- <!-- jbossws-samples-wssecurity-encrypt -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-wssecurity-encrypt.war" webxml="${build.test.dir}/resources/samples/wssecurity/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/samples/wssecurity/HelloJavaBean.class"/>
- <include name="org/jboss/test/ws/samples/wssecurity/UserType.class"/>
+ <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/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.test.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/samples/wssecurity/simple-encrypt">
+ <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/samples/wssecurity">
+ <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-wssecurity-encrypt-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/samples/wssecurity/UserType.class"/>
+ <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/samples/wssecurity/simple-encrypt/META-INF">
+ <metainf dir="${build.test.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/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
- <!-- jbossws-samples-store-pass-encrypt -->
- <replace file="${build.test.dir}/resources/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${build.test.dir}"/>
- <war warfile="${build.test.dir}/libs/jbossws-samples-store-pass-encrypt.war" webxml="${build.test.dir}/resources/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml">
+ <!-- jaxrpc-samples-store-pass-encrypt -->
+ <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">
- <include name="org/jboss/test/ws/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/samples/wssecurity/HelloJavaBean.class"/>
- <include name="org/jboss/test/ws/samples/wssecurity/PasswordUtil.class"/>
- <include name="org/jboss/test/ws/samples/wssecurity/UserType.class"/>
+ <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/samples/wssecurity/WEB-INF">
+ <webinf dir="${build.test.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/samples/wssecurity/store-pass-encrypt">
+ <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt">
<include name="jboss-wsse-server.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/samples/wssecurity/store-pass-encrypt/WEB-INF">
+ <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF">
<include name="jboss-web.xml"/>
</webinf>
- <webinf dir="${build.test.dir}/resources/samples/wssecurity">
+ <webinf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity">
<include name="wsse.keystore"/>
<include name="wsse.truststore"/>
</webinf>
</war>
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-store-pass-encrypt-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/wssecurity/Hello.class"/>
- <include name="org/jboss/test/ws/samples/wssecurity/UserType.class"/>
+ <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/samples/wssecurity/store-pass-encrypt/META-INF">
+ <metainf dir="${build.test.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/samples/wssecurity/WEB-INF">
+ <metainf dir="${build.test.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF">
<include name="wsdl/**"/>
<include name="jaxrpc-mapping.xml"/>
</metainf>
@@ -151,7 +152,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/jsr181ejb (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/jsr181ejb)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/jsr181ejb/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/jsr181ejb/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/jsr181ejb/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="jsr181ejb"/>
+ <property name="chapter" value="jaxws/jsr181ejb"/>
+ <property name="sample.path" value="jaxws/samples/jsr181ejb"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -21,7 +22,7 @@
</taskdef>
<!-- samples/jsr181ejb -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/jsr181ejb/META-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -32,21 +33,21 @@
<target name="jars" depends="compile15,copy-resources,generate-sources,compile-generated,copy-generated"
description="build the deployments" if="HAVE_JDK_1.5">
- <!-- jbossws-samples-jsr181ejb -->
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-jsr181ejb.ejb3">
+ <!-- jaxws-samples-jsr181ejb -->
+ <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181ejb.ejb3">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/jsr181ejb/EJB3Bean01.class"/>
- <include name="org/jboss/test/ws/samples/jsr181ejb/EJB3RemoteInterface.class"/>
+ <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/samples/jsr181ejb">
+ <fileset dir="${build.test.dir}/resources/jaxws/samples/jsr181ejb">
<include name="config/ServerHandlers.xml"/>
</fileset>
</jar>
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-jsr181ejb-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181ejb-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/jsr181ejb/EndpointInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/samples/jsr181ejb/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181ejb/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
@@ -61,7 +62,7 @@
-->
<target name="tests" depends="jars" description="run the testsuite" if="only-on-jboss-jdk15">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/jsr181pojo (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/jsr181pojo)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/jsr181pojo/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/jsr181pojo/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/jsr181pojo/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="jsr181pojo"/>
+ <property name="chapter" value="jaxws/jsr181pojo"/>
+ <property name="sample.path" value="jaxws/samples/jsr181pojo"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -21,15 +22,9 @@
</taskdef>
<!-- samples/jsr181pojo -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/jsr181pojo/META-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF"
config="${resources.dir}/wstools-config.xml"/>
- <!-- samples/jsr181pojo/docwrapped -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/jsr181pojo/docwrapped/META-INF" config="${resources.dir}/docwrapped/wstools-config.xml"/>
- <move todir="${build.test.dir}/wstools/java">
- <fileset dir="${build.test.dir}/wstools/resources/samples/jsr181pojo/docwrapped/META-INF" includes="org/**"/>
- </move>
-
</target>
<!--
@@ -38,43 +33,23 @@
<target name="jars" depends="compile15,copy-resources,generate-sources,compile-generated,copy-generated"
description="build the deployments" if="HAVE_JDK_1.5">
- <!-- jbossws-samples-jsr181pojo -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-jsr181pojo.war" webxml="${build.test.dir}/resources/samples/jsr181pojo/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/jsr181pojo/JSEBean01.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/>
</classes>
</war>
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-jsr181pojo-client.jar">
+ <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/jsr181pojo/EndpointInterface.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.class"/>
</fileset>
- <metainf dir="${build.test.dir}/resources/samples/jsr181pojo/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181pojo/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
</jar>
-
- <!-- jbossws-samples-jsr181pojo-docwrapped -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-jsr181pojo-docwrapped.war" webxml="${build.test.dir}/resources/samples/jsr181pojo/docwrapped/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/jsr181pojo/docwrapped/JSEBean01.class"/>
- </classes>
- </war>
- <jar jarfile="${build.test.dir}/libs/jbossws-samples-jsr181pojo-docwrapped-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/>
- <include name="org/jboss/test/ws/samples/jsr181pojo/docwrapped/Concat.class"/>
- <include name="org/jboss/test/ws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/samples/jsr181pojo/docwrapped/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
</target>
<!--
@@ -83,7 +58,7 @@
<target name="tests" depends="jars"
description="run the testsuite" if="HAVE_JDK_1.5">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Copied: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/wsaddressing (from rev 1101, branches/tdiesler/jbossws-1.0/src/main/resources/samples/wsaddressing)
Modified: branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/wsaddressing/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/main/resources/samples/wsaddressing/build.xml 2006-10-02 09:22:22 UTC (rev 1101)
+++ branches/tdiesler/jbossws-1.0/src/main/resources/samples/jaxws/wsaddressing/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -2,9 +2,10 @@
<!-- $Id$ -->
-<project default="main" basedir=".." name="JBossWS Examples">
+<project default="main" basedir="../.." name="JBossWS Examples">
- <property name="chapter" value="wsaddressing"/>
+ <property name="chapter" value="jaxws/wsaddressing"/>
+ <property name="sample.path" value="jaxws/samples/wsaddressing"/>
<property name="java.dir" value="${basedir}/${chapter}/java"/>
<property name="resources.dir" value="${basedir}/${chapter}/resources"/>
@@ -21,7 +22,7 @@
</taskdef>
<!-- samples/wsaddressing -->
- <wstools dest="${build.test.dir}/wstools/resources/samples/wsaddressing/META-INF"
+ <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF"
config="${resources.dir}/wstools-config.xml"/>
</target>
@@ -31,20 +32,23 @@
<target name="jars" depends="compile15,copy-resources,generate-sources,compile-generated,copy-generated"
description="build the deployments" if="HAVE_JDK_1.5">
- <!-- jbossws-samples-wsaddressing -->
- <war warfile="${build.test.dir}/libs/jbossws-samples-wsaddressing.war" webxml="${build.test.dir}/resources/samples/wsaddressing/WEB-INF/web.xml">
+ <!-- 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">
- <include name="org/jboss/test/ws/samples/wsaddressing/StatefulEndpointImpl.class"/>
- <include name="org/jboss/test/ws/samples/wsaddressing/StatefulEndpoint.class"/>
- <include name="org/jboss/test/ws/samples/wsaddressing/ServerHandler.class"/>
+ <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">
+ <include name="jaxws-handlers.xml"/>
+ </webinf>
</war>
- <jar destfile="${build.test.dir}/libs/jbossws-samples-wsaddressing-client.jar">
+ <jar destfile="${build.test.dir}/libs/jaxws-samples-wsaddressing-client.jar">
<fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/samples/wsaddressing/StatefulEndpoint.class"/>
- <include name="org/jboss/test/ws/samples/wsaddressing/ClientHandler.class"/>
+ <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/samples/wsaddressing/META-INF">
+ <metainf dir="${build.test.dir}/resources/jaxws/samples/wsaddressing/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jbossws-client-config.xml"/>
@@ -61,7 +65,7 @@
<target name="tests" depends="jars"
description="run the testsuite" if="HAVE_JDK_1.5">
<antcall target="test">
- <param name="test" value="${chapter}"/>
+ <param name="test" value="${sample.path}"/>
</antcall>
</target>
Modified: branches/tdiesler/jbossws-1.0/src/test/ant/build-jars-jaxws.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/test/ant/build-jars-jaxws.xml 2006-10-03 13:57:34 UTC (rev 1123)
+++ branches/tdiesler/jbossws-1.0/src/test/ant/build-jars-jaxws.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -273,26 +273,6 @@
</metainf>
</jar>
- <!-- jaxws-samples-jsr181pojo-docwrapped -->
- <war warfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" webxml="${build.test.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml">
- <classes dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/>
- </classes>
- </war>
- <jar jarfile="${build.test.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar">
- <fileset dir="${build.test.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/>
- </fileset>
- <metainf dir="${build.test.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </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">
Modified: branches/tdiesler/jbossws-1.0/src/test/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/test/build.xml 2006-10-03 13:57:34 UTC (rev 1123)
+++ branches/tdiesler/jbossws-1.0/src/test/build.xml 2006-10-03 15:30:32 UTC (rev 1124)
@@ -10,7 +10,7 @@
<project name="JBossWS-Tests" default="main" basedir="../..">
- <import file="${basedir}/build-thirdparty.xml"/>
+ <import file="${basedir}/src/ant/build-thirdparty.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
@@ -279,12 +279,10 @@
<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/jsr181pojo/docwrapped/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/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"/>
<move todir="${build.test.dir}/wstools/java">
<fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
- <fileset dir="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" includes="org/**"/>
</move>
</target>
Modified: branches/tdiesler/jbossws-1.0/version.properties
===================================================================
--- branches/tdiesler/jbossws-1.0/version.properties 2006-10-03 13:57:34 UTC (rev 1123)
+++ branches/tdiesler/jbossws-1.0/version.properties 2006-10-03 15:30:32 UTC (rev 1124)
@@ -3,7 +3,7 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-1.0
-version.id=1.1.0.DEV
+version.id=1.0.4.GA
repository.id=snapshot
implementation.title=JBoss Web Services (JBossWS)
More information about the jboss-svn-commits
mailing list