You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/08/06 16:37:22 UTC
svn commit: r563153 - in /webservices/axis2/trunk/java: ./
modules/distribution/ modules/distribution/src/main/assembly/
Author: dims
Date: Mon Aug 6 07:37:21 2007
New Revision: 563153
URL: http://svn.apache.org/viewvc?view=rev&rev=563153
Log:
sync from 1.3 branch
Modified:
webservices/axis2/trunk/java/modules/distribution/pom.xml
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/doc-assembly.xml
webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml
webservices/axis2/trunk/java/release-notes.html
Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?view=diff&rev=563153&r1=563152&r2=563153
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Mon Aug 6 07:37:21 2007
@@ -221,7 +221,7 @@
<executions>
<execution>
<id>distribution-package</id>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
@@ -246,23 +246,38 @@
<executions>
<execution>
<id>package</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<configuration>
<tasks>
- <copy toDir="target/xdocs/${docs.folder.version}">
+ <copy toDir="target/tmp-doc-distro/xdocs/${docs.folder.version}">
<fileset dir="../documentation/xdocs/@axis2_version_dir@">
<exclude name="**/*.xml"/>
</fileset>
</copy>
<filter filtersfile="../documentation/xdocs/dynamic-labels.properties"/>
-
- <copy toDir="target/xdocs/${docs.folder.version}" filtering="on" overwrite="true">
+ <copy toDir="target/tmp-doc-distro/xdocs/${docs.folder.version}" filtering="on" overwrite="true">
<globmapper from="*.xml" to="*.html"/>
<fileset dir="../documentation/xdocs/@axis2_version_dir@"/>
</copy>
- <copy toDir="target/xdocs" filtering="on" overwrite="true">
+ <filter token="axisVersion" value="${version}"/>
+ <tstamp>
+ <format property="TODAY" pattern="dd-MM-yyyy"/>
+ </tstamp>
+ <filter token="TODAY" value="${TODAY}"/>
+ <copy toDir="target/tmp-doc-distro/docs" filtering="on" overwrite="true">
+ <fileset dir="../..">
+ <include name="LICENSE.txt"/>
+ <include name="README.txt"/>
+ <include name="release-notes.html"/>
+ </fileset>
+ <fileset dir="../../release-docs/readme-files">
+ <include name="*.txt"/>
+ </fileset>
+ </copy>
+
+ <copy toDir="target/tmp-doc-distro/xdocs" filtering="on" overwrite="true">
<globmapper from="*.xml" to="*.html"/>
<fileset dir="../documentation/xdocs">
<exclude name="@axis2_version_dir@/**"/>
@@ -272,7 +287,7 @@
</fileset>
</copy>
- <copy toDir="target/xdocs" filtering="off" overwrite="true">
+ <copy toDir="target/tmp-doc-distro/xdocs" filtering="off" overwrite="true">
<fileset dir="../documentation/xdocs">
<exclude name="@axis2_version_dir@/**"/>
<include name="**/*.gif"/>
@@ -292,7 +307,7 @@
</execution>
<execution>
<id>service-module-list-generation</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<configuration>
<tasks>
<mkdir dir="target/tmp-repository"/>
@@ -361,6 +376,20 @@
<goal>run</goal>
</goals>
</execution>
+ <execution>
+ <id>delete-temporary-files</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <delete dir="target/tmp-doc-distro"/>
+ <delete dir="target/tmp-repository"/>
+ <delete dir="target/archive-tmp"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
Modified: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml?view=diff&rev=563153&r1=563152&r2=563153
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/bin-assembly.xml Mon Aug 6 07:37:21 2007
@@ -218,6 +218,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../../modules/clustering/target</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>axis2-clustering-${version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../../modules/saaj/target</directory>
<outputDirectory>lib</outputDirectory>
<includes>
@@ -263,7 +270,7 @@
<!-- TODO: Need to rename this file to INSTALL.txt -->
<fileSet>
- <directory>../../release-docs/readme-files/</directory>
+ <directory>target/tmp-doc-distro/docs</directory>
<outputDirectory></outputDirectory>
<includes>
<include>installation-std-bin.txt</include>
@@ -279,9 +286,8 @@
</includes>
</fileSet>
- <!-- TODO: Need to add filters to update the version strings within the files -->
<fileSet>
- <directory>../../</directory>
+ <directory>target/tmp-doc-distro/docs</directory>
<outputDirectory></outputDirectory>
<includes>
<include>LICENSE.txt</include>
@@ -325,7 +331,6 @@
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <!-- TODO - incorrect xercesImpl version(2.6.2) is being copied. -->
<excludes>
<exclude>mx4j:mx4j-jmx:jar</exclude>
<exclude>mx4j:mx4j-impl:jar</exclude>
Modified: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/doc-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/doc-assembly.xml?view=diff&rev=563153&r1=563152&r2=563153
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/doc-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/doc-assembly.xml Mon Aug 6 07:37:21 2007
@@ -9,7 +9,7 @@
<fileSets>
<fileSet>
- <directory>target/xdocs</directory>
+ <directory>target/tmp-doc-distro/xdocs</directory>
<outputDirectory>docs/xdocs</outputDirectory>
<excludes>
<exclude>.svn/**</exclude>
@@ -23,7 +23,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../..</directory>
+ <directory>target/tmp-doc-distro/docs</directory>
<outputDirectory>docs</outputDirectory>
<includes>
<include>LICENSE.txt</include>
@@ -31,5 +31,12 @@
<include>release-notes.html</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>target/tmp-doc-distro/docs</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README-docs.txt</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
Modified: webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml?view=diff&rev=563153&r1=563152&r2=563153
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/src/main/assembly/src-assembly.xml Mon Aug 6 07:37:21 2007
@@ -69,7 +69,6 @@
</fileSet>
- <!-- TODO : (start) copy following files with filtering on -->
<fileSet>
<directory>../../etc</directory>
<outputDirectory>etc</outputDirectory>
@@ -81,18 +80,15 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../..</directory>
+ <directory>target/tmp-doc-distro/docs</directory>
<outputDirectory></outputDirectory>
<includes>
<include>NOTICE.txt</include>
</includes>
</fileSet>
- <!-- TODO : Copy the release documents -->
-
- <!-- TODO : (end) copy following files with filtering on -->
<fileSet>
- <directory>../..</directory>
+ <directory>target/tmp-doc-distro/docs</directory>
<outputDirectory></outputDirectory>
<includes>
<include>LICENSE.txt</include>
@@ -123,7 +119,13 @@
<excludes>
<exclude>.svn/**</exclude>
</excludes>
-
+ </fileSet>
+ <fileSet>
+ <directory>target/tmp-doc-distro/docs</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>README-std-src.txt</include>
+ </includes>
</fileSet>
</fileSets>
</assembly>
Modified: webservices/axis2/trunk/java/release-notes.html
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/release-notes.html?view=diff&rev=563153&r1=563152&r2=563153
==============================================================================
--- webservices/axis2/trunk/java/release-notes.html (original)
+++ webservices/axis2/trunk/java/release-notes.html Mon Aug 6 07:37:21 2007
@@ -19,16 +19,16 @@
<html>
<head>
<meta http-equiv="content-type" content="">
- <title>Welcome to Apache Axis2 version 1.1</title>
+ <title>Welcome to Apache Axis2 version @axisVersion@</title>
</head>
<body lang="en">
-<h1>Welcome to Apache Axis2 version 1.1</h1>
+<h1>Welcome to Apache Axis2 version @axisVersion@</h1>
<h3>@TODAY@</h3>
<pre>Just over 6 months since the original 1.0 release, we are very proud to
-announce the release of Apache Axis2 version 1.1.
+announce the release of Apache Axis2 version @axisVersion@.
Downloads are available at:
http://ws.apache.org/axis2/download.cgi
@@ -42,7 +42,7 @@
Modules supporting WS-Security/Secure-Conversation (Apache Rampart),
WS-Trust (Apache Rahas), WS-Reliable Messaging (Apache Sandesha) and
WS-Eventing (Apache Savan) will be available soon after the Apache Axis2
-1.1 release. Please see these projects' own sites for further information.
+@axisVersion@ release. Please see these projects' own sites for further information.
Major Changes Since 1.0:
- Significantly improved documentation
@@ -60,9 +60,9 @@
- Fixed tons of small and not-so-small bugs
- Major refactoring of release structure to make usage easy
-Known Issues and Limitations in 1.1 Release:
+Known Issues and Limitations in @axisVersion@ Release:
- Unwrapping of response messages (coming in 1.2)
-- JSR 181/183 Annotation support (coming in 1.2)
+- JSR @axisVersion@/183 Annotation support (coming in 1.2)
- JaxMe and JAXBRI data binding support is experimental
- Simple Axis Server does not support POX/REST
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org