[jbossws-commits] JBossWS SVN: r1749 - branches/tdiesler/trunk/integration-jboss50

Author: thomas.diesler(a)jboss.com Date: 2006-12-22 09:57:53 -0500 (Fri, 22 Dec 2006) New Revision: 1749 Modified: branches/tdiesler/trunk/integration-jboss50/build.xml Log: partial commit Modified: branches/tdiesler/trunk/integration-jboss50/build.xml =================================================================== --- branches/tdiesler/trunk/integration-jboss50/build.xml 2006-12-22 14:57:49 UTC (rev 1748) +++ branches/tdiesler/trunk/integration-jboss50/build.xml 2006-12-22 14:57:53 UTC (rev 1749) @@ -13,9 +13,9 @@ <project default="main" basedir="../integration-jboss50" name="JBossWS-JBoss50"> - <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="jboss50.src.dir" value="${integration.jboss50.dir}/src/main"/> <property name="jboss50.java.dir" value="${jboss50.src.dir}/java"/> @@ -49,8 +49,8 @@ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss50/**"/> <classpath refid="jboss50.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> @@ -84,12 +84,12 @@ </jar> <!-- Build jbossws-context.war --> - <war warfile="${jboss50.output.lib.dir}/jbossws-context.war" webxml="${jbossws.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml"> - <fileset dir="${jbossws.resources.dir}/jbossws.war"> + <war warfile="${jboss50.output.lib.dir}/jbossws-context.war" webxml="${core.resources.dir}/jbossws.war/JBoss/WEB-INF/web.xml"> + <fileset dir="${core.resources.dir}/jbossws.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${jbossws.resources.dir}/jbossws.war/JBoss/WEB-INF"> + <webinf dir="${core.resources.dir}/jbossws.war/JBoss/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -108,7 +108,7 @@ <include name="wstx-lgpl-2.9.3.jar"/> <include name="xmlsec.jar"/> </fileset> - <metainf dir="${jbossws.resources.dir}/jbossws.sar/META-INF"> + <metainf dir="${core.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"/> @@ -121,7 +121,7 @@ <fileset dir="${jboss50.output.lib.dir}"> <include name="jbossws-jboss50-integration.jar"/> </fileset> - <fileset dir="${jbossws.output.lib.dir}"> + <fileset dir="${core.output.lib.dir}"> <include name="jbossws-core.jar"/> <include name="jboss-jaxws.jar"/> </fileset> @@ -144,14 +144,14 @@ <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="${jbossws.output.lib.dir}"> + <fileset dir="${core.output.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="${jbossws.output.lib.dir}"> + <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-saaj.jar"/> </fileset>