Author: veithen
Date: Sun May 5 12:03:18 2013
New Revision: 1479304
URL: http://svn.apache.org/r1479304
Log:
Merged the latest site changes
(1478156,1479069,1479070,1479160,1479183,1479188,1479299) to the 1.6 branch for
publication with 1.6.3.
Added:
axis/axis2/java/rampart/branches/1_6/apidocs/ (props changed)
- copied from r1479160, axis/axis2/java/rampart/trunk/apidocs/
axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml
- copied, changed from r1479160,
axis/axis2/java/rampart/trunk/apidocs/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.6.2/
- copied from r1479069,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.6.2/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.6.2/download.cgi
- copied unchanged from r1479069,
axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/1.6.2/download.cgi
Removed:
axis/axis2/java/rampart/branches/1_6/modules/documentation/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.1/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.2/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.3/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.4/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.5/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.5.1/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.6.0/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/download/1.6.1/
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/resources/images/apache-rampart-banner.jpg
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/documentation/src/site/site.xml
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download.xml
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.0/download.xml
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.1/download.xml
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/index.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
Merged
/axis/axis2/java/rampart/trunk:r1478156,1479069-1479070,1479160,1479183,1479188,1479299
Propchange: axis/axis2/java/rampart/branches/1_6/apidocs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun May 5 12:03:18 2013
@@ -0,0 +1 @@
+target
Copied: axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml (from r1479160,
axis/axis2/java/rampart/trunk/apidocs/pom.xml)
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml?p2=axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml&p1=axis/axis2/java/rampart/trunk/apidocs/pom.xml&r1=1479160&r2=1479304&rev=1479304&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/apidocs/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml Sun May 5 12:03:18
2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.6.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>apidocs</artifactId>
@@ -80,9 +80,18 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
+ <executions>
+ <execution>
+ <id>default-site</id>
+ <phase>site</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
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=1479304&r1=1479303&r2=1479304&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 Sun May
5 12:03:18 2013
@@ -41,11 +41,11 @@
</dependencySets>
<fileSets>
<fileSet>
- <directory>target/apidocs</directory>
+ <directory>../../apidocs/target/site</directory>
<outputDirectory>${dist.dir}/docs/apidocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>../documentation/target/site</directory>
+ <directory>../../target/site</directory>
<outputDirectory>${dist.dir}/docs</outputDirectory>
</fileSet>
<fileSet>
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=1479304&r1=1479303&r2=1479304&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 Sun May
5 12:03:18 2013
@@ -36,39 +36,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>build-javadoc</id>
- <phase>package</phase>
- <configuration>
- <tasks>
- <javadoc
packagenames="org.apache.rampart.*,org.apache.rahas.*" destdir="target/apidocs"
author="true" breakiterator="true" version="true" use="true"
windowtitle="Apache Rampart API">
-
- <sourcepath>
- <dirset dir="../..">
- <include
name="**/rampart-core/src/main/java" />
- <include
name="**/rampart-policy/src/main/java" />
- <include
name="**/rampart-trust/src/main/java" />
- </dirset>
- </sourcepath>
-
- <classpath
refid="maven.dependency.classpath" />
- <classpath refid="maven.compile.classpath"
/>
- <classpath refid="maven.runtime.classpath"
/>
-
- </javadoc>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>1.2</version>
@@ -108,6 +75,12 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified:
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/site.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/site.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/site.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/site.xml
Sun May 5 12:03:18 2013
@@ -26,7 +26,7 @@
</bannerLeft>
<bannerRight>
- <src>images/apache-rampart-banner.jpg</src>
+ <src>http://www.apache.org/images/asf_logo_wide.png</src>
<href>http://www.apache.org</href>
</bannerRight>
@@ -45,7 +45,7 @@
<menu name="Apache Rampart">
<item name="Home" href="index.html" />
- <item name="Downloads">
+ <item name="Downloads" href="javascript:void(0)">
<item name="Releases" href="download.html"/>
<item name="Source Code" href="svn.html"/>
</item>
@@ -71,9 +71,10 @@
<item name="Source Code"
href="http://svn.apache.org/viewvc/axis/axis2/java/rampart/"; />
<item name="Dependencies" href="dependencies.html"/>
- <item name="License"
- href="http://www.apache.org/licenses/LICENSE-2.0.html";
/>
+ <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>
Modified:
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download.xml
Sun May 5 12:03:18 2013
@@ -41,12 +41,12 @@
</tr>
<tr>
<td>
- <a href="download/1.6.1/download.cgi">
+ <a href="download/1.6.1/download.html">
<strong>1.6.1</strong>
</a>
</td>
<td>24 Sep 2011</td>
- <td>1.6.1 Release (Mirrored)</td>
+ <td>1.6.1 Release (Archived)</td>
</tr>
<tr>
<td>
@@ -59,7 +59,7 @@
</tr>
<tr>
<td>
- <a href="download/1.6.0/download.cgi">
+ <a href="download/1.6.0/download.html">
<strong>1.6.0</strong>
</a>
</td>
@@ -68,7 +68,7 @@
</tr>
<tr>
<td>
- <a href="download/1.5.1/download.cgi">
+ <a href="download/1.5.1/download.html">
<strong>1.5.1</strong>
</a>
</td>
@@ -77,7 +77,7 @@
</tr>
<tr>
<td>
- <a href="download/1.5/download.cgi">
+ <a href="download/1.5/download.html">
<strong>1.5</strong>
</a>
</td>
@@ -86,7 +86,7 @@
</tr>
<tr>
<td>
- <a href="download/1.4/download.cgi">
+ <a href="download/1.4/download.html">
<strong>1.4</strong>
</a>
</td>
@@ -95,7 +95,7 @@
</tr>
<tr>
<td>
- <a href="download/1.3/download.cgi">
+ <a href="download/1.3/download.html">
<strong>1.3</strong>
</a>
</td>
@@ -104,7 +104,7 @@
</tr>
<tr>
<td>
- <a href="download/1.2/download.cgi">
+ <a href="download/1.2/download.html">
<strong>1.2</strong>
</a>
</td>
@@ -113,7 +113,7 @@
</tr>
<tr>
<td>
- <a href="download/1.1/download.cgi">
+ <a href="download/1.1/download.html">
<strong>1.1</strong>
</a>
</td>
Modified:
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5.1/download.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
Sun May 5 12:03:18 2013
@@ -78,38 +78,5 @@ title=
</tbody>
</table>
</div>
-<div align="left"><br />
-<p>[if-any logo] <a href="[link]"><img align="right" src="[logo]"
-border="0" /></a>[end] The currently selected mirror is
-<b>[preferred]</b>. If you encounter a problem with this mirror,
-please select another mirror. If all mirrors are failing, there are
-<i>backup</i> mirrors (at the end of the mirrors list) that should
-be available.</p>
-<form action="[location]" method="get" id="SelectMirror" name="SelectMirror">
-Other mirrors: <select name="Preferred">
-[if-any http]
- [for http]<option value="[http]">[http]</option>[end]
-[end]
-[if-any ftp]
- [for ftp]<option value="[ftp]">[ftp]</option>[end]
-[end]
-[if-any backup]
- [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-[end]
-</select><input type="submit" value="Change"/></form><p>You may also consult
the <a class="externalLink" href="http://www.apache.org/mirrors/";>complete list
of mirrors</a>
-.</p>
-<p><strong>Note:</strong> when downloading from a mirror please
-check the <a href=
-"http://www.apache.org/dev/release-signing#md5";>md5sum</a> and
-verify the <a href=
-"http://www.apache.org/dev/release-signing#openpgp";>OpenPGP</a>
-compatible signature from the main Apache site. These can be
-downloaded by following the links above. This <a href=
-"http://www.apache.org/dist/axis/axis2/java/rampart/KEYS";>KEYS</a> file
contains
-the public keys that can be used for verifying signatures. It is
-recommended that (when possible)a <a href=
-"http://www.apache.org/dev/release-signing#web-of-trust";>Web of
-trust</a> is used to confirm the identity of these keys.</p>
-</div>
</body>
</html>
Modified:
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.0/download.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.0/download.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.0/download.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.0/download.xml
Sun May 5 12:03:18 2013
@@ -78,38 +78,5 @@ title=
</tbody>
</table>
</div>
-<div align="left"><br />
-<p>[if-any logo] <a href="[link]"><img align="right" src="[logo]"
-border="0" /></a>[end] The currently selected mirror is
-<b>[preferred]</b>. If you encounter a problem with this mirror,
-please select another mirror. If all mirrors are failing, there are
-<i>backup</i> mirrors (at the end of the mirrors list) that should
-be available.</p>
-<form action="[location]" method="get" id="SelectMirror" name="SelectMirror">
-Other mirrors: <select name="Preferred">
-[if-any http]
- [for http]<option value="[http]">[http]</option>[end]
-[end]
-[if-any ftp]
- [for ftp]<option value="[ftp]">[ftp]</option>[end]
-[end]
-[if-any backup]
- [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-[end]
-</select><input type="submit" value="Change"/></form><p>You may also consult
the <a class="externalLink" href="http://www.apache.org/mirrors/";>complete list
of mirrors</a>
-.</p>
-<p><strong>Note:</strong> when downloading from a mirror please
-check the <a href=
-"http://www.apache.org/dev/release-signing#md5";>md5sum</a> and
-verify the <a href=
-"http://www.apache.org/dev/release-signing#openpgp";>OpenPGP</a>
-compatible signature from the main Apache site. These can be
-downloaded by following the links above. This <a href=
-"http://www.apache.org/dist/axis/axis2/java/rampart/KEYS";>KEYS</a> file
contains
-the public keys that can be used for verifying signatures. It is
-recommended that (when possible)a <a href=
-"http://www.apache.org/dev/release-signing#web-of-trust";>Web of
-trust</a> is used to confirm the identity of these keys.</p>
-</div>
</body>
</html>
Modified:
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.1/download.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.1/download.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.1/download.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/download/1.6.1/download.xml
Sun May 5 12:03:18 2013
@@ -51,65 +51,32 @@ urchinTracker();
Distribution</strong></td>
<td>This is the complete version of Apache Rampart and will contain samples
as well.</td>
-<td><a
href="[preferred]/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-bin.zip"
title=
-
"[preferred]/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-bin.zip" onClick=
+<td><a
href="http://archive.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-bin.zip";
title=
+
"http://archive.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-bin.zip";
onClick=
"javascript:urchinTracker ('/downloads/rampart-dist-1.6.1-bin.zip');">zip</a>
-<a
href="http://www.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-bin.zip.md5";
-
title="http://www.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-bin.zip.md5";>MD5</a>
-<a
href="http://www.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-bin.zip.asc";
-
title="http://www.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-bin.zip.asc";>PGP</a></td>
+<a
href="http://archive.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-bin.zip.md5";
+
title="http://archive.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-bin.zip.md5";>MD5</a>
+<a
href="http://archive.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-bin.zip.asc";
+
title="http://archive.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-bin.zip.asc";>PGP</a></td>
</tr>
<tr>
<td><a name="src" id="src"></a> <strong>Source
Distribution</strong></td>
<td>This will contain the sources of Apache Rampart distribution.</td>
-<td><a
href="[preferred]/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-src.zip"
title=
-
"[preferred]/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-src.zip" onClick=
+<td><a
href="http://archive.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-src.zip";
title=
+
"http://archive.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-src.zip";
onClick=
"javascript:urchinTracker ('/downloads/rampart-dist-1.6.1-src.zip');">zip</a>
<a href=
-
"http://www.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-src.zip.md5";
+
"http://archive.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-src.zip.md5";
title=
-"http://www.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-src.zip.md5";>MD5</a>
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-src.zip.md5";>MD5</a>
<a href=
-
"http://www.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-src.zip.asc";
+
"http://archive.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-src.zip.asc";
title=
-"http://www.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-src.zip.asc";>PGP</a></td>
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.6.1/rampart-dist-1.6.1-src.zip.asc";>PGP</a></td>
</tr>
</tbody>
</table>
</div>
-<div align="left"><br />
-<p>[if-any logo] <a href="[link]"><img align="right" src="[logo]"
-border="0" /></a>[end] The currently selected mirror is
-<b>[preferred]</b>. If you encounter a problem with this mirror,
-please select another mirror. If all mirrors are failing, there are
-<i>backup</i> mirrors (at the end of the mirrors list) that should
-be available.</p>
-<form action="[location]" method="get" id="SelectMirror" name="SelectMirror">
-Other mirrors: <select name="Preferred">
-[if-any http]
- [for http]<option value="[http]">[http]</option>[end]
-[end]
-[if-any ftp]
- [for ftp]<option value="[ftp]">[ftp]</option>[end]
-[end]
-[if-any backup]
- [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-[end]
-</select><input type="submit" value="Change"/></form><p>You may also consult
the <a class="externalLink" href="http://www.apache.org/mirrors/";>complete list
of mirrors</a>
-.</p>
-<p><strong>Note:</strong> when downloading from a mirror please
-check the <a href=
-"http://www.apache.org/dev/release-signing#md5";>md5sum</a> and
-verify the <a href=
-"http://www.apache.org/dev/release-signing#openpgp";>OpenPGP</a>
-compatible signature from the main Apache site. These can be
-downloaded by following the links above. This <a href=
-"http://www.apache.org/dist/axis/axis2/java/rampart/KEYS";>KEYS</a> file
contains
-the public keys that can be used for verifying signatures. It is
-recommended that (when possible)a <a href=
-"http://www.apache.org/dev/release-signing#web-of-trust";>Web of
-trust</a> is used to confirm the identity of these keys.</p>
-</div>
</body>
</html>
Modified:
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/index.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/index.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/documentation/src/site/xdoc/index.xml
Sun May 5 12:03:18 2013
@@ -29,13 +29,9 @@
<body>
<h1>Apache Rampart - Axis2 Security Module</h1>
<section name="Welcome to Apache Rampart">
- <p>Rampart is the security module of Axis2. It secures
SOAP messages
+ <p>Apache Rampart™ is the security module of
Axis2. It secures SOAP messages
according to specifications in the WS-Security stack. Rampart implements the
following specifications:</p>
- </section>
-
- <section name="Features of Rampart Latest Version">
-
<ul>
<li><p>WS - Security 1.0</p></li>
<li><p>WS - Security 1.1</p></li>
@@ -45,6 +41,8 @@ following specifications:</p>
<li><p>WS - Trust - February 2005</p></li>
<li><p>WS - Trust - WS-SX spec - EXPERIMENTAL</p></li>
</ul>
+ <hr/>
+ <p>Apache Rampart, Rampart, Apache, the Apache feather logo, and
the Apache Rampart project logo are trademarks of The Apache Software
Foundation.</p>
</section>
<section name="Apache Rampart News">
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml Sun May
5 12:03:18 2013
@@ -53,6 +53,12 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -68,18 +74,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
Sun May 5 12:03:18 2013
@@ -584,6 +584,12 @@
<argLine>-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar</argLine>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -643,19 +649,4 @@
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml Sun May 5
12:03:18 2013
@@ -89,6 +89,12 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-policy/pom.xml Sun May
5 12:03:18 2013
@@ -53,21 +53,13 @@
<target>1.5</target>
</configuration>
</plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
<configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
+ <skip>true</skip>
</configuration>
</plugin>
</plugins>
- </reporting>
+ </build>
</project>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml Sun
May 5 12:03:18 2013
@@ -81,6 +81,12 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml Sun May
5 12:03:18 2013
@@ -55,6 +55,12 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -83,19 +89,4 @@
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml Sun
May 5 12:03:18 2013
@@ -67,6 +67,12 @@
<moduleXmlFile>module.xml</moduleXmlFile>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml?rev=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-trust/pom.xml Sun May
5 12:03:18 2013
@@ -67,6 +67,12 @@
</includes>
</configuration-->
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -77,19 +83,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- <configuration>
- <templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent" />
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
</project>
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=1479304&r1=1479303&r2=1479304&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Sun May 5 12:03:18 2013
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>8</version>
+ <version>13</version>
</parent>
<groupId>org.apache.rampart</groupId>
@@ -118,6 +118,13 @@
<url>http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6</url>
</scm>
+ <distributionManagement>
+ <site>
+ <id>site</id>
+
<url>scm:svn:https://svn.apache.org/repos/asf/axis/site/axis2/java/rampart</url>
+ </site>
+ </distributionManagement>
+
<build>
<pluginManagement>
<plugins>
@@ -137,6 +144,14 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.10</version>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <!-- Required by maven-scm-publish-plugin -->
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -176,12 +191,36 @@
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
<inherited>false</inherited>
+ <configuration>
+
<siteDirectory>modules/documentation/src/site</siteDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>1.0-beta-2</version>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.6</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>project-team</report>
+ <report>dependencies</report>
+ <report>mailing-list</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
<dependencies>
@@ -341,12 +380,25 @@
</property>
</activation>
<modules>
- <module>modules/documentation</module>
<module>modules/distribution</module>
</modules>
<build>
<plugins>
<plugin>
+ <!-- Generate the site for inclusion in the binary
distribution -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dist-site</id>
+ <phase>package</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -373,13 +425,14 @@
for anything else than doing a release. -->
<id>everything</id>
<modules>
- <module>modules/documentation</module>
<module>modules/distribution</module>
+ <module>code-coverage</module>
</modules>
</profile>
</profiles>
<modules>
+ <module>apidocs</module>
<module>modules/rampart-policy</module>
<module>modules/rampart-trust</module>
<module>modules/rampart-core</module>
