Author: thomas.diesler(a)jboss.com Date: 2006-12-22 07:49:28 -0500 (Fri, 22 Dec 2006) New Revision: 1723 Added: trunk/build/import/build-setup.xml Modified: trunk/build/build.xml trunk/build/import/build-release.xml trunk/build/import/build-thirdparty.xml Log: restructure build Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2006-12-22 08:47:42 UTC (rev 1722) +++ trunk/build/build.xml 2006-12-22 12:49:28 UTC (rev 1723) @@ -11,536 +11,45 @@ <!-- $Id$ --> -<project default="main" name="JBossWS"> +<project default="main" basedir="../build" name="JBossWS-Build"> <import file="${basedir}/import/build-thirdparty.xml"/> - <import file="${basedir}/import/build-samples.xml"/> + <import file="${basedir}/import/build-setup.xml"/> <import file="${basedir}/import/build-release.xml"/> + <import file="${basedir}/../integration-jboss42/build.xml"/> + <import file="${basedir}/../integration-jboss50/build.xml"/> + <import file="${basedir}/../integration-tomcat/build.xml"/> + <import file="${basedir}/../jbossws/build.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"/> - <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.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-docs" value="${build.dir}/api-docs"/> - <property name="docs.userguide.dir" value="${basedir}/docs/user-guide/project"/> - <property name="jbossws.src.dir" value="${basedir}/../jbossws/src/main"/> - <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"/> - <property name="test.resources.dir" value="${test.dir}/resources"/> - - <property name="integration.jboss42.dir" value="${basedir}/../integration-jboss42"/> - <property name="integration.jboss50.dir" value="${basedir}/../integration-jboss50"/> - <property name="integration.tomcat.dir" value="${basedir}/../integration-tomcat"/> - - <property name="thirdparty.dir" value="${basedir}/thirdparty"/> - - <property name="jboss50.lib" value="${jboss50.home}/lib"/> - <property name="jboss50.client" value="${jboss50.home}/client"/> - <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> - <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> - <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> - <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> - <property name="jboss50.thirdparty" value="${jboss50.home}/../../../thirdparty"/> - - <property name="jboss42.lib" value="${jboss42.home}/lib"/> - <property name="jboss42.client" value="${jboss42.home}/client"/> - <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> - <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> - <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> - <property name="jboss42.thirdparty" value="${jboss42.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="jboss50.home = ${jboss50.home}"/> - <echo message="jboss42.home = ${jboss42.home}"/> - <echo message="tomcat.home = ${tomcat.home}"/> - <echo/> - - <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> - <available property="jboss50.ejb3.available" file="${jboss50.client}/jboss-ejb3-client.jar"/> - <available property="jboss42.ejb3.available" file="${jboss42.client}/jboss-ejb3-client.jar"/> - <available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/> - <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/> - <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> - - <checksum file="version.properties" fileext=".md5" verifyproperty="checksum.ok"/> - <checksum file="version.properties" fileext=".md5"/> - - <condition property="force.thirdparty.get"> - <or> - <not> - <available file="${thirdparty.dir}" type="dir"/> - </not> - <isfalse value="${checksum.ok}"/> - </or> - </condition> - - <fail message="Not available: ${jboss50.client}/jboss-ejb3-client.jar" unless="jboss50.ejb3.available"/> - <fail message="Not available: ${jboss42.client}/jboss-ejb3-client.jar" unless="jboss42.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> - </target> <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <!-- - | Compile everything. - | - | This target should depend on other compile-* targets for each - | different type of compile that needs to be performed, short of - | documentation compiles. - --> - - <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"/> - - <!-- Compile core java sources --> - <target name="compile-interfaces" depends="init"> - <mkdir dir="${build.classes14.dir}"/> - <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/**"/> - <classpath refid="core.classpath"/> - </javac> - </target> - - <!-- Compile core java sources --> - <target name="compile-core" depends="compile-interfaces"> - <mkdir dir="${build.classes.dir}"/> - <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/**"/> - <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/**"/> - <classpath path="${build.classes14.dir}"/> - <classpath refid="core.classpath"/> - </javac> - </target> - - <!-- Compile integration java sources --> - <target name="compile-integration" depends="compile-jboss50-integration,compile-jboss42-integration,compile-tomcat-integration"/> - <target name="compile-jboss50-integration" depends="compile-core"> - <mkdir dir="${build.classes.dir}"/> - <javac srcdir="${integration.jboss50.dir}/src/main/java" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/ws/integration/jboss50/**"/> - <classpath path="${build.classes14.dir}"/> - <classpath refid="jboss50.integration.classpath"/> - <classpath refid="core.classpath"/> - </javac> - </target> - <target name="compile-jboss42-integration" depends="compile-core"> - <mkdir dir="${build.classes.dir}"/> - <javac srcdir="${integration.jboss42.dir}/src/main/java" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/ws/integration/jboss42/**"/> - <classpath path="${build.classes14.dir}"/> - <classpath refid="jboss42.integration.classpath"/> - <classpath refid="core.classpath"/> - </javac> - </target> - <target name="compile-tomcat-integration" depends="compile-core"> - <mkdir dir="${build.classes.dir}"/> - <javac srcdir="${integration.tomcat.dir}/src/main/java" sourcepath="" destdir="${build.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/ws/integration/tomcat/**"/> - <classpath path="${build.classes14.dir}"/> - <classpath refid="tomcat.integration.classpath"/> - <classpath refid="core.classpath"/> - </javac> - </target> - - <!-- Compile etc files (manifests and such) --> - <target name="compile-etc" depends="init"> - <mkdir dir="${build.etc.dir}"/> - <copy todir="${build.etc.dir}" filtering="yes" overwrite="yes"> - <fileset dir="${basedir}/etc"/> - <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="version.properties"/> - </filterset> - </copy> - </target> - - <!-- ================================================================== --> <!-- Archives --> <!-- ================================================================== --> <!-- | Build all jar files. --> - <target name="jars" description="Builds all jar files." depends="compile,module-jars"> + <target name="jars" depends="init" description="Builds all jar files."> + <ant antfile="${jbossws.dir}/build.xml" target="jbossws-jars" dir="${jbossws.dir}" inheritall="false"/> + <ant antfile="${integration.jboss42.dir}/build.xml" target="jboss42-jars" inheritall="false"/> + <ant antfile="${integration.jboss50.dir}/build.xml" target="jboss50-jars" inheritall="false"/> + <ant antfile="${integration.tomcat.dir}/build.xml" target="tomcat-jars" inheritall="false"/> </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"> - <fileset dir="${build.classes14.dir}"> - <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"> - <fileset dir="${build.classes14.dir}"> - <include name="javax/xml/soap/**"/> - </fileset> - <metainf dir="${jbossws.resources.dir}/jboss-saaj.jar/META-INF"/> - </jar> - - <!-- Build jboss-jaxws.jar --> - <mkdir dir="${build.lib.dir}"/> - <jar jarfile="${build.lib.dir}/jboss-jaxws.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes.dir}"> - <include name="javax/jws/**"/> - <include name="javax/xml/ws/**"/> - <include name="org/jboss/ws/jaxws/injection/**"/> - </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"> - <fileset dir="${build.classes.dir}"> - <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/**"/> - </fileset> - <fileset dir="${jbossws.resources.dir}"> - <include name="schema/**"/> - <include name="dtd/**"/> - </fileset> - </jar> - - <!-- Build jbossws-jboss50-integration.jar --> - <jar jarfile="${build.lib.dir}/jbossws-jboss50-integration.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes.dir}"> - <include name="org/jboss/ws/integration/*.class"/> - <include name="org/jboss/ws/integration/jboss50/**"/> - </fileset> - </jar> - - <!-- Build jbossws-jboss42-integration.jar --> - <jar jarfile="${build.lib.dir}/jbossws-jboss42-integration.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes.dir}"> - <include name="org/jboss/ws/integration/*.class"/> - <include name="org/jboss/ws/integration/jboss42/**"/> - </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-client.jar --> - <jar jarfile="${build.lib.dir}/jbossws-client.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.classes14.dir}"> - <include name="javax/xml/rpc/**"/> - <include name="javax/xml/soap/**"/> - </fileset> - <fileset dir="${build.classes.dir}"> - <include name="javax/xml/ws/**"/> - <include name="javax/jws/**"/> - <include name="org/jboss/ws/**"/> - <exclude name="org/jboss/ws/integration/jboss50/**"/> - <exclude name="org/jboss/ws/integration/tomcat/**"/> - </fileset> - <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="${jbossws.resources.dir}"> - <include name="schema/**"/> - <include name="dtd/**"/> - </fileset> - <fileset dir="${build.etc.dir}"> - <include name="wstools.sh"/> - <include name="wstools.bat"/> - <include name="wstools-log4j.xml"/> - </fileset> - <metainf dir="${jbossws.resources.dir}/jboss-saaj.jar/META-INF"/> - </jar> - - <!-- Build jbossws-context.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="${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="${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="${jbossws.resources.dir}/jbossws.war/Tomcat"> - <include name="META-INF/jboss-beans.xml"/> - </fileset> - <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="${jbossws.resources.dir}/jbossws.war/Tomcat/WEB-INF"> - <include name="log4j.xml"/> - </classes> - </war> - - <!-- 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> - <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> - <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}/jbossws50.deployer" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.lib.dir}"> - <include name="jbossws-jboss50-integration.jar"/> - <include name="jbossws-core.jar"/> - <include name="jboss-jaxws.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="wsdl4j.jar"/> - </fileset> - <metainf dir="${integration.jboss50.dir}/src/resources/jbossws.deployer/META-INF"> - <include name="jbossws-deployer-beans.xml"/> - </metainf> - </jar> - - <echo message="${integration.jboss42.dir}/src/resources/jbossws.sar"/> - - <!-- Build jbossws42.sar --> - <jar jarfile="${build.lib.dir}/jbossws42.sar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.lib.dir}"> - <include name="jbossws-jboss42-integration.jar"/> - <include name="jbossws-core.jar"/> - <include name="jboss-jaxws.jar"/> - <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/jboss-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> - <metainf dir="${integration.jboss42.dir}/src/resources/jbossws.sar/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> - + <target name="build-docs" description="Build the documentation"> + <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/> </target> - <!-- ================================================================== --> - <!-- Documentation --> - <!-- ================================================================== --> - - <!-- Generate the JavaDoc --> - <target name="javadoc" depends="init" description="Generate the Javadoc"> - - <mkdir dir="${build.api-docs}"/> - <javadoc destdir="${build.api-docs}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <packageset dir="${jbossws.java.dir}" defaultexcludes="yes"> - <include name="org/jboss/ws/**"/> - </packageset> - <packageset dir="${jboss.server.root}/../src/main" defaultexcludes="yes"> - <include name="org/jboss/webservice/metadata/**"/> - </packageset> - - <doctitle><![CDATA[<h1>JBossWS</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> - <group title="Core" packages="org.jboss.ws.core*"/> - <group title="Metadata" packages="org.jboss.ws.metadata*"/> - <group title="Integration" packages="org.jboss.ws.integration*"/> - <group title="Extensions" packages="org.jboss.ws.extensions*"/> - <group title="Tools" packages="org.jboss.ws.tools*"/> - </javadoc> - </target> - - <!-- ================================================================== --> - <!-- Deployment --> - <!-- ================================================================== --> - - <!-- 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 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"/> - </fileset> - </copy> - <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="${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 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"/> - <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/> - <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xercesImpl.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/activation.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/log4j.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${thirdparty.dir}/mailapi.jar"/> - <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-core.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-jaxws.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${build.lib.dir}/jboss-saaj.jar" overwrite="true"/> - <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"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jaxb-api.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-common-core.jar"/> - <unjar dest="${build.lib.dir}/build" src="${jboss.server.lib}/jboss-j2ee.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-logging-spi.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-microcontainer.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-remoting.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-xml-binding.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/javassist.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/concurrent.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/wsdl4j.jar"/> - <unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/xmlsec.jar"/> - <jar jarfile="${build.lib.dir}/jbossws-thirdparty.jar" manifest="${build.etc.dir}/default.mf"> - <fileset dir="${build.lib.dir}/build"/> - </jar> - <delete dir="${build.lib.dir}/build"/> - </target> - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${build.dir}"/> + <delete dir="${output.dir}"/> + <ant antfile="${jbossws.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="${integration.jboss42.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="${integration.jboss50.dir}/build.xml" target="clean" inheritall="false"/> + <ant antfile="${integration.tomcat.dir}/build.xml" target="clean" inheritall="false"/> </target> - <target name="build-docs" description="Build the documentation"> - <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/> - </target> - <target name="main" description="Executes the default target (most)." depends="most"/> <target name="most" description="Builds almost everything." depends="jars"/> Modified: trunk/build/import/build-release.xml =================================================================== --- trunk/build/import/build-release.xml 2006-12-22 08:47:42 UTC (rev 1722) +++ trunk/build/import/build-release.xml 2006-12-22 12:49:28 UTC (rev 1723) @@ -100,7 +100,7 @@ <!-- Build the bin dist --> <target name="build-bin-dist" description="Build the binary distribution" - depends="main,jbossws-thirdparty-jar,build-samples,build-docs"> + depends="main,tomcat-thirdparty-jar,build-samples,build-docs"> <mkdir dir="${build.bin.dist}"/> <mkdir dir="${build.bin.dist}/bin"/> Added: trunk/build/import/build-setup.xml =================================================================== --- trunk/build/import/build-setup.xml 2006-12-22 08:47:42 UTC (rev 1722) +++ trunk/build/import/build-setup.xml 2006-12-22 12:49:28 UTC (rev 1723) @@ -0,0 +1,92 @@ +<?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 name="JBossWS-Setup"> + + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> + + <property file="${basedir}/../build/ant.properties"/> + <property file="${basedir}/../build/version.properties"/> + <property environment="env"/> + + <property name="build.dir" value="${basedir}/../build"/> + <property name="docs.dir" value="${basedir}/../docs"/> + <property name="integration.jboss42.dir" value="${basedir}/../integration-jboss42"/> + <property name="integration.jboss50.dir" value="${basedir}/../integration-jboss50"/> + <property name="integration.tomcat.dir" value="${basedir}/../integration-tomcat"/> + <property name="jbossws.dir" value="${basedir}/../jbossws"/> + + <property name="docs.userguide.dir" value="${docs.dir}/user-guide/project"/> + <property name="output.etc.dir" value="${build.dir}/output/etc"/> + <property name="thirdparty.dir" value="${build.dir}/thirdparty"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + <property name="jboss50.thirdparty" value="${jboss50.home}/../../../thirdparty"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + <property name="jboss42.thirdparty" value="${jboss42.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="jboss50.home = ${jboss50.home}"/> + <echo message="jboss42.home = ${jboss42.home}"/> + <echo message="tomcat.home = ${tomcat.home}"/> + <echo/> + + <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> + <available property="jboss50.ejb3.available" file="${jboss50.client}/jboss-ejb3-client.jar"/> + <available property="jboss42.ejb3.available" file="${jboss42.client}/jboss-ejb3-client.jar"/> + <available property="jbossws.thirdparty.available" file="${output.lib.dir}/jbossws-thirdparty.jar"/> + <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/> + <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> + + <checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <checksum file="${build.dir}/version.properties" fileext=".md5"/> + + <condition property="force.thirdparty.get"> + <or> + <not> + <available file="${thirdparty.dir}" type="dir"/> + </not> + <isfalse value="${checksum.ok}"/> + </or> + </condition> + + <fail message="Not available: ${jboss50.client}/jboss-ejb3-client.jar" unless="jboss50.ejb3.available"/> + <fail message="Not available: ${jboss42.client}/jboss-ejb3-client.jar" unless="jboss42.ejb3.available"/> + + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + + </target> + +</project> \ No newline at end of file Property changes on: trunk/build/import/build-setup.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/build/import/build-thirdparty.xml =================================================================== --- trunk/build/import/build-thirdparty.xml 2006-12-22 08:47:42 UTC (rev 1722) +++ trunk/build/import/build-thirdparty.xml 2006-12-22 12:49:28 UTC (rev 1723) @@ -104,6 +104,8 @@ <!-- The classpath for the jboss50 integration --> <path id="jboss50.integration.classpath"> + <path refid="library.classpath"/> + <path refid="jboss.core.classpath"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> <pathelement location="${jboss50.lib}/jboss-jmx.jar"/> <pathelement location="${jboss50.lib}/jboss-mbeans.jar"/> @@ -116,6 +118,8 @@ <!-- The classpath for the jboss42 integration --> <path id="jboss42.integration.classpath"> + <path refid="library.classpath"/> + <path refid="jboss.core.classpath"/> <pathelement location="${jboss42.lib}/jboss-jmx.jar"/> <pathelement location="${jboss42.lib}/jboss-system.jar"/> <pathelement location="${jboss42.server.lib}/jboss.jar"/>