[jbossws-commits] JBossWS SVN: r5884 - in stack/native/trunk: ant-import and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-03-06 15:40:06 -0500 (Thu, 06 Mar 2008) New Revision: 5884 Modified: 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/etc/component-info.xml stack/native/trunk/src/main/etc/component-info50.xml stack/native/trunk/version.properties Log: Move the build of jbossws.sar to AS50 Modified: stack/native/trunk/ant-import/build-release.xml =================================================================== --- stack/native/trunk/ant-import/build-release.xml 2008-03-06 00:29:13 UTC (rev 5883) +++ stack/native/trunk/ant-import/build-release.xml 2008-03-06 20:40:06 UTC (rev 5884) @@ -40,7 +40,17 @@ <!-- jboss/jbossws --> <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> + <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/bin"/> <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/> + <mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/resources"/> + <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/bin" overwrite="true"> + <fileset dir="${core.output.etc.dir}"> + <include name="wsrunclient.bat"/> + <include name="wstools.bat"/> + <include name="wsrunclient.sh"/> + <include name="wstools.sh"/> + </fileset> + </copy> <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-client.jar"/> @@ -49,10 +59,16 @@ <include name="jboss-jaxws.jar"/> <include name="jboss-jaxws-ext.jar"/> <include name="jboss-saaj.jar"/> + <include name="jbossws-context.war"/> <include name="jbossws-core-src.zip"/> <include name="jbossws-core-scripts.zip"/> </fileset> </copy> + <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/resources" overwrite="true"> + <fileset dir="${core.dir}/src/main/resources/standard-config"> + <include name="standard-*-config.xml"/> + </fileset> + </copy> <copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${core.output.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${core.dir}/version.properties"/> @@ -61,11 +77,10 @@ <!-- jboss/jbossws-native50 --> <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-native50/${repository.id}/lib"/> - <copy todir="${jboss.repository.dir}/jbossws-native50/${repository.id}/lib" overwrite="true"> - <fileset dir="${core.dir}/output/lib"> - <include name="jbossws-native50.sar"/> - <include name="jbossws-native50-deployer.zip"/> + <mkdir dir="${jboss.repository.dir}/jbossws-native50/${repository.id}/resources"/> + <copy todir="${jboss.repository.dir}/jbossws-native50/${repository.id}/resources" overwrite="true"> + <fileset dir="${core.output.lib.dir}/jbossws-native50"> + <include name="jbossws-beans.xml"/> </fileset> </copy> <copy tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml" file="${core.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-03-06 00:29:13 UTC (rev 5883) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-03-06 20:40:06 UTC (rev 5884) @@ -92,7 +92,7 @@ <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-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/jaxbintros/${jboss-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"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-deployers.jar" dest="${thirdparty.dir}/jboss-deployers.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-03-06 00:29:13 UTC (rev 5883) +++ stack/native/trunk/build.xml 2008-03-06 20:40:06 UTC (rev 5884) @@ -303,18 +303,15 @@ </jar> <!-- Build jbossws-context.war --> - <copy todir="${core.output.lib.dir}/jbossws-context.war" filtering="true"> + <war warfile="${core.output.lib.dir}/jbossws-context.war" webxml="${core.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> <fileset dir="${core.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> - <include name="WEB-INF/**"/> </fileset> - <filterset> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${core.dir}/version.properties"/> - </filterset> - </copy> + <webinf dir="${core.resources.dir}/jbossws-context.war"> + <include name="jboss-web.xml"/> + </webinf> + </war> <!-- Build jbossws-core-scripts.zip --> <zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip" > @@ -351,7 +348,7 @@ <!-- Build jbossws-native50.sar --> <jar jarfile="${core.output.lib.dir}/jbossws-native50.sar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-context.war/**"/> + <include name="jbossws-context.war"/> <include name="jbossws-core.jar"/> </fileset> <fileset dir="${core.dir}/thirdparty"> @@ -389,7 +386,7 @@ <!-- Build jbossws-native42.sar --> <jar jarfile="${core.output.lib.dir}/jbossws-native42.sar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-context.war/**"/> + <include name="jbossws-context.war"/> <include name="jboss-jaxws.jar"/> <include name="jboss-jaxws-ext.jar"/> <include name="jboss-jaxrpc.jar"/> Modified: stack/native/trunk/src/main/etc/component-info.xml =================================================================== --- stack/native/trunk/src/main/etc/component-info.xml 2008-03-06 00:29:13 UTC (rev 5883) +++ stack/native/trunk/src/main/etc/component-info.xml 2008-03-06 20:40:06 UTC (rev 5884) @@ -12,8 +12,19 @@ <artifact id="jboss-jaxws-ext.jar"/> <artifact id="jboss-saaj.jar"/> <artifact id="jbossws-core-src.zip"/> - <artifact id="jbossws-core-scripts.zip"/> + <artifact id="jbossws-context.war"/> + <artifact id="standard-jaxrpc-client-config.xml"/> + <artifact id="standard-jaxrpc-endpoint-config.xml"/> + <artifact id="standard-jaxws-client-config.xml"/> + <artifact id="standard-jaxws-endpoint-config.xml"/> + <artifact id="wsrunclient.bat"/> + <artifact id="wsrunclient.sh"/> + <artifact id="wstools.bat"/> + <artifact id="wstools.sh"/> + <import componentref="jboss/jaxbintros"> + <compatible version="@jboss-jaxbintros@"/> + </import> <import componentref="jboss/jbossws-common"> <compatible version="@jbossws-common@"/> </import> Modified: stack/native/trunk/src/main/etc/component-info50.xml =================================================================== --- stack/native/trunk/src/main/etc/component-info50.xml 2008-03-06 00:29:13 UTC (rev 5883) +++ stack/native/trunk/src/main/etc/component-info50.xml 2008-03-06 20:40:06 UTC (rev 5884) @@ -5,7 +5,7 @@ version=&quot;@repository.id(a)&quot; licenseType="lgpl"> - <artifact id="jbossws-native50.sar"/> + <artifact id="jbossws-beans.xml"/> <import componentref="jboss/jbossws"> <compatible version=&quot;@repository.id(a)&quot;/&gt; Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-03-06 00:29:13 UTC (rev 5883) +++ stack/native/trunk/version.properties 2008-03-06 20:40:06 UTC (rev 5884) @@ -6,7 +6,7 @@ specification.version=jbossws-3.0 version.id=3.0.1-native-2.0.4.GA -repository.id=3.0.1-native-2.0.4.GA +repository.id=snapshot implementation.title=JBoss Web Services - Native implementation.url=http://www.jboss.org/products/jbossws @@ -31,7 +31,7 @@ # JBossAS-5.0 jboss-jbossxb-jboss50=2.0.0.CR5 -jboss-remoting-jboss50=2.4.0.Beta1 +jboss-remoting-jboss50=2.4.0.Beta2 # JBossAS-4.2 jboss-jbossxb-jboss42=1.0.0.SP1 @@ -48,12 +48,12 @@ gnu-getopt=1.0.10 hibernate=3.2.1.GA javassist=3.6.0.GA -jaxbintros=1.0.0.beta2 jaxen=1.1-beta-10 jboss-common-core=2.0.2.GA jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA jboss-javaee=5.0.0.Beta3 +jboss-jaxbintros=1.0.0.beta2 jboss-jaxr=1.2.0.GA jboss-microcontainer=2.0.0.Beta3 jboss-security=4.0.5.GA