9:17 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2008-02-15 10:17:51 -0500 (Fri, 15 Feb 2008)
New Revision: 5704
Modified:
stack/native/trunk/ant-import/build-bin-dist.xml
stack/native/trunk/ant-import/build-release.xml
stack/native/trunk/build.xml
stack/native/trunk/version.properties
Log:
version.id=3.0.1-native-2.0.4.GA
Modified: stack/native/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-15 13:23:05 UTC (rev 5703)
+++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-15 15:17:51 UTC (rev 5704)
@@ -12,153 +12,150 @@
<!-- $Id: build-bin-dist.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $
-->
<project>
-
- <!-- ================================================================== -->
- <!-- Binary distribution -->
- <!-- ================================================================== -->
-
- <target name="build-bin-dist" depends="jars, javadoc"
description="Build the binary distribution">
-
- <!-- FIXME: the framework version has to be included somehow. Maybe from
jbossws-framework.jar ? -->
- <property name="dist.name"
value="${specification.version}-metro-${version.id}"/>
-
- <property name="bindist.dir"
value="${core.output.dir}/jbossws-native-dist"/>
- <property name="bindist.build.dir"
value="${bindist.dir}/build"/>
- <property name="bindist.bin.dir"
value="${bindist.dir}/bin"/>
- <property name="bindist.lib.dir"
value="${bindist.dir}/lib"/>
- <property name="bindist.docs.dir"
value="${bindist.dir}/docs"/>
- <property name="bindist.tests.dir"
value="${bindist.dir}/tests"/>
- <property name="bindist.tools.dir"
value="${bindist.dir}/tools"/>
-
- <delete dir="${bindist.dir}"/>
- <mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
- <mkdir dir="${bindist.docs.dir}"/>
- <mkdir dir="${bindist.tests.dir}"/>
- <mkdir dir="${bindist.tools.dir}"/>
-
- <!-- root -->
- <copy tofile="${bindist.dir}/ant.properties"
file="${core.distro.dir}/ant.properties.example">
+
+ <!-- ================================================================== -->
+ <!-- Binary distribution -->
+ <!-- ================================================================== -->
+
+ <target name="build-bin-dist" depends="jars, javadoc"
description="Build the binary distribution">
+
+ <property name="bindist.dir"
value="${core.output.dir}/jbossws-native-dist"/>
+ <property name="bindist.build.dir"
value="${bindist.dir}/build"/>
+ <property name="bindist.bin.dir"
value="${bindist.dir}/bin"/>
+ <property name="bindist.lib.dir"
value="${bindist.dir}/lib"/>
+ <property name="bindist.docs.dir"
value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir"
value="${bindist.dir}/tests"/>
+ <property name="bindist.tools.dir"
value="${bindist.dir}/tools"/>
+
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+ <mkdir dir="${bindist.tools.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties"
file="${core.distro.dir}/ant.properties.example">
<filterset>
<filtersfile file="${core.dir}/ant.properties"/>
</filterset>
</copy>
- <copy tofile="${bindist.dir}/version.properties"
file="${core.dir}/version.properties"/>
- <copy tofile="${bindist.dir}/build.xml"
file="${core.distro.dir}/bin-dist-build.xml"/>
- <copy tofile="${bindist.build.dir}/build-deploy.xml"
file="${core.distro.dir}/bin-dist-deploy.xml"/>
- <copy tofile="${bindist.build.dir}/build-project-gen.xml"
file="${core.distro.dir}/bin-dist-project-gen.xml"/>
-
- <!-- build -->
- <copy todir="${bindist.build.dir}">
- <fileset dir="${core.dir}/ant-import">
- <include name="macros-deploy-framework.xml"/>
- <include name="macros-deploy-native.xml"/>
- </fileset>
- <fileset dir="${core.distro.dir}">
- <include name="user-project-build.xml"/>
- <include name="eclipse.project"/>
- <include name="eclipse.classpath"/>
- </fileset>
- </copy>
-
- <unzip dest="${bindist.bin.dir}"
src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
-
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${core.dir}/src/main/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
- </copy>
-
- <chmod dir="${bindist.bin.dir}" perm="+x"
includes="**/*.sh"/>
-
- <!-- docs -->
- <copy todir="${bindist.docs.dir}" >
- <fileset dir="${core.output.dir}">
+ <copy tofile="${bindist.dir}/version.properties"
file="${core.dir}/version.properties"/>
+ <copy tofile="${bindist.dir}/build.xml"
file="${core.distro.dir}/bin-dist-build.xml"/>
+ <copy tofile="${bindist.build.dir}/build-deploy.xml"
file="${core.distro.dir}/bin-dist-deploy.xml"/>
+ <copy tofile="${bindist.build.dir}/build-project-gen.xml"
file="${core.distro.dir}/bin-dist-project-gen.xml"/>
+
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${core.dir}/ant-import">
+ <include name="macros-deploy-framework.xml"/>
+ <include name="macros-deploy-native.xml"/>
+ </fileset>
+ <fileset dir="${core.distro.dir}">
+ <include name="user-project-build.xml"/>
+ <include name="eclipse.project"/>
+ <include name="eclipse.classpath"/>
+ </fileset>
+ </copy>
+
+ <unzip dest="${bindist.bin.dir}"
src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${core.dir}/src/main/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+
+ <chmod dir="${bindist.bin.dir}" perm="+x"
includes="**/*.sh"/>
+
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${core.output.dir}">
<include name="apidocs/**"/>
</fileset>
- </copy>
- <copy todir="${bindist.docs.dir}" filtering="yes">
- <fileset dir="${core.distro.dir}">
+ </copy>
+ <copy todir="${bindist.docs.dir}" filtering="yes">
+ <fileset dir="${core.distro.dir}">
<include name="Install.txt"/>
<include name="ReleaseNotes.txt"/>
</fileset>
<filterset>
<filtersfile file="${core.dir}/version.properties"/>
</filterset>
- </copy>
-
- <copy todir="${bindist.docs.dir}">
- <fileset dir="${core.etc.dir}">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
-
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-framework-scripts.zip"/>
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-jboss421.jar"/>
- </fileset>
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
+ </copy>
+
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${core.etc.dir}">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${thirdparty.dir}">
+ <include name="jbossws-common.jar"/>
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
+ <include name="jbossws-spi.jar"/>
+ <include name="jbossws-jboss421.jar"/>
+ </fileset>
+ <fileset dir="${core.dir}/output/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
<include name="jboss-jaxws-ext.jar"/>
<include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-core.jar"/>
- <include name="jbossws-core-scripts.zip"/>
- </fileset>
- <fileset dir="${core.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-native40.sar"/>
- <include name="jbossws-native42.sar"/>
- <include name="jbossws-native50.sar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="getopt.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-core.jar"/>
+ <include name="jbossws-core-scripts.zip"/>
+ </fileset>
+ <fileset dir="${core.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-native40.sar"/>
+ <include name="jbossws-native42.sar"/>
+ <include name="jbossws-native50.sar"/>
+ </fileset>
+ <fileset dir="${thirdparty.dir}">
+ <include name="getopt.jar"/>
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="jaxws-tools.jar"/>
+ <include name="jaxws-rt.jar"/>
<include name="jboss-xml-binding.jar"/>
- <include name="juddi-service.sar"/>
- <include name="policy.jar"/>
- <include name="stax-api.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="wstx.jar"/>
- </fileset>
- </copy>
-
- <!-- tests -->
- <copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${core.dir}/src/test-framework"/>
- <fileset dir="${core.dir}/src/test">
- <include name="resources/test-excludes-*.txt"/>
- </fileset>
- </copy>
-
- <!-- build tools -->
- <copy todir="${bindist.tools.dir}" overwrite="true">
- <fileset dir="${core.dir}/tools/ant"/>
- </copy>
- <copy todir="${bindist.dir}" overwrite="true">
- <fileset dir="${core.dir}">
- <include name="build.bat"/>
- <include name="build.sh"/>
- </fileset>
- </copy>
- <chmod file="${bindist.dir}/build.sh" perm="+x"/>
-
- <zip destfile="${core.output.dir}/${dist-name}.zip">
- <fileset dir="${core.output.dir}"
includes="jbossws-native-dist/**"/>
- </zip>
- </target>
-
-</project>
+ <include name="juddi-service.sar"/>
+ <include name="policy.jar"/>
+ <include name="stax-api.jar"/>
+ <include name="stax-ex.jar"/>
+ <include name="streambuffer.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="wstx.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${core.dir}/src/test-framework"/>
+ <fileset dir="${core.dir}/src/test">
+ <include name="resources/test-excludes-*.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- build tools -->
+ <copy todir="${bindist.tools.dir}" overwrite="true">
+ <fileset dir="${core.dir}/tools/ant"/>
+ </copy>
+ <copy todir="${bindist.dir}" overwrite="true">
+ <fileset dir="${core.dir}">
+ <include name="build.bat"/>
+ <include name="build.sh"/>
+ </fileset>
+ </copy>
+ <chmod file="${bindist.dir}/build.sh" perm="+x"/>
+
+ <zip destfile="${core.output.dir}/jbossws-${version.id}.zip">
+ <fileset dir="${core.output.dir}"
includes="jbossws-native-dist/**"/>
+ </zip>
+ </target>
+
+</project>
\ No newline at end of file
Modified: stack/native/trunk/ant-import/build-release.xml
===================================================================
--- stack/native/trunk/ant-import/build-release.xml 2008-02-15 13:23:05 UTC (rev 5703)
+++ stack/native/trunk/ant-import/build-release.xml 2008-02-15 15:17:51 UTC (rev 5704)
@@ -19,7 +19,7 @@
<echo message="*"/>
<echo message="* Almost there, please do these steps manually"/>
<echo message="*"/>
- <echo message="* - Create SVN tag: jbossws-native-${version.id}"/>
+ <echo message="* - Create SVN tag: jbossws-${version.id}"/>
<echo message="* - Release the jbossws-${version.id} version in
JIRA"/>
<echo message="* - Update portal-content/project.xml"/>
<echo message="* - Update portal-content/counter.xml"/>
@@ -124,14 +124,14 @@
<!-- Copy downloads -->
<copy todir="${portal.downloads}" overwrite="true">
<fileset dir="${core.dir}/output">
- <include name="jbossws-native-src-${version.id}.zip"/>
- <include name="jbossws-native-${version.id}.zip"/>
+ <include name="jbossws-${version.id}-src.zip"/>
+ <include name="jbossws-${version.id}.zip"/>
</fileset>
</copy>
<!-- Copy Release Notes -->
- <copy tofile="${portal.downloads}/ReleaseNotes-${version.id}.txt"
file="${core.dir}/output/jbossws-native-${version.id}/docs/ReleaseNotes.txt"
overwrite="true"/>
- <copy tofile="${portal.downloads}/Install-${version.id}.txt"
file="${core.dir}/output/jbossws-native-${version.id}/docs/Install.txt"
overwrite="true"/>
+ <copy tofile="${portal.downloads}/ReleaseNotes-${version.id}.txt"
file="${core.dir}/output/jbossws-${version.id}/docs/ReleaseNotes.txt"
overwrite="true"/>
+ <copy tofile="${portal.downloads}/Install-${version.id}.txt"
file="${core.dir}/output/jbossws-${version.id}/docs/Install.txt"
overwrite="true"/>
</target>
<target name="check-portal-content" depends="prepare"
unless="jbossws.portal.content.available">
@@ -147,9 +147,9 @@
<!-- Build the src dist -->
<target name="build-src-dist" description="Build the source
distribution">
<property name="build.src.dist"
value="${core.dir}/output/src-dist"/>
- <delete dir="${build.src.dist}/jbossws-native-src-${version.id}"/>
- <mkdir dir="${build.src.dist}/jbossws-native-src-${version.id}"/>
- <copy todir="${build.src.dist}/jbossws-native-src-${version.id}">
+ <delete dir="${build.src.dist}/jbossws-${version.id}-src"/>
+ <mkdir dir="${build.src.dist}/jbossws-${version.id}-src"/>
+ <copy todir="${build.src.dist}/jbossws-${version.id}-src">
<fileset dir="${basedir}">
<exclude name="**/*.md5"/>
<exclude name="**/output*/**"/>
@@ -157,8 +157,8 @@
<exclude name="mergeinfo.txt"/>
</fileset>
</copy>
- <zip destfile="${core.dir}/output/jbossws-native-src-${version.id}.zip"
basedir="${build.src.dist}"
- includes="jbossws-native-src-${version.id}/**"/>
+ <zip destfile="${core.dir}/output/jbossws-${version.id}-src.zip"
basedir="${build.src.dist}"
+ includes="jbossws-${version.id}-src/**"/>
</target>
</project>
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-02-15 13:23:05 UTC (rev 5703)
+++ stack/native/trunk/build.xml 2008-02-15 15:17:51 UTC (rev 5704)
@@ -164,7 +164,7 @@
<filter token="java.vm.version"
value="${java.vm.version}"/>
<filter token="java.vm.vendor"
value="${java.vm.vendor}"/>
<filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version"
value="${specification.version}-native-${version.id}"/>
+ <filter token="implementation.version"
value="jbossws-${version.id}"/>
<filtersfile file="${core.dir}/version.properties"/>
</filterset>
</copy>
@@ -310,7 +310,7 @@
</fileset>
<filterset>
<filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version"
value="${specification.version}-native-${version.id}"/>
+ <filter token="implementation.version"
value="jbossws-${version.id}"/>
<filtersfile file="${core.dir}/version.properties"/>
</filterset>
</copy>
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2008-02-15 13:23:05 UTC (rev 5703)
+++ stack/native/trunk/version.properties 2008-02-15 15:17:51 UTC (rev 5704)
@@ -5,7 +5,7 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-3.0
-version.id=2.0.4.DEV
+version.id=3.0.1-native-2.0.4.GA
repository.id=snapshot
implementation.title=JBoss Web Services - Native
@@ -24,10 +24,9 @@
wscommons-policy=1.0
# Dependend integration projects
-jbossws-spi=snapshot
-jbossws-common=snapshot
+jbossws-spi=1.0.1.GA
+jbossws-common=1.0.3.GA
jbossws-framework=snapshot
-jbossws-jboss40=4.0.5.SP2
jbossws-jboss42=4.2.1.GA
# JBossAS-5.0