Author: veithen
Date: Wed Oct 19 21:08:05 2011
New Revision: 1186492
URL: http://svn.apache.org/viewvc?rev=1186492&view=rev
Log:
Merged r1186491 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml
axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml
axis/axis2/java/rampart/branches/1_6/release-docs/README.txt
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 21:08:05 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml?rev=1186492&r1=1186491&r2=1186492&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml Wed Oct
19 21:08:05 2011
@@ -59,6 +59,7 @@
<source>../../release-docs/README.txt</source>
<outputDirectory>${dist.dir}</outputDirectory>
<destName>README</destName>
+ <filtered>true</filtered>
</file>
<file>
<source>../../release-docs/LICENSE.txt</source>
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml?rev=1186492&r1=1186491&r2=1186492&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml Wed Oct
19 21:08:05 2011
@@ -69,6 +69,27 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>generate-timestamp</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ import java.util.Date
+ import java.text.MessageFormat
+ project.properties['buildTimestamp'] =
MessageFormat.format("{0,date,MMM dd, yyyy}", new Date())
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml?rev=1186492&r1=1186491&r2=1186492&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/src.xml Wed Oct
19 21:08:05 2011
@@ -28,7 +28,16 @@
<exclude>**/.settings</exclude>
<exclude>**/.settings/**/*</exclude>
<exclude>**/.svn/**</exclude>
+ <exclude>release-docs/README.txt</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>rampart-src-${project.version}</outputDirectory>
+ <filtered>true</filtered>
+ <includes>
+ <include>release-docs/README.txt</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
Modified: axis/axis2/java/rampart/branches/1_6/release-docs/README.txt
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/release-docs/README.txt?rev=1186492&r1=1186491&r2=1186492&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/release-docs/README.txt (original)
+++ axis/axis2/java/rampart/branches/1_6/release-docs/README.txt Wed Oct 19
21:08:05 2011
@@ -1,5 +1,5 @@
======================================================
-Apache Rampart-1.6.0 build (Jun 06, 2011)
+Apache Rampart-${project.version} build (${buildTimestamp})
http://axis.apache.org/axis2/java/rampart
------------------------------------------------------
@@ -13,8 +13,8 @@ lib - This directory contains all t
release.
-rampart-1.6.0.mar - WS-Security and WS-SecureConversation support for Axis2
-rahas-1.6.0.mar - STS module - to be used to add STS operations to a
service
+rampart-${project.version}.mar - WS-Security and WS-SecureConversation
support for Axis2
+rahas-${project.version}.mar - STS module - to be used to add STS
operations to a service
samples - This contains samples on using Apache Rampart and configuring
different components to carryout different WS-Sec* operations.
