[jbossws-commits] JBossWS SVN: r1814 - trunk/integration-jboss40

Author: thomas.diesler(a)jboss.com Date: 2007-01-05 07:15:34 -0500 (Fri, 05 Jan 2007) New Revision: 1814 Modified: trunk/integration-jboss40/build.xml Log: Fix jdk-1.4 compile issues Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-01-05 12:15:29 UTC (rev 1813) +++ trunk/integration-jboss40/build.xml 2007-01-05 12:15:34 UTC (rev 1814) @@ -35,6 +35,7 @@ <property name="jboss42.output.lib.dir" value="${jboss42.output.dir}/lib"/> <target name="jboss40-init" depends="prepare, thirdparty"> + <fail message="Not available: ${jboss40.client}/jboss-client.jar" unless="jboss40.available"/> </target> <!-- ================================================================== --> @@ -232,6 +233,9 @@ <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/> </jar> + <mkdir dir="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF"/> + <copy tofile="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF/jboss-service.xml" file="${jboss42.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> + <!-- Build jbossws40-jdk14.sar --> <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${output.etc.dir}/default.mf"> <fileset dir="${jboss40.output.lib.dir}"> @@ -258,8 +262,8 @@ <include name="standard-jaxws-client-config.xml"/> <include name="standard-jaxws-endpoint-config.xml"/> </metainf> - <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF"> - <include name="jboss-service*.xml"/> + <metainf dir="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF"> + <include name="jboss-service.xml"/> </metainf> </jar>