Author: darran.lofthouse(a)jboss.com Date: 2007-04-17 17:15:37 -0400 (Tue, 17 Apr 2007) New Revision: 2885 Removed: branches/jbossws-1.2.0.GA_JBWS-1610/integration-jboss50/ Modified: branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-release.xml branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-samples.xml branches/jbossws-1.2.0.GA_JBWS-1610/build/build.xml branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/build.xml Log: JBWS-1610 - Remove JBoss 5.0.x from patch as it breaks the build. Modified: branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-release.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-release.xml 2007-04-17 18:08:35 UTC (rev 2884) +++ branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-release.xml 2007-04-17 21:15:37 UTC (rev 2885) @@ -39,7 +39,7 @@ </target> <!-- Release to jboss.local.repository --> - <target name="release-to-repository" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14" + <target name="release-to-repository" depends="core-jars,jboss42-jars,jboss40-jars,jboss40-jars14" description="Release to jboss.local.repository"> <!-- jbossws --> @@ -137,7 +137,7 @@ <!-- ================================================================== --> <!-- Build the bin dist --> - <target name="build-bin-dist" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-javadoc" + <target name="build-bin-dist" depends="core-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-javadoc" description="Build the binary distribution"> <property name="install.etc.dir" value="${build.bin.dist}/install/etc"/> @@ -213,8 +213,6 @@ </fileset> </copy> - <copy todir="${install.jboss50.dir}" file="${jboss50.output.lib.dir}/jbossws50.sar"/> - <copy todir="${install.jboss50.dir}" file="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/> <copy todir="${install.jboss42.dir}" file="${jboss42.output.lib.dir}/jbossws42.sar"/> <copy todir="${install.jboss40.dir}"> <fileset dir="${jboss40.output.lib.dir}"> @@ -279,7 +277,6 @@ <javadoc destdir="${build.output.dir}/docs/api" author="true" version="true" use="true" windowtitle="JBossWS API"> <packageset dir="${core.java.dir}" defaultexcludes="yes"/> <packageset dir="${jboss42.java.dir}" defaultexcludes="yes"/> - <packageset dir="${jboss50.java.dir}" defaultexcludes="yes"/> <packageset dir="${tomcat.java.dir}" defaultexcludes="yes"/> <classpath refid="core.classpath"/> </javadoc> Modified: branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-samples.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-samples.xml 2007-04-17 18:08:35 UTC (rev 2884) +++ branches/jbossws-1.2.0.GA_JBWS-1610/build/ant-import/build-samples.xml 2007-04-17 21:15:37 UTC (rev 2885) @@ -16,7 +16,7 @@ <!-- | Build the samples --> - <target name="build-samples" description="Builds the samples." depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,tomcat-jars"> + <target name="build-samples" description="Builds the samples." depends="core-jars,jboss42-jars,jboss40-jars,tomcat-jars"> <property name="samples.target" value="jbossws-samples-${version.id}"/> <property name="build.src.samples.dir" value="${build.output.dir}/${samples.target}"/> @@ -69,9 +69,6 @@ <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> </fileset> - <fileset dir="${jboss50.output.lib.dir}"> - <include name="jbossws-jboss50-integration.jar"/> - </fileset> <fileset dir="${jboss42.output.lib.dir}"> <include name="jbossws-jboss42-integration.jar"/> </fileset> Modified: branches/jbossws-1.2.0.GA_JBWS-1610/build/build.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/build/build.xml 2007-04-17 18:08:35 UTC (rev 2884) +++ branches/jbossws-1.2.0.GA_JBWS-1610/build/build.xml 2007-04-17 21:15:37 UTC (rev 2885) @@ -20,7 +20,6 @@ <import file="${basedir}/ant-import/build-hudson.xml"/> <import file="${basedir}/../integration-jboss40/build.xml"/> <import file="${basedir}/../integration-jboss42/build.xml"/> - <import file="${basedir}/../integration-jboss50/build.xml"/> <import file="${basedir}/../integration-tomcat/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> <import file="${basedir}/../jbossws-tests/build.xml"/> Modified: branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/build.xml 2007-04-17 18:08:35 UTC (rev 2884) +++ branches/jbossws-1.2.0.GA_JBWS-1610/jbossws-tests/build.xml 2007-04-17 21:15:37 UTC (rev 2885) @@ -12,7 +12,6 @@ <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../build/ant-import/build-setup.xml"/> - <import file="${basedir}/../integration-jboss50/build.xml"/> <import file="${basedir}/../integration-jboss42/build.xml"/> <import file="${basedir}/../integration-jboss40/build.xml"/> <import file="${basedir}/../integration-tomcat/build.xml"/>