Author: thomas.diesler(a)jboss.com
Date: 2008-03-11 10:21:23 -0400 (Tue, 11 Mar 2008)
New Revision: 5916
Modified:
framework/trunk/ant-import/build-release.xml
framework/trunk/build.xml
framework/trunk/src/main/etc/component-info.xml
Log:
Release bin scripts individually
Modified: framework/trunk/ant-import/build-release.xml
===================================================================
--- framework/trunk/ant-import/build-release.xml 2008-03-11 14:02:15 UTC (rev 5915)
+++ framework/trunk/ant-import/build-release.xml 2008-03-11 14:21:23 UTC (rev 5916)
@@ -12,32 +12,41 @@
<!-- $Id$ -->
<project>
-
+
<!-- Release to jboss.local.repository -->
- <target name="release" depends="jars"
- description="Release to jboss.local.repository">
-
+ <target name="release" depends="jars" description="Release
to jboss.local.repository">
+
<!-- jboss/jbossws-framework -->
<property name="jboss.repository.dir"
value="${jboss.local.repository}/jboss"/>
+ <mkdir
dir="${jboss.repository.dir}/jbossws-framework/${repository.id}/bin"/>
<mkdir
dir="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib"/>
<copy
todir="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib"
overwrite="true">
<fileset dir="${framework.output.lib.dir}">
<include name="jbossws-framework.jar"/>
<include name="jbossws-framework-src.zip"/>
<include name="jbossws-framework-scripts.zip"/>
- </fileset>
+ </fileset>
</copy>
- <copy
tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/component-info.xml"
file="${framework.etc.dir}/component-info.xml" filtering="true"
overwrite="true">
+ <copy
todir="${jboss.repository.dir}/jbossws-framework/${repository.id}/bin"
overwrite="true">
+ <fileset dir="${framework.output.etc.dir}">
+ <include name="wsconsume.bat"/>
+ <include name="wsconsume.sh"/>
+ <include name="wsprovide.bat"/>
+ <include name="wsprovide.sh"/>
+ </fileset>
+ </copy>
+ <copy
tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/component-info.xml"
file="${framework.etc.dir}/component-info.xml" filtering="true"
+ overwrite="true">
<filterset>
<filtersfile file="${framework.dir}/version.properties"/>
</filterset>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Build binary distributions -->
<!-- ================================================================== -->
-
+
<target name="release-all" depends="all,release-to-portal"
description="Release JBossWS">
<echo message="*********************************************"/>
<echo message="* Released: jbossws-${version.id}"/>
@@ -59,11 +68,11 @@
<echo message="*"/>
<echo message="*********************************************"/>
</target>
-
+
<!-- ================================================================== -->
<!-- Build source distributions
-->
<!-- ================================================================== -->
-
+
<!-- Build the src dist -->
<target name="build-src-dist" description="Build the source
distribution">
<property name="build.src.dist"
value="${build.dir}/output/src-dist"/>
@@ -77,17 +86,15 @@
<exclude name="mergeinfo.txt"/>
</fileset>
</copy>
- <zip destfile="${build.dir}/output/jbossws-src-${version.id}.zip"
basedir="${build.src.dist}"
- includes="jbossws-src-${version.id}/**"/>
+ <zip destfile="${build.dir}/output/jbossws-src-${version.id}.zip"
basedir="${build.src.dist}"
includes="jbossws-src-${version.id}/**"/>
</target>
<!-- ================================================================== -->
<!-- Release to Portal -->
<!-- ================================================================== -->
-
+
<!-- Release to portal content -->
- <target name="release-to-portal" depends="check-portal-content,
build-src-dist"
- description="Release to portal-content"
if="jbossws.portal.content.available">
+ <target name="release-to-portal" depends="check-portal-content,
build-src-dist" description="Release to portal-content"
if="jbossws.portal.content.available">
<property name="portal.freezone"
value="${jbossws.portal.content}/freezone"/>
<property name="portal.userguide"
value="${portal.freezone}/user-guide"/>
@@ -104,15 +111,15 @@
</copy>
<!-- Copy Release Notes -->
- <copy todir="${build.dir}/output" filtering="yes">
- <fileset dir="${build.dir}/dist">
+ <copy todir="${build.dir}/output" filtering="yes">
+ <fileset dir="${build.dir}/dist">
<include name="Install.txt"/>
<include name="ReleaseNotes.txt"/>
</fileset>
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
- </copy>
+ </copy>
<copy tofile="${portal.downloads}/ReleaseNotes-${version.id}.txt"
file="${build.dir}/output/ReleaseNotes.txt" overwrite="true"/>
<copy tofile="${portal.downloads}/Install-${version.id}.txt"
file="${build.dir}/output/Install.txt" overwrite="true"/>
</target>
@@ -123,4 +130,4 @@
<echo message="*********************************************"/>
</target>
-</project>
+</project>
\ No newline at end of file
Modified: framework/trunk/build.xml
===================================================================
--- framework/trunk/build.xml 2008-03-11 14:02:15 UTC (rev 5915)
+++ framework/trunk/build.xml 2008-03-11 14:21:23 UTC (rev 5916)
@@ -108,12 +108,10 @@
<zip zipfile="${framework.output.lib.dir}/jbossws-framework-scripts.zip"
>
<fileset dir="${framework.output.etc.dir}">
<include name="wsconsume.bat"/>
- <include name="wsprovide.bat"/>
- </fileset>
- <zipfileset dir="${framework.output.etc.dir}"
filemode="755">
<include name="wsconsume.sh"/>
+ <include name="wsprovide.bat"/>
<include name="wsprovide.sh"/>
- </zipfileset>
+ </fileset>
</zip>
<!-- Build jbossws-spi-src.zip -->
Modified: framework/trunk/src/main/etc/component-info.xml
===================================================================
--- framework/trunk/src/main/etc/component-info.xml 2008-03-11 14:02:15 UTC (rev 5915)
+++ framework/trunk/src/main/etc/component-info.xml 2008-03-11 14:21:23 UTC (rev 5916)
@@ -1,13 +1,16 @@
<project name="jboss/jbossws-framework">
<component id="jboss/jbossws-framework"
- description="JBossWS SPI"
+ description="JBossWS Framework"
version="@repository.id(a)"
licenseType="lgpl">
<artifact id="jbossws-framework.jar"/>
<artifact id="jbossws-framework-src.zip"/>
- <artifact id="jbossws-framework-scripts.zip"/>
+ <artifact id="wsconsume.bat"/>
+ <artifact id="wsconsume.sh"/>
+ <artifact id="wsprovide.bat"/>
+ <artifact id="wsprovide.sh"/>
<import componentref="jboss/jbossws-common">
<compatible version="@jbossws-common@"/>