[jbossws-commits] JBossWS SVN: r1732 - trunk/integration-tomcat

Author: thomas.diesler(a)jboss.com Date: 2006-12-22 08:05:56 -0500 (Fri, 22 Dec 2006) New Revision: 1732 Modified: trunk/integration-tomcat/build.xml Log: restructure build Modified: trunk/integration-tomcat/build.xml =================================================================== --- trunk/integration-tomcat/build.xml 2006-12-22 13:05:53 UTC (rev 1731) +++ trunk/integration-tomcat/build.xml 2006-12-22 13:05:56 UTC (rev 1732) @@ -15,13 +15,17 @@ <import file="${basedir}/../build/import/build-setup.xml"/> <import file="${basedir}/../build/import/build-thirdparty.xml"/> + <import file="${basedir}/../jbossws/build.xml"/> + <property name="tomcat.src.dir" value="${integration.tomcat.dir}/src/main"/> + <property name="tomcat.java.dir" value="${tomcat.src.dir}/java"/> + <property name="tomcat.resources.dir" value="${tomcat.src.dir}/resources"/> + <property name="tomcat.output.dir" value="${integration.tomcat.dir}/output"/> + <property name="tomcat.output.classes.dir" value="${tomcat.output.dir}/classes"/> + <property name="tomcat.output.classes14.dir" value="${tomcat.output.dir}/classes14"/> + <property name="tomcat.output.lib.dir" value="${tomcat.output.dir}/lib"/> + <target name="tomcat-init" depends="prepare, thirdparty"> - <path id="core.classpath"> - <path refid="library.classpath"/> - <path refid="jboss.core.classpath"/> - <path path="${jbossws.dir}/output/lib/jbossws-client.jar"/> - </path> </target> <!-- ================================================================== --> @@ -39,15 +43,14 @@ <target name="tomcat-compile" depends="tomcat-init,tomcat-compile-classes,tomcat-compile-etc" description="Compile all source files."/> <!-- Compile java sources --> - <target name="tomcat-compile-classes" depends="tomcat-init"> - <mkdir dir="${output.classes.dir}"/> - <ant antfile="${jbossws.dir}/build.xml" target="jbossws-jars" dir="${jbossws.dir}" inheritall="false"/> - <javac srcdir="${integration.tomcat.dir}/src/main/java" sourcepath="" destdir="${output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <target name="tomcat-compile-classes" depends="tomcat-init,jbossws-compile"> + <mkdir dir="${tomcat.output.classes.dir}"/> + <javac srcdir="${tomcat.java.dir}" sourcepath="" destdir="${tomcat.output.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="${output.classes14.dir}"/> <classpath refid="tomcat.integration.classpath"/> - <classpath refid="core.classpath"/> + <classpath path="${jbossws.output.classes14.dir}"/> + <classpath path="${jbossws.output.classes.dir}"/> </javac> </target> @@ -71,15 +74,15 @@ <target name="tomcat-module-jars"> <!-- Build jbossws-tomcat-integration.jar --> - <mkdir dir="${output.lib.dir}"/> - <jar jarfile="${output.lib.dir}/jbossws-tomcat-integration.jar" manifest="${output.etc.dir}/default.mf"> - <fileset dir="${output.classes.dir}"> + <mkdir dir="${tomcat.output.lib.dir}"/> + <jar jarfile="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar" manifest="${output.etc.dir}/default.mf"> + <fileset dir="${tomcat.output.classes.dir}"> <include name="org/jboss/ws/integration/tomcat/**"/> </fileset> </jar> <!-- Build jbossws.war --> - <war warfile="${output.lib.dir}/jbossws.war" webxml="${jbossws.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml"> + <war warfile="${tomcat.output.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"/> @@ -112,13 +115,13 @@ <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="${output.lib.dir}/jbossws-core.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jboss-jaxws.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/> - <copy todir="${tomcat.common.dir}/lib" file="${output.lib.dir}/jboss-saaj.jar" overwrite="true"/> - <copy todir="${tomcat.webapps.dir}" file="${output.lib.dir}/jbossws.war" overwrite="true"/> + <copy todir="${tomcat.common.dir}/lib" file="${jbossws.output.lib.dir}/jbossws-core.jar" overwrite="true"/> + <copy todir="${tomcat.common.dir}/lib" file="${jbossws.output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/> + <copy todir="${tomcat.common.dir}/lib" file="${jbossws.output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/> + <copy todir="${tomcat.common.dir}/lib" file="${jbossws.output.lib.dir}/jboss-jaxws.jar" overwrite="true"/> + <copy todir="${tomcat.common.dir}/lib" file="${jbossws.output.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/> + <copy todir="${tomcat.common.dir}/lib" file="${jbossws.output.lib.dir}/jboss-saaj.jar" overwrite="true"/> + <copy todir="${tomcat.webapps.dir}" file="${tomcat.output.lib.dir}/jbossws.war" overwrite="true"/> <delete dir="${tomcat.webapps.dir}/jbossws"/> </target> @@ -145,7 +148,7 @@ </target> <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${output.dir}"/> + <delete dir="${tomcat.output.dir}"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/>