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 su...@apache.org on 2007/08/06 08:19:56 UTC
svn commit: r563039 - in
/webservices/axis2/branches/java/1_3/modules/distribution: pom.xml
src/main/assembly/bin-assembly.xml src/main/assembly/doc-assembly.xml
src/main/assembly/src-assembly.xml
Author: sumedha
Date: Sun Aug 5 23:19:55 2007
New Revision: 563039
URL: http://svn.apache.org/viewvc?view=rev&rev=563039
Log:
Fix for AXIS2-3074, replacing labels in NOTICE.txt
Modified:
webservices/axis2/branches/java/1_3/modules/distribution/pom.xml
webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/bin-assembly.xml
webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/doc-assembly.xml
webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/src-assembly.xml
Modified: webservices/axis2/branches/java/1_3/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/distribution/pom.xml?view=diff&rev=563039&r1=563038&r2=563039
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/distribution/pom.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/distribution/pom.xml Sun Aug 5 23:19:55 2007
@@ -221,7 +221,7 @@
<executions>
<execution>
<id>distribution-package</id>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>single</goal>
</goals>
@@ -246,21 +246,34 @@
<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>
+
+ <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>
+ </copy>
- <copy toDir="target/xdocs" filtering="on" overwrite="true">
+ <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@/**"/>
@@ -270,7 +283,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"/>
@@ -290,7 +303,7 @@
</execution>
<execution>
<id>service-module-list-generation</id>
- <phase>package</phase>
+ <phase>process-resources</phase>
<configuration>
<tasks>
<mkdir dir="target/tmp-repository"/>
Modified: webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/bin-assembly.xml?view=diff&rev=563039&r1=563038&r2=563039
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/bin-assembly.xml Sun Aug 5 23:19:55 2007
@@ -279,9 +279,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 +324,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/branches/java/1_3/modules/distribution/src/main/assembly/doc-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/doc-assembly.xml?view=diff&rev=563039&r1=563038&r2=563039
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/doc-assembly.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/doc-assembly.xml Sun Aug 5 23:19:55 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>
Modified: webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/src-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/src-assembly.xml?view=diff&rev=563039&r1=563038&r2=563039
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/src-assembly.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/distribution/src/main/assembly/src-assembly.xml Sun Aug 5 23:19:55 2007
@@ -81,7 +81,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../..</directory>
+ <directory>target/tmp-doc-distro/docs</directory>
<outputDirectory></outputDirectory>
<includes>
<include>NOTICE.txt</include>
@@ -92,7 +92,7 @@
<!-- 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org