noon
Author: thomas.diesler(a)jboss.com
Date: 2007-07-06 12:59:59 -0400 (Fri, 06 Jul 2007)
New Revision: 3814
Modified:
branches/jbossws-2.0/build/ant-import/build-release.xml
branches/jbossws-2.0/build/ant.properties.example
branches/jbossws-2.0/build/build.xml
branches/jbossws-2.0/build/dist/ReleaseNotes.txt
branches/jbossws-2.0/build/version.properties
branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml
branches/jbossws-2.0/integration/native/ant-import/build-release.xml
branches/jbossws-2.0/integration/native/build.xml
branches/jbossws-2.0/integration/native/src/main/etc/component-info40.xml
branches/jbossws-2.0/integration/native/src/main/etc/component-info42.xml
branches/jbossws-2.0/integration/native/src/main/etc/component-info50.xml
branches/jbossws-2.0/integration/native/version.properties
branches/jbossws-2.0/integration/spi/src/main/etc/component-info.xml
branches/jbossws-2.0/jbossws-core/ant-import/build-release.xml
branches/jbossws-2.0/jbossws-core/src/main/etc/component-info.xml
Log:
Fix release related targets
Modified: branches/jbossws-2.0/build/ant-import/build-release.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-release.xml 2007-07-06 15:15:56 UTC (rev
3813)
+++ branches/jbossws-2.0/build/ant-import/build-release.xml 2007-07-06 16:59:59 UTC (rev
3814)
@@ -24,7 +24,7 @@
<echo message="* - Update portal-content/counter.xml"/>
<echo message="* - Update news in
portal-content/freezone/projectDescription.html"/>
<echo message="* - Verify release notes and install instructions"/>
- <echo message="* - Publish the interop endpoints (ant -f
jboss-tests/build.xml publish-interop-endpoints)"/>
+ <echo message="* - Publish the interop endpoints"/>
<echo message="* - Commit the portal-content"/>
<echo message="* - Commit the repository jars"/>
<echo message="* - Write a sticky post on the user forum"/>
@@ -42,15 +42,11 @@
<ant antfile="${int.jboss42.dir}/build.xml" target="release"
inheritall="false"/>
<ant antfile="${int.jboss40.dir}/build.xml" target="release"
inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="release"
inheritall="false"/>
-</target>
+ </target>
<!-- Release to portal content -->
- <target name="check-portal-content" depends="prepare"
unless="jbossws.portal.content.available">
- <echo message="*********************************************"/>
- <echo message="* Not available: ${jbossws.portal.content}"/>
- <echo message="*********************************************"/>
- </target>
- <target name="release-to-portal" depends="check-portal-content"
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"/>
@@ -58,20 +54,36 @@
<!-- Copy downloads -->
<copy todir="${portal.downloads}" overwrite="true">
- <fileset dir="${build.output.dir}">
- <include name="jbossws-${version.id}.zip"/>
+ <fileset dir="${build.dir}/output">
<include name="jbossws-src-${version.id}.zip"/>
- <include name="jbossws-samples-${version.id}.zip"/>
</fileset>
+ <fileset dir="${int.native.dir}/output">
+ <include name="jbossws-native-${version.id}.zip"/>
+ </fileset>
</copy>
<!-- Copy Release Notes -->
- <copy tofile="${portal.downloads}/ReleaseNotes-${version.id}.txt"
file="${build.bin.dist}/ReleaseNotes.txt" overwrite="true"/>
- <copy tofile="${portal.downloads}/Install-${version.id}.txt"
file="${build.bin.dist}/Install.txt" overwrite="true"/>
+ <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 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>
-
+
+ <target name="check-portal-content" depends="prepare"
unless="jbossws.portal.content.available">
+ <echo message="*********************************************"/>
+ <echo message="* Not available: ${jbossws.portal.content}"/>
+ <echo message="*********************************************"/>
+ </target>
+
<!-- ================================================================== -->
- <!-- Build distributions -->
+ <!-- Build source distributions
-->
<!-- ================================================================== -->
<!-- Build the src dist -->
@@ -81,31 +93,14 @@
<mkdir dir="${build.src.dist}/jbossws-src-${version.id}"/>
<copy todir="${build.src.dist}/jbossws-src-${version.id}">
<fileset dir="${basedir}">
- <exclude name="*.md5"/>
+ <exclude name="**/*.md5"/>
<exclude name="**/output*/**"/>
<exclude name="**/thirdparty/**"/>
+ <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}/**"/>
</target>
-
- <!-- ================================================================== -->
- <!-- Documentation -->
- <!-- ================================================================== -->
- <!-- Generate the JavaDoc -->
- <target name="build-javadoc" depends="prepare"
description="Generate the Javadoc">
- <mkdir dir="${build.output.dir}/docs/api"/>
- <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>
- <zip destfile="${build.output.dir}/jbossws-${version.id}-api.zip"
basedir="${build.output.dir}/docs"
- includes="api/**"/>
- </target>
-
</project>
Modified: branches/jbossws-2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-2.0/build/ant.properties.example 2007-07-06 15:15:56 UTC (rev 3813)
+++ branches/jbossws-2.0/build/ant.properties.example 2007-07-06 16:59:59 UTC (rev 3814)
@@ -4,7 +4,7 @@
# $Id$
# Optional JBoss Home
-#jboss50.home=/home/tdiesler/svn/jbossas/branches/JBoss_5_0_0_Beta2_JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2
+#jboss50.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta2_JBossWS_2_0_0_GA/build/output/jboss-5.0.0.Beta2
#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA
#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
@@ -32,7 +32,7 @@
hudson.admin.port=8150
hudson.http.port=8180
-hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/branches/branches/JBoss_5_0_0_Beta2_JBossWS_2_0_0_GA
+hudson.jboss50.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_Beta2_JBossWS_2_0_0_GA
hudson.jboss50.build=jboss-5.0.0.Beta2
hudson.jboss50.rev=HEAD
Modified: branches/jbossws-2.0/build/build.xml
===================================================================
--- branches/jbossws-2.0/build/build.xml 2007-07-06 15:15:56 UTC (rev 3813)
+++ branches/jbossws-2.0/build/build.xml 2007-07-06 16:59:59 UTC (rev 3814)
@@ -122,6 +122,7 @@
<!-- ================================================================== -->
<target name="clean" depends="prepare" description="Cleans
up most generated files.">
+ <delete dir="${build.dir}/output"/>
<ant antfile="${spi.dir}/build.xml" target="clean"
inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="clean"
inheritall="false"/>
<ant antfile="${int.jboss50.dir}/build.xml" target="clean"
inheritall="false"/>
@@ -132,6 +133,7 @@
</target>
<target name="clobber" depends="prepare"
description="Cleans up all generated files.">
+ <delete dir="${build.dir}/output"/>
<ant antfile="${spi.dir}/build.xml" target="clobber"
inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="clobber"
inheritall="false"/>
<ant antfile="${testsuite.dir}/build.xml" target="clobber"
inheritall="false"/>
Modified: branches/jbossws-2.0/build/dist/ReleaseNotes.txt
===================================================================
--- branches/jbossws-2.0/build/dist/ReleaseNotes.txt 2007-07-06 15:15:56 UTC (rev 3813)
+++ branches/jbossws-2.0/build/dist/ReleaseNotes.txt 2007-07-06 16:59:59 UTC (rev 3814)
@@ -9,7 +9,8 @@
The wiki (http://labs.jboss.com/portal/jbossws/) is usally a good starting point.
It contains the User Guide and Quick Start instructions.
-A list of examples that accompany the UserGuide can be found in the samples directory
+
+A list of examples that accompany the UserGuide can be found in the tests directory
that ship with the distribution.
If you have any questions, please post to the JBossWS User Forum
@@ -24,8 +25,6 @@
What's new in jbossws-(a)version.id@
----------------------------------
-Release Notes - JBoss Web Services - Version jbossws-2.0.0
-
Feature Request
* [JBWS-434] - Support sequences of anys in JAXRPC
@@ -97,6 +96,23 @@
* [JBWS-1661] - Update to jaxb-ri-2.1
+Errata
+------
+ FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL
+ FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called
+ FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface
+ FIXME: [JBWS-1312] Fix JMS transport in trunk
+ FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0
+ FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x
+ FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations
+ FIXME: [JBWS-1617] JAXRPC doc/literal trims empty string
+ FIXME: [JBWS-751] Multiple schema imports with the same namespace
+ FIXME: [JBWS-798] Complete EventingTestCase
+ FIXME: [JBWS-981] Virtual host configuration for EJB endpoints
+
+Enjoy,
+The JBossWS Team
+
Previous Releases
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
What's new in JBossWS-1.2.1
@@ -190,9 +206,6 @@
FIXME: [JBWS-434] Support sequences of anys in JAXRPC
FIXME: [JBWS-751] Multiple schema imports with the same namespace
-Enjoy,
-The JBossWS Team
-
What's new in jbossws-1.0.4
---------------------------
Modified: branches/jbossws-2.0/build/version.properties
===================================================================
--- branches/jbossws-2.0/build/version.properties 2007-07-06 15:15:56 UTC (rev 3813)
+++ branches/jbossws-2.0/build/version.properties 2007-07-06 16:59:59 UTC (rev 3814)
@@ -6,7 +6,7 @@
specification.version=jbossws-2.0
version.id=2.0.0.GA
-repository.id=snapshot
+repository.id=2.0.0.GA
implementation.title=JBoss Web Services - JBossWS
implementation.url=http://www.jboss.org/products/jbossws
Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-07-06
15:15:56 UTC (rev 3813)
+++ branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-07-06
16:59:59 UTC (rev 3814)
@@ -42,7 +42,6 @@
</copy>
<copy tofile="${bindist.dir}/build.xml"
file="${native.etc.dir}/bin-dist-build.xml"/>
<copy tofile="${bindist.build.dir}/build-deploy.xml"
file="${native.etc.dir}/bin-dist-deploy.xml"/>
- <copy todir="${bindist.dir}"
file="${native.dir}/version.properties"/>
<!-- build -->
<copy todir="${bindist.build.dir}">
@@ -80,9 +79,20 @@
<chmod dir="${bindist.bin.dir}" perm="+x"
includes="**/*.sh"/>
<!-- docs -->
- <zip destfile="${bindist.docs.dir}/apidocs-${version.id}.zip">
- <fileset dir="${native.output.dir}/apidocs"/>
- </zip>
+ <copy todir="${bindist.docs.dir}" >
+ <fileset dir="${native.output.dir}">
+ <include name="apidocs/**"/>
+ </fileset>
+ </copy>
+ <copy todir="${bindist.docs.dir}" 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 todir="${bindist.docs.dir}">
<fileset dir="${build.dir}/etc">
Modified: branches/jbossws-2.0/integration/native/ant-import/build-release.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-release.xml 2007-07-06
15:15:56 UTC (rev 3813)
+++ branches/jbossws-2.0/integration/native/ant-import/build-release.xml 2007-07-06
16:59:59 UTC (rev 3814)
@@ -26,7 +26,7 @@
<include name="jbossws-native50-deployer.zip"/>
</fileset>
</copy>
- <copy
tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml"
file="${native.etc.dir}/component-info50.xml" filtering="true"
overwrite="true">
+ <copy
tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml"
file="${native.output.etc.dir}/component-info50.xml" filtering="true"
overwrite="true">
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
@@ -40,7 +40,7 @@
<include name="jbossws-native42.sar"/>
</fileset>
</copy>
- <copy
tofile="${jboss.repository.dir}/jbossws-native42/${repository.id}/component-info.xml"
file="${native.etc.dir}/component-info42.xml" filtering="true"
overwrite="true">
+ <copy
tofile="${jboss.repository.dir}/jbossws-native42/${repository.id}/component-info.xml"
file="${native.output.etc.dir}/component-info42.xml" filtering="true"
overwrite="true">
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
@@ -54,7 +54,7 @@
<include name="jbossws-native40.sar"/>
</fileset>
</copy>
- <copy
tofile="${jboss.repository.dir}/jbossws-native40/${repository.id}/component-info.xml"
file="${native.etc.dir}/component-info40.xml" filtering="true"
overwrite="true">
+ <copy
tofile="${jboss.repository.dir}/jbossws-native40/${repository.id}/component-info.xml"
file="${native.output.etc.dir}/component-info40.xml" filtering="true"
overwrite="true">
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
Modified: branches/jbossws-2.0/integration/native/build.xml
===================================================================
--- branches/jbossws-2.0/integration/native/build.xml 2007-07-06 15:15:56 UTC (rev 3813)
+++ branches/jbossws-2.0/integration/native/build.xml 2007-07-06 16:59:59 UTC (rev 3814)
@@ -73,7 +73,7 @@
<mkdir dir="${native.output.etc.dir}"/>
<copy todir="${native.output.etc.dir}" filtering="yes">
<fileset dir="${native.etc.dir}">
- <include name="component-info-*.xml"/>
+ <include name="component-info*.xml"/>
</fileset>
<fileset dir="${build.dir}/etc">
<include name="default.mf"/>
@@ -84,6 +84,7 @@
<filter token="build.id" value="${build.id}"/>
<filter token="implementation.version"
value="jbossws-native-${version.id}"/>
<filtersfile file="${build.dir}/version.properties"/>
+ <filtersfile file="${native.dir}/version.properties"/>
</filterset>
</copy>
</target>
Modified: branches/jbossws-2.0/integration/native/src/main/etc/component-info40.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/etc/component-info40.xml 2007-07-06
15:15:56 UTC (rev 3813)
+++ branches/jbossws-2.0/integration/native/src/main/etc/component-info40.xml 2007-07-06
16:59:59 UTC (rev 3814)
@@ -10,15 +10,12 @@
<import componentref="jboss/jbossxb">
<compatible version="@jboss-jbossxb@"/>
</import>
- <import componentref="jboss/microcontainer">
- <compatible version="@jboss-microcontainer@"/>
+ <import componentref="jboss/remoting">
+ <compatible version="@jboss-remoting-jboss40@"/>
</import>
<import componentref="jboss/jbossws">
<compatible version="@repository.id(a)"/>
</import>
- <import componentref="jboss/jbossws-jboss50">
- <compatible version="@repository.id(a)"/>
- </import>
<import componentref="jboss/jbossws-spi">
<compatible version="@repository.id(a)"/>
</import>
Modified: branches/jbossws-2.0/integration/native/src/main/etc/component-info42.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/etc/component-info42.xml 2007-07-06
15:15:56 UTC (rev 3813)
+++ branches/jbossws-2.0/integration/native/src/main/etc/component-info42.xml 2007-07-06
16:59:59 UTC (rev 3814)
@@ -8,17 +8,14 @@
<artifact id="jbossws-native42.sar"/>
<import componentref="jboss/jbossxb">
- <compatible version="@jboss-jbossxb@"/>
+ <compatible version="@jboss-jbossxb-jboss542@"/>
</import>
- <import componentref="jboss/microcontainer">
- <compatible version="@jboss-microcontainer@"/>
+ <import componentref="jboss/remoting">
+ <compatible version="@jboss-remoting-jboss42@"/>
</import>
<import componentref="jboss/jbossws">
<compatible version="@repository.id(a)"/>
</import>
- <import componentref="jboss/jbossws-jboss50">
- <compatible version="@repository.id(a)"/>
- </import>
<import componentref="jboss/jbossws-spi">
<compatible version="@repository.id(a)"/>
</import>
Modified: branches/jbossws-2.0/integration/native/src/main/etc/component-info50.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/etc/component-info50.xml 2007-07-06
15:15:56 UTC (rev 3813)
+++ branches/jbossws-2.0/integration/native/src/main/etc/component-info50.xml 2007-07-06
16:59:59 UTC (rev 3814)
@@ -9,17 +9,14 @@
<artifact id="jbossws-native50-deployer.zip"/>
<import componentref="jboss/jbossxb">
- <compatible version="@jboss-jbossxb@"/>
+ <compatible version="@jboss-jbossxb-jboss50@"/>
</import>
- <import componentref="jboss/microcontainer">
- <compatible version="@jboss-microcontainer@"/>
+ <import componentref="jboss/remoting">
+ <compatible version="@jboss-remoting-jboss50@"/>
</import>
<import componentref="jboss/jbossws">
<compatible version="@repository.id(a)"/>
</import>
- <import componentref="jboss/jbossws-jboss50">
- <compatible version="@repository.id(a)"/>
- </import>
<import componentref="jboss/jbossws-spi">
<compatible version="@repository.id(a)"/>
</import>
Modified: branches/jbossws-2.0/integration/native/version.properties
===================================================================
--- branches/jbossws-2.0/integration/native/version.properties 2007-07-06 15:15:56 UTC
(rev 3813)
+++ branches/jbossws-2.0/integration/native/version.properties 2007-07-06 16:59:59 UTC
(rev 3814)
@@ -3,3 +3,14 @@
native.implementation.title=JBoss Web Services - JBossWS/Native
+# JBossAS-5.0
+jboss-jbossxb-jboss50=2.0.0.CR2
+jboss-remoting-jboss50=2.2.0.GA
+
+# JBossAS-4.2
+jboss-jbossxb-jboss42=1.0.0.GA
+jboss-remoting-jboss42=2.2.0.SP4
+
+# JBossAS-4.0
+jboss-jbossxb-jboss40=1.0.0.GA
+jboss-remoting-jboss40=1.4.3.GA
Modified: branches/jbossws-2.0/integration/spi/src/main/etc/component-info.xml
===================================================================
--- branches/jbossws-2.0/integration/spi/src/main/etc/component-info.xml 2007-07-06
15:15:56 UTC (rev 3813)
+++ branches/jbossws-2.0/integration/spi/src/main/etc/component-info.xml 2007-07-06
16:59:59 UTC (rev 3814)
@@ -8,6 +8,10 @@
<artifact id="jbossws-spi.jar"/>
<artifact id="jbossws-spi-scripts.zip"/>
+ <import componentref="sun-jaxws">
+ <compatible version="@sun-jaxws@"/>
+ </import>
+
<export>
<include input="jbossws-spi.jar"/>
</export>
Modified: branches/jbossws-2.0/jbossws-core/ant-import/build-release.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import/build-release.xml 2007-07-06 15:15:56 UTC
(rev 3813)
+++ branches/jbossws-2.0/jbossws-core/ant-import/build-release.xml 2007-07-06 16:59:59 UTC
(rev 3814)
@@ -28,7 +28,7 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
<include name="jbossws-core-src.zip"/>
- <include name="jbossws-resources.zip"/>
+ <include name="jbossws-core-scripts.zip"/>
</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">
Modified: branches/jbossws-2.0/jbossws-core/src/main/etc/component-info.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/etc/component-info.xml 2007-07-06 15:15:56
UTC (rev 3813)
+++ branches/jbossws-2.0/jbossws-core/src/main/etc/component-info.xml 2007-07-06 16:59:59
UTC (rev 3814)
@@ -11,7 +11,7 @@
<artifact id="jboss-jaxws.jar"/>
<artifact id="jboss-saaj.jar"/>
<artifact id="jbossws-core-src.zip"/>
- <artifact id="jbossws-resources.zip"/>
+ <artifact id="jbossws-core-scripts.zip"/>
<import componentref="apache-xmlsec">
<compatible version="@apache-xmlsec@"/>
@@ -31,9 +31,6 @@
<import componentref="jboss/jbossws-spi">
<compatible version="@repository.id(a)"/>
</import>
- <import componentref="jboss/remoting">
- <compatible version="@jboss-remoting@"/>
- </import>
<import componentref="stax-api">
<compatible version="@stax-api@"/>
</import>
@@ -43,6 +40,9 @@
<import componentref="sun-jaxws">
<compatible version="@sun-jaxws@"/>
</import>
+ <import componentref="wscommons-policy">
+ <compatible version="@wscommons-policy@"/>
+ </import>
<export>
<include input="jbossws-core.jar"/>