Author: thomas.diesler(a)jboss.com Date: 2006-10-17 10:02:51 -0400 (Tue, 17 Oct 2006) New Revision: 1242 Modified: branches/jbossws-1.0/build.xml branches/jbossws-1.0/src/test/build.xml Log: merge from trunk Modified: branches/jbossws-1.0/build.xml =================================================================== --- branches/jbossws-1.0/build.xml 2006-10-17 13:57:51 UTC (rev 1241) +++ branches/jbossws-1.0/build.xml 2006-10-17 14:02:51 UTC (rev 1242) @@ -12,17 +12,17 @@ <!-- $Id$ --> <project default="main" name="JBossWS"> - + <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"/> @@ -44,9 +44,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"/> @@ -54,20 +54,20 @@ <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"/> @@ -83,36 +83,36 @@ <isfalse value="${checksum.ok}"/> </or> </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. | @@ -120,28 +120,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/**"/> @@ -150,18 +150,18 @@ <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/**"/> <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}"/> @@ -176,7 +176,7 @@ </filterset> </copy> </target> - + <!-- Compile resource files --> <target name="compile-resources" depends="init"> <mkdir dir="${build.resources.dir}"/> @@ -184,22 +184,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"> @@ -207,7 +207,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"> @@ -215,7 +215,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"> @@ -224,7 +224,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"> @@ -238,7 +238,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}"> @@ -247,14 +247,14 @@ <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 --> <mkdir dir="${build.lib.dir}/jbossws.beans/META-INF"/> <copy todir="${build.lib.dir}/jbossws.beans/META-INF" file="${build.resources.dir}/jbossws.beans/META-INF/jboss-beans.xml"/> @@ -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"> @@ -359,7 +359,7 @@ <include name="dtd/**"/> </fileset> </jar> - + <!-- Build jbossws14-jboss-integration.jar --> <jar jarfile="${build.lib.dir}/jbossws14-jboss-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${build.classes14.dir}"> @@ -397,7 +397,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}"> @@ -419,14 +419,14 @@ <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> @@ -434,9 +434,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"/> @@ -451,7 +451,7 @@ <classpath refid="integration.classpath"/> <src path="${build.classes.dir}"/> </retro> - + <copy todir="${build.classes14.dir}"> <fileset dir="${build.resources.dir}"> <include name="schema/**"/> @@ -459,11 +459,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"> @@ -475,11 +475,11 @@ </packageset> </javadoc> </target> - + <!-- ================================================================== --> <!-- Deployment --> <!-- ================================================================== --> - + <!-- Deploy jbossws to the server --> <target name="deploy-jbossws" depends="main" description="Deploy jbossws"> <antcall target="deploy-to-server"> @@ -491,13 +491,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>Make sure to point it to your jboss configuration 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}"/> @@ -508,7 +508,7 @@ <param name="jbossws" value="jbossws14"/> </antcall> </target> - + <!-- Deploy to jboss --> <target name="deploy-to-server"> <copy todir="${jboss.deploy.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> @@ -518,14 +518,14 @@ <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/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <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"/> @@ -543,7 +543,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"/> @@ -563,14 +563,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"/> @@ -588,7 +588,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"/> @@ -607,20 +607,20 @@ </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,build-bin-dist,build-src-dist"> </target> @@ -655,7 +655,7 @@ <include name="wstools.sh"/> </fileset> </copy> - + <!-- samples --> <copy todir="${build.bin.dist}" file="${build.dir}/${samples.target}.zip" overwrite="true"/> @@ -666,17 +666,17 @@ <copy todir="${build.bin.dist}/docs" overwrite="true"> <fileset dir="${docs.userguide.dir}/build/en/pdf"/> </copy> - + <!-- lib/jdk1.5 --> <copy todir="${build.bin.dist}/lib/jboss-jdk1.5" overwrite="true"> <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/> </copy> - + <!-- lib/jdk1.4 --> <copy todir="${build.bin.dist}/lib/jboss-jdk1.4" overwrite="true"> <fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/> </copy> - + <!-- lib/tomcat --> <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true"> <fileset dir="${thirdparty.dir}"> @@ -718,5 +718,5 @@ <zip destfile="${build.dir}/jbossws-${version.id}-src.zip" basedir="${build.src.dist}" includes="jbossws-${version.id}/**"/> </target> - + </project> Modified: branches/jbossws-1.0/src/test/build.xml =================================================================== --- branches/jbossws-1.0/src/test/build.xml 2006-10-17 13:57:51 UTC (rev 1241) +++ branches/jbossws-1.0/src/test/build.xml 2006-10-17 14:02:51 UTC (rev 1242) @@ -18,7 +18,7 @@ <property file="${basedir}/ant.properties"/> <property file="${basedir}/version.properties"/> - + <property name="build.dir" value="${basedir}/output"/> <property name="build.lib.dir" value="${build.dir}/lib"/> <property name="build.test.dir" value="${build.dir}/tests"/> @@ -429,6 +429,7 @@ <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> + <sysproperty key="client.scenario" value="${client.scenario}"/> <classpath> <path refid="test.client.classpath"/> <pathelement location="${build.test.dir}/classes"/>