Author: thomas.diesler(a)jboss.com Date: 2008-02-14 13:24:48 -0500 (Thu, 14 Feb 2008) New Revision: 5686 Removed: stack/native/trunk/src/main/etc/component-info40.xml Modified: stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/ant-import/build-release.xml stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/build.xml stack/native/trunk/src/main/distro/bin-dist-build.xml stack/native/trunk/version.properties Log: Remove support for AS-4.0 Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-14 18:24:48 UTC (rev 5686) @@ -101,7 +101,6 @@ <include name="jbossws-framework.jar"/> <include name="jbossws-framework-scripts.zip"/> <include name="jbossws-spi.jar"/> - <include name="jbossws-jboss40.jar"/> <include name="jbossws-jboss421.jar"/> </fileset> <fileset dir="${core.dir}/output/lib"> Modified: stack/native/trunk/ant-import/build-release.xml =================================================================== --- stack/native/trunk/ant-import/build-release.xml 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/ant-import/build-release.xml 2008-02-14 18:24:48 UTC (rev 5686) @@ -89,19 +89,6 @@ </filterset> </copy> - <!-- jboss/jbossws-native40 --> - <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-native40/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-native40/${repository.id}/lib" overwrite="true"> - <fileset dir="${core.dir}/output/lib"> - <include name="jbossws-native40.sar"/> - </fileset> - </copy> - <copy tofile="${jboss.repository.dir}/jbossws-native40/${repository.id}/component-info.xml" file="${core.etc.dir}/component-info40.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${core.dir}/version.properties"/> - </filterset> - </copy> </target> <target name="check-svn-externals" depends="init"> Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-14 18:24:48 UTC (rev 5686) @@ -53,9 +53,6 @@ <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-resources.zip" dest="${thirdparty.dir}/jbossws-jboss40-resources.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40-src.zip" dest="${thirdparty.dir}/jbossws-jboss40-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss421.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss421-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> @@ -85,8 +82,8 @@ <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss40}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss40}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb-jboss42}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jaxbintros/${jaxbintros}/lib/jboss-jaxb-intros.jar" dest="${thirdparty.dir}/jboss-jaxb-intros.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/build.xml 2008-02-14 18:24:48 UTC (rev 5686) @@ -14,12 +14,12 @@ <!-- The JBossWS project is organised like this - +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~+ - Target Container: | AS-5.0 | | AS-4.2 | | AS-4.0 | | | - +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | - +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | - Container Integration: | jbossws-jboss50 | | jbossws-jboss42 | | jbossws-jboss40 | | | - +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | + +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~+ + Target Container: | AS-5.0 | | AS-4.2 | | | + +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | + +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | + Container Integration: | jbossws-jboss50 | | jbossws-jboss42 | | | + +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | | +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | | WS Framework: | jbossws-spi, jbossws-framework, jbossws-common | | | +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | | @@ -177,7 +177,7 @@ <!-- | Build all jar files. --> - <target name="jars" depends="compile,jars-jboss40,jars-jboss42,jars-jboss50" description="Builds all jar files."> + <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files."> </target> <!-- @@ -417,65 +417,6 @@ </jar> </target> - <target name="jars-jboss40" depends="jars-common"> - - <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss40-resources.zip"/> - - <!-- Concat jboss-beans.xml --> - <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; - </header> - <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> - <fileset file="${core.output.dir}/resources/jbossws-jboss40-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - - <!-- Concat jboss-beans-no-ejb3.xml --> - <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"> - <header trimleading="yes"> - &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; - </header> - <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> - <fileset file="${core.output.dir}/resources/jbossws-jboss40-config-no-ejb3.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - - <!-- Build jbossws-native40.sar --> - <jar jarfile="${core.output.lib.dir}/jbossws-native40.sar" manifest="${core.output.etc.dir}/default.mf"> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-context.war/**"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jbossws-core.jar"/> - </fileset> - <fileset dir="${core.dir}/thirdparty"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="policy.jar"/> - <include name="stax-api.jar"/> - <include name="wsdl4j.jar"/> - <include name="xmlsec.jar"/> - <include name="wstx.jar"/> - <include name="jboss-jaxb-intros.jar"/> - </fileset> - <fileset dir="${core.output.lib.dir}/jbossws-native40"> - <include name="jbossws.beans/**"/> - </fileset> - <metainf dir="${core.output.dir}/resources/jbossws-jboss40.sar/META-INF"> - <include name="jboss-service.xml"/> - <include name="jboss-service-no-ejb3.xml"/> - </metainf> - <metainf dir="${core.dir}/src/main/resources/standard-config"> - <include name="standard-*-config.xml"/> - </metainf> - </jar> - </target> - <!-- ================================================================== --> <!-- Documentation --> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 18:24:48 UTC (rev 5686) @@ -168,7 +168,6 @@ <!-- dummy jar targets --> <target name="jars-jboss50" depends="prepare"/> <target name="jars-jboss42" depends="prepare"/> - <target name="jars-jboss40" depends="prepare"/> <!-- ================================================================== --> <!-- Miscellaneous --> Deleted: stack/native/trunk/src/main/etc/component-info40.xml =================================================================== --- stack/native/trunk/src/main/etc/component-info40.xml 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/src/main/etc/component-info40.xml 2008-02-14 18:24:48 UTC (rev 5686) @@ -1,25 +0,0 @@ -<project name="jboss/jbossws-native40"> - - <component id="jboss/jbossws-native40" - description="JBossWS an implementation of J2EE Web Services" - version=&quot;@repository.id(a)&quot; - licenseType="lgpl"> - - <artifact id="jbossws-native40.sar"/> - - <import componentref="jboss/jbossws"> - <compatible version=&quot;@repository.id(a)&quot;/&gt; - </import> - <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb-jboss40@"/> - </import> - <import componentref="jboss/remoting"> - <compatible version="@jboss-remoting-jboss40@"/> - </import> - - <export> - </export> - - </component> - -</project> Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-02-14 17:53:00 UTC (rev 5685) +++ stack/native/trunk/version.properties 2008-02-14 18:24:48 UTC (rev 5686) @@ -38,10 +38,6 @@ jboss-jbossxb-jboss42=1.0.0.SP1 jboss-remoting-jboss42=2.2.2.SP4-brew -# JBossAS-4.0 -jboss-jbossxb-jboss40=1.0.0.CR11 -jboss-remoting-jboss40=1.4.3.GA - # Thirdparty library versions apache-ant=1.6.5 apache-collections=3.1