Author: thomas.diesler(a)jboss.com Date: 2006-12-22 09:57:49 -0500 (Fri, 22 Dec 2006) New Revision: 1748 Modified: branches/tdiesler/trunk/integration-jboss42/build.xml Log: partial commit Modified: branches/tdiesler/trunk/integration-jboss42/build.xml =================================================================== --- branches/tdiesler/trunk/integration-jboss42/build.xml 2006-12-22 14:29:09 UTC (rev 1747) +++ branches/tdiesler/trunk/integration-jboss42/build.xml 2006-12-22 14:57:49 UTC (rev 1748) @@ -13,9 +13,9 @@ <project default="main" basedir="../integration-jboss42" name="JBossWS-JBoss42"> - <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="jboss42.src.dir" value="${integration.jboss42.dir}/src/main"/> <property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/> @@ -49,8 +49,8 @@ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss42/**"/> <classpath refid="jboss42.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> @@ -89,7 +89,7 @@ <include name="jbossws-jboss42-integration.jar"/> <include name="jbossws-context.war"/> </fileset> - <fileset dir="${jbossws.output.lib.dir}"> + <fileset dir="${core.output.lib.dir}"> <include name="jbossws-core.jar"/> <include name="jboss-jaxws.jar"/> </fileset> @@ -105,7 +105,7 @@ <fileset dir="${jboss42.resources.dir}"> <include name="jbossws.beans/META-INF/jboss-beans.xml"/> </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"/> @@ -127,14 +127,14 @@ <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="${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="${jboss42.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>