Author: thomas.diesler(a)jboss.com Date: 2006-12-21 09:31:00 -0500 (Thu, 21 Dec 2006) New Revision: 1693 Modified: branches/tdiesler/trunk/build/build.xml Log: partial commit Modified: branches/tdiesler/trunk/build/build.xml =================================================================== --- branches/tdiesler/trunk/build/build.xml 2006-12-21 14:30:54 UTC (rev 1692) +++ branches/tdiesler/trunk/build/build.xml 2006-12-21 14:31:00 UTC (rev 1693) @@ -30,18 +30,15 @@ <property name="build.classes14.dir" value="${build.dir}/classes14"/> <property name="build.etc.dir" value="${build.dir}/etc"/> <property name="build.lib.dir" value="${build.dir}/lib"/> - <property name="build.resources.dir" value="${build.dir}/resources"/> <property name="build.samples.dir" value="${build.dir}/samples"/> <property name="build.bin.dist" value="${build.dir}/bin-dist"/> <property name="build.src.dist" value="${build.dir}/src-dist"/> <property name="build.api" value="${build.dir}/api"/> <property name="docs.userguide.dir" value="${basedir}/docs/user-guide/project"/> - <property name="src.dir" value="${basedir}/../jbossws/src/main"/> - <property name="src.etc.dir" value="${src.dir}/etc"/> - <property name="src.java.dir" value="${src.dir}/java"/> - <property name="src.resources.dir" value="${src.dir}/resources"/> - <property name="src.dist.dir" value="${src.resources.dir}/dist"/> - <property name="src.samples.dir" value="${src.resources.dir}/samples"/> + <property name="jbossws.src.dir" value="${basedir}/../jbossws/src/main"/> + <property name="jbossws.etc.dir" value="${jbossws.src.dir}/etc"/> + <property name="jbossws.java.dir" value="${jbossws.src.dir}/java"/> + <property name="jbossws.resources.dir" value="${jbossws.src.dir}/resources"/> <property name="test.dir" value="${basedir}/src/test"/> <property name="test.etc.dir" value="${test.dir}/etc"/> <property name="test.java.dir" value="${test.dir}/java"/> @@ -132,7 +129,7 @@ | documentation compiles. --> - <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/> + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> <!-- Compile java sources --> <target name="compile-classes" depends="compile-interfaces,compile-core,compile-integration"/> @@ -140,7 +137,7 @@ <!-- Compile core java sources --> <target name="compile-interfaces" depends="init"> <mkdir dir="${build.classes14.dir}"/> - <javac srcdir="${src.java.dir}" destdir="${build.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + <javac srcdir="${jbossws.java.dir}" destdir="${build.classes14.dir}" encoding="utf-8" 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/**"/> @@ -151,7 +148,7 @@ <!-- 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}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac srcdir="${jbossws.java.dir}" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="javax/xml/ws/**"/> <include name="javax/jws/**"/> @@ -199,7 +196,7 @@ <target name="compile-etc" depends="init"> <mkdir dir="${build.etc.dir}"/> <copy todir="${build.etc.dir}" filtering="yes" overwrite="yes"> - <fileset dir="${src.etc.dir}"/> + <fileset dir="${jbossws.etc.dir}"/> <filterset> <filter token="java.vm.version" value="${java.vm.version}"/> <filter token="java.vm.vendor" value="${java.vm.vendor}"/> @@ -210,14 +207,6 @@ </copy> </target> - <!-- Compile resource files --> - <target name="compile-resources" depends="init"> - <mkdir dir="${build.resources.dir}"/> - <copy todir="${build.resources.dir}" filtering="yes" overwrite="yes"> - <fileset dir="${src.resources.dir}"/> - </copy> - </target> - <!-- ================================================================== --> <!-- Archives --> <!-- ================================================================== --> @@ -247,7 +236,7 @@ <fileset dir="${build.classes14.dir}"> <include name="javax/xml/soap/**"/> </fileset> - <metainf dir="${build.resources.dir}/jboss-saaj.jar/META-INF"/> + <metainf dir="${jbossws.resources.dir}/jboss-saaj.jar/META-INF"/> </jar> <!-- Build jboss-jaxws.jar --> @@ -267,7 +256,7 @@ <include name="org/jboss/ws/**"/> <exclude name="org/jboss/ws/integration/**"/> </fileset> - <fileset dir="${build.resources.dir}"> + <fileset dir="${jbossws.resources.dir}"> <include name="schema/**"/> <include name="dtd/**"/> </fileset> @@ -309,11 +298,11 @@ <exclude name="org/jboss/ws/integration/jboss50/**"/> <exclude name="org/jboss/ws/integration/tomcat/**"/> </fileset> - <fileset dir="${build.resources.dir}/jbossws.sar"> + <fileset dir="${jbossws.resources.dir}/jbossws.sar"> <include name="META-INF/standard-jaxrpc-client-config.xml"/> <include name="META-INF/standard-jaxws-client-config.xml"/> </fileset> - <fileset dir="${build.resources.dir}"> + <fileset dir="${jbossws.resources.dir}"> <include name="schema/**"/> <include name="dtd/**"/> </fileset> @@ -322,42 +311,42 @@ <include name="wstools.bat"/> <include name="wstools-log4j.xml"/> </fileset> - <metainf dir="${build.resources.dir}/jboss-saaj.jar/META-INF"/> + <metainf dir="${jbossws.resources.dir}/jboss-saaj.jar/META-INF"/> </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"> + <war warfile="${build.lib.dir}/jbossws-context.war" webxml="${jbossws.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml"> + <fileset dir="${jbossws.resources.dir}/jbossws.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${build.resources.dir}/jbossws.war/JBoss/WEB-INF"> + <webinf dir="${jbossws.resources.dir}/jbossws.war/JBoss/WEB-INF"> <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"> + <war warfile="${build.lib.dir}/jbossws.war" webxml="${jbossws.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml"> + <fileset dir="${jbossws.resources.dir}/jbossws.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <fileset dir="${build.resources.dir}/jbossws.war/Tomcat"> + <fileset dir="${jbossws.resources.dir}/jbossws.war/Tomcat"> <include name="META-INF/jboss-beans.xml"/> </fileset> - <fileset dir="${build.resources.dir}/jbossws.sar"> + <fileset dir="${jbossws.resources.dir}/jbossws.sar"> <include name="META-INF/standard-jaxrpc-client-config.xml"/> <include name="META-INF/standard-jaxrpc-endpoint-config.xml"/> <include name="META-INF/standard-jaxws-client-config.xml"/> <include name="META-INF/standard-jaxws-endpoint-config.xml"/> </fileset> - <classes dir="${build.resources.dir}/jbossws.war/Tomcat/WEB-INF"> + <classes dir="${jbossws.resources.dir}/jbossws.war/Tomcat/WEB-INF"> <include name="log4j.xml"/> </classes> </war> - <!-- Build jbossws.sar --> - <jar jarfile="${build.lib.dir}/jbossws.sar" manifest="${build.etc.dir}/default.mf"> + <!-- Build jbossws50.sar --> + <jar jarfile="${build.lib.dir}/jbossws50.sar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${build.lib.dir}"> <include name="jbossws-context.war"/> </fileset> @@ -370,16 +359,16 @@ <include name="wstx-lgpl-2.9.3.jar"/> <include name="xmlsec.jar"/> </fileset> - <fileset dir="${build.resources.dir}/jbossws.sar"> - <include name="META-INF/standard-jaxrpc-client-config.xml"/> - <include name="META-INF/standard-jaxrpc-endpoint-config.xml"/> - <include name="META-INF/standard-jaxws-client-config.xml"/> - <include name="META-INF/standard-jaxws-endpoint-config.xml"/> - </fileset> + <metainf dir="${jbossws.resources.dir}/jbossws.sar/META-INF"> + <include name="standard-jaxrpc-client-config.xml"/> + <include name="standard-jaxrpc-endpoint-config.xml"/> + <include name="standard-jaxws-client-config.xml"/> + <include name="standard-jaxws-endpoint-config.xml"/> + </metainf> </jar> <!-- Build jbossws.deployer --> - <jar jarfile="${build.lib.dir}/jbossws.deployer" manifest="${build.etc.dir}/default.mf"> + <jar jarfile="${build.lib.dir}/jbossws50.deployer" manifest="${build.etc.dir}/default.mf"> <fileset dir="${build.lib.dir}"> <include name="jbossws-jboss-integration.jar"/> <include name="jbossws-core.jar"/> @@ -388,14 +377,36 @@ <fileset dir="${thirdparty.dir}"> <include name="wsdl4j.jar"/> </fileset> - <metainf dir="${build.resources.dir}/jbossws.deployer/META-INF"> + <metainf dir="${integration.jboss50.dir}/src/resources/jbossws.deployer/META-INF"> <include name="jbossws-deployer-beans.xml"/> </metainf> </jar> - <zip destfile="${build.lib.dir}/jbossws-src.zip"> - <fileset dir="${src.java.dir}"/> - </zip> + <!-- Build jbossws42.sar --> + <jar jarfile="${build.lib.dir}/jbossws42.sar" manifest="${build.etc.dir}/default.mf"> + <fileset dir="${build.lib.dir}"> + <include name="jbossws-context.war"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="policy-1.0.jar"/> + <include name="sjsxp.jar"/> + <include name="stax-api-1.0.jar"/> + <include name="wstx-lgpl-2.9.3.jar"/> + <include name="xmlsec.jar"/> + </fileset> + <fileset dir="${integration.jboss42.dir}/src/resources"> + <include name="jbossws.beans/META-INF/jbossws-beans.xml"/> + </fileset> + <metainf dir="${jbossws.resources.dir}/jbossws.sar/META-INF"> + <include name="standard-jaxrpc-client-config.xml"/> + <include name="standard-jaxrpc-endpoint-config.xml"/> + <include name="standard-jaxws-client-config.xml"/> + <include name="standard-jaxws-endpoint-config.xml"/> + </metainf> + </jar> + </target> <!-- ================================================================== --> @@ -407,7 +418,7 @@ <mkdir dir="${build.api}"/> <javadoc destdir="${build.api}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <packageset dir="${src.java.dir}" defaultexcludes="yes"> + <packageset dir="${jbossws.java.dir}" defaultexcludes="yes"> <include name="org/jboss/ws/**"/> </packageset> <packageset dir="${jboss.server.root}/../src/main" defaultexcludes="yes"> @@ -428,52 +439,53 @@ <!-- Deployment --> <!-- ================================================================== --> - <!-- Deploy jbossws to the server --> - <target name="deploy-jbossws" depends="main" description="Deploy jbossws"> - <antcall target="deploy-to-server"> - <param name="jboss.deploy.home" value="${jboss.jdk15.home}"/> - <param name="jbossws" value="jbossws"/> - </antcall> - <antcall target="deploy-to-thirdparty"> - <param name="jboss.deploy.home" value="${jboss.jdk15.home}"/> - <param name="jbossws" value="jbossws"/> - </antcall> + <!-- Deploy jbossws to the jboss50 --> + <target name="deploy-jboss50" depends="main" description="Deploy jbossws"> + <copy todir="${jboss50.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <copy todir="${jboss50.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="${build.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="${build.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${build.lib.dir}/jbossws50.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${build.lib.dir}/jbossws50.sar"/> </target> - <!-- Deploy to jboss --> - <target name="deploy-to-server"> - <copy todir="${jboss.deploy.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <copy todir="${jboss.deploy.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> - <copy todir="${jboss.deploy.home}/client" overwrite="true"> + <!-- Deploy jbossws to the jboss42 --> + <target name="deploy-jboss42" depends="main" description="Deploy jbossws"> + <copy todir="${jboss42.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <copy todir="${jboss42.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <copy todir="${jboss42.home}/client" overwrite="true"> <fileset dir="${build.lib.dir}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-saaj.jar"/> - <include name="${jbossws}-client.jar"/> + <include name="jbossws-client.jar"/> </fileset> </copy> - <copy todir="${jboss.deploy.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${build.lib.dir}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-saaj.jar"/> </fileset> </copy> - <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <mkdir dir="${jboss.deploy.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${build.lib.dir}/jbossws.deployer"/> - <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/> - <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"/> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${build.lib.dir}/jbossws42.sar"/> </target> - <!-- Deploy to jboss/thirdparty --> - <target name="deploy-to-thirdparty" if="jboss.source.dist.available"> - <!-- Only needed for the JBossAS webservice testsuite - <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"/>