Author: veithen
Date: Mon Dec 7 08:38:01 2015
New Revision: 1718262
URL: http://svn.apache.org/viewvc?rev=1718262&view=rev
Log:
Merge r1718231 and r1718232 to the 1.6 branch and remove the 1.7.0 release note
which should only be on the trunk.
Added:
axis/axis2/java/rampart/branches/1_6/src/site/markdown/
- copied from r1718232, axis/axis2/java/rampart/trunk/src/site/markdown/
Removed:
axis/axis2/java/rampart/branches/1_6/release-docs/release-notes.html
axis/axis2/java/rampart/branches/1_6/src/site/markdown/release-notes/1.7.0.md
axis/axis2/java/rampart/branches/1_6/src/site/xdoc/download/
axis/axis2/java/rampart/branches/1_6/src/site/xdoc/download.xml
axis/axis2/java/rampart/branches/1_6/src/site/xdoc/index.xml
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/pom.xml
axis/axis2/java/rampart/branches/1_6/src/site/site.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 7 08:38:01 2015
@@ -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,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455319,1455337,1455697,1456067,1470135,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160,1718174-1718175,1718198,1718225
+/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,1090533,1090540,1090570,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1180718,1186491,1190533,1190600,1194848,1194994,1220915,1221926,1221937,1221940,1222136,1222418,1235059,1240337,1240373,1299342,1299389-1299390,1303198,1327863,1327890,1327893,1329145-1329146,1330675,1330682,1330695,1338876,1350592,1353719,1355738,1357818,1377230,1383060,1409175,1455319,1455337,1455697,1456067,1470135,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160,1718174-1718175,1718198,1718225,1718231-1718232
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=1718262&r1=1718261&r2=1718262&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 Mon Dec
7 08:38:01 2015
@@ -72,8 +72,9 @@
<destName>NOTICE</destName>
</file>
<file>
- <source>../../release-docs/release-notes.html</source>
+
<source>../../src/site/markdown/release-notes/${release_version}.md</source>
<outputDirectory>${dist.dir}</outputDirectory>
+ <destName>RELEASE-NOTE</destName>
</file>
</files>
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=1718262&r1=1718261&r2=1718262&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 Mon Dec
7 08:38:01 2015
@@ -51,6 +51,7 @@
import java.util.Date
import java.text.MessageFormat
project.properties['buildTimestamp'] =
MessageFormat.format("{0,date,MMM dd, yyyy}", new Date())
+ project.properties['release_version'] =
project.version.replaceAll("-SNAPSHOT", "")
</script>
</scripts>
</configuration>
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=1718262&r1=1718261&r2=1718262&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 Mon Dec
7 08:38:01 2015
@@ -40,4 +40,11 @@
</includes>
</fileSet>
</fileSets>
+ <files>
+ <file>
+
<source>../../src/site/markdown/release-notes/${release_version}.md</source>
+ <outputDirectory>rampart-src-${project.version}</outputDirectory>
+ <destName>RELEASE-NOTE</destName>
+ </file>
+ </files>
</assembly>
Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1718262&r1=1718261&r2=1718262&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Mon Dec 7 08:38:01 2015
@@ -232,6 +232,23 @@
</scripts>
</configuration>
</execution>
+ <execution>
+ <id>prepare-site</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <scripts>
+ <script>
+ import java.util.Date
+ import java.text.MessageFormat
+ project.properties['release_date'] =
MessageFormat.format("{0,date,MMMMM dd, yyyy}", new Date())
+ project.properties['release_version'] =
project.version.replaceAll("-SNAPSHOT", "")
+ </script>
+ </scripts>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
Modified: axis/axis2/java/rampart/branches/1_6/src/site/site.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/src/site/site.xml?rev=1718262&r1=1718261&r2=1718262&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/src/site/site.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/src/site/site.xml Mon Dec 7 08:38:01
2015
@@ -20,60 +20,64 @@
<project name="Apache Rampart">
- <bannerLeft>
- <name>Apache Rampart</name>
- <href>images/apache-rampart-logo.jpg</href>
- </bannerLeft>
-
+ <bannerLeft>
+ <name>Apache Rampart</name>
+ <href>images/apache-rampart-logo.jpg</href>
+ </bannerLeft>
+
<bannerRight>
<src>http://www.apache.org/images/asf_logo_wide.png</src>
<href>http://www.apache.org</href>
</bannerRight>
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-default-skin</artifactId>
- <version>1.0</version>
- </skin>
-
- <publishDate format="dd MMM yyyy"/>
-
- <body>
- <links>
- <item name="Apache Axis2/Java"
href="http://axis.apache.org/axis2/java/core/"; />
- </links>
-
- <menu name="Apache Rampart">
- <item name="Home" href="index.html" />
- <item name="Downloads" href="javascript:void(0)">
- <item name="Releases" href="download.html"/>
- <item name="Source Code" href="svn.html"/>
- </item>
- </menu>
- <menu name="Documentation">
- <item name="Getting Started" href="quick-start.html"/>
- <item name="Samples" href="samples.html"/>
- <item name="FAQ"
href="http://wiki.apache.org/ws/FrontPage/Rampart/FAQ"/>
- <item name="Rampart Configuration"
href="rampartconfig-guide.html"/>
- <item name="STS Configuration"
href="setting-up-sts.html"/>
- <item name="Developer Guide"
href="developer-guide.html"/>
- <item name="Build the Site" href="siteHowTo.html" />
- </menu>
- <menu name="Resources">
- <item name="Articles" href="articles.html" />
- <item name="Specifications" href="specifications.html"/>
- <item name="Online Javadocs" href="apidocs/index.html"/>
- </menu>
- <menu name="Project Information">
- <item name="Project Team" href="team-list.html" />
- <item name="Issue Tracking"
href="http://issues.apache.org/jira/browse/Rampart"; />
- <item name="Mailing Lists" href="mail-lists.html"/>
- <item name="Source Code"
-
href="http://svn.apache.org/viewvc/axis/axis2/java/rampart/"; />
- <item name="License"
href="http://www.apache.org/licenses/"/>
- <item name="Sponsorship"
href="http://www.apache.org/foundation/sponsorship.html"/>
- <item name="Thanks"
href="http://www.apache.org/foundation/thanks.html"/>
- <item name="Security"
href="http://www.apache.org/security/"/>
- </menu>
- </body>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-default-skin</artifactId>
+ <version>1.0</version>
+ </skin>
+
+ <publishDate format="dd MMM yyyy"/>
+
+ <body>
+ <links>
+ <item name="Apache Axis2/Java"
href="http://axis.apache.org/axis2/java/core/"; />
+ </links>
+
+ <menu name="Apache Rampart">
+ <item name="Home" href="index.html" />
+ <item name="Downloads" href="javascript:void(0)">
+ <item name="Releases" href="download.html"/>
+ <item name="Source Code" href="svn.html"/>
+ </item>
+ <item name="Release Notes" href="javascript:void(0)">
+ <item name="1.6.1" href="release-notes/1.6.1.html"/>
+ <item name="1.6.2" href="release-notes/1.6.2.html"/>
+ <item name="1.6.3" href="release-notes/1.6.3.html"/>
+ </item>
+ </menu>
+ <menu name="Documentation">
+ <item name="Getting Started" href="quick-start.html"/>
+ <item name="Samples" href="samples.html"/>
+ <item name="FAQ"
href="http://wiki.apache.org/ws/FrontPage/Rampart/FAQ"/>
+ <item name="Rampart Configuration"
href="rampartconfig-guide.html"/>
+ <item name="STS Configuration" href="setting-up-sts.html"/>
+ <item name="Developer Guide" href="developer-guide.html"/>
+ <item name="Build the Site" href="siteHowTo.html" />
+ </menu>
+ <menu name="Resources">
+ <item name="Articles" href="articles.html" />
+ <item name="Specifications" href="specifications.html"/>
+ <item name="Online Javadocs" href="apidocs/index.html"/>
+ </menu>
+ <menu name="Project Information">
+ <item name="Project Team" href="team-list.html" />
+ <item name="Issue Tracking"
href="http://issues.apache.org/jira/browse/Rampart"; />
+ <item name="Mailing Lists" href="mail-lists.html"/>
+ <item name="Source Code"
href="http://svn.apache.org/viewvc/axis/axis2/java/rampart/"; />
+ <item name="License" href="http://www.apache.org/licenses/"/>
+ <item name="Sponsorship"
href="http://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks"
href="http://www.apache.org/foundation/thanks.html"/>
+ <item name="Security" href="http://www.apache.org/security/"/>
+ </menu>
+ </body>
</project>
