Author: thomas.diesler(a)jboss.com Date: 2006-12-22 09:58:14 -0500 (Fri, 22 Dec 2006) New Revision: 1753 Modified: branches/tdiesler/trunk/integration-tomcat/build.xml Log: partial commit Modified: branches/tdiesler/trunk/integration-tomcat/build.xml =================================================================== --- branches/tdiesler/trunk/integration-tomcat/build.xml 2006-12-22 14:58:09 UTC (rev 1752) +++ branches/tdiesler/trunk/integration-tomcat/build.xml 2006-12-22 14:58:14 UTC (rev 1753) @@ -13,9 +13,9 @@ <project default="main" basedir="../integration-tomcat" name="JBossWS-Tomcat"> - <import file="${basedir}/../build/import/build-setup.xml"/> - <import file="${basedir}/../build/import/build-thirdparty.xml"/> - <import file="${basedir}/../jbossws/build.xml"/> + <import file="${basedir}/../build/ant-import/build-setup.xml"/> + <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/../jbossws-core/build.xml"/> <property name="tomcat.src.dir" value="${integration.tomcat.dir}/src/main"/> <property name="tomcat.java.dir" value="${tomcat.src.dir}/java"/> @@ -49,8 +49,8 @@ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/tomcat/**"/> <classpath refid="tomcat.integration.classpath"/> - <classpath path="${jbossws.output.classes14.dir}"/> - <classpath path="${jbossws.output.classes.dir}"/> + <classpath path="${core.output.classes14.dir}"/> + <classpath path="${core.output.classes.dir}"/> </javac> </target> @@ -82,21 +82,21 @@ </jar> <!-- Build jbossws.war --> - <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"> + <war warfile="${tomcat.output.lib.dir}/jbossws.war" webxml="${core.resources.dir}/jbossws.war/Tomcat/WEB-INF/web.xml"> + <fileset dir="${core.resources.dir}/jbossws.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <fileset dir="${jbossws.resources.dir}/jbossws.war/Tomcat"> + <fileset dir="${core.resources.dir}/jbossws.war/Tomcat"> <include name="META-INF/jboss-beans.xml"/> </fileset> - <fileset dir="${jbossws.resources.dir}/jbossws.sar"> + <fileset dir="${core.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"> + <classes dir="${core.resources.dir}/jbossws.war/Tomcat/WEB-INF"> <include name="log4j.xml"/> </classes> </war> @@ -115,12 +115,12 @@ <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="${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.common.dir}/lib" file="${core.output.lib.dir}/jbossws-core.jar" overwrite="true"/> + <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jbossws-tomcat-integration.jar" overwrite="true"/> + <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jbossws-thirdparty.jar" overwrite="true"/> + <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jboss-jaxws.jar" overwrite="true"/> + <copy todir="${tomcat.common.dir}/lib" file="${core.output.lib.dir}/jboss-jaxrpc.jar" overwrite="true"/> + <copy todir="${tomcat.common.dir}/lib" file="${core.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>