This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch 1_6 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-sandesha.git
commit 460213464a43bde266ca54ec0221f8d47b76b8ff Author: Andreas Veithen <veit...@apache.org> AuthorDate: Sat May 4 11:26:51 2013 +0000 Merged site changes (r1479071 and r1479079) to the 1.6 branch. --- modules/client/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/interop/pom.xml | 2 +- modules/mar/pom.xml | 2 +- modules/persistence/pom.xml | 2 +- modules/policy/pom.xml | 2 +- modules/rampart-integration/pom.xml | 2 +- modules/resource-bundle/pom.xml | 6 ++++++ modules/samples/pom.xml | 2 +- modules/tests/pom.xml | 2 +- pom.xml | 31 +++++++++++++++++++++++++++++++ src/site/site.xml | 6 +++--- src/site/xdoc/download.xml.vm | 12 ++++++------ 14 files changed, 56 insertions(+), 19 deletions(-) diff --git a/modules/client/pom.xml b/modules/client/pom.xml index fa240c5..3129373 100644 --- a/modules/client/pom.xml +++ b/modules/client/pom.xml @@ -106,7 +106,7 @@ <plugin> <artifactId>maven-site-plugin</artifactId> <configuration> - <generateReports>false</generateReports> + <skip>true</skip> </configuration> </plugin> </plugins> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index ae4dff6..cf6c955 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -73,7 +73,7 @@ <plugin> <artifactId>maven-site-plugin</artifactId> <configuration> - <generateReports>false</generateReports> + <skip>true</skip> </configuration> </plugin> </plugins> diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 8b33744..3655007 100755 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -161,7 +161,7 @@ <plugin> <artifactId>maven-site-plugin</artifactId> <configuration> - <generateReports>false</generateReports> + <skip>true</skip> </configuration> </plugin> <plugin> diff --git a/modules/interop/pom.xml b/modules/interop/pom.xml index fb65263..244d042 100644 --- a/modules/interop/pom.xml +++ b/modules/interop/pom.xml @@ -115,7 +115,7 @@ <plugin> <artifactId>maven-site-plugin</artifactId> <configuration> - <generateReports>false</generateReports> + <skip>true</skip> </configuration> </plugin> </plugins> diff --git a/modules/mar/pom.xml b/modules/mar/pom.xml index 5e093b3..f2d08b8 100644 --- a/modules/mar/pom.xml +++ b/modules/mar/pom.xml @@ -107,7 +107,7 @@ <plugin> <artifactId>maven-site-plugin</artifactId> <configuration> - <generateReports>false</generateReports> + <skip>true</skip> </configuration> </plugin> </plugins> diff --git a/modules/persistence/pom.xml b/modules/persistence/pom.xml index 48f7cc9..495d2a6 100644 --- a/modules/persistence/pom.xml +++ b/modules/persistence/pom.xml @@ -110,7 +110,7 @@ <plugin> <artifactId>maven-site-plugin</artifactId> <configuration> - <generateReports>false</generateReports> + <skip>true</skip> </configuration> </plugin> </plugins> diff --git a/modules/policy/pom.xml b/modules/policy/pom.xml index f440b21..6a6f2bf 100644 --- a/modules/policy/pom.xml +++ b/modules/policy/pom.xml @@ -111,7 +111,7 @@ <plugin> <artifactId>maven-site-plugin</artifactId> <configuration> - <generateReports>false</generateReports> + <skip>true</skip> </configuration> </plugin> </plugins> diff --git a/modules/rampart-integration/pom.xml b/modules/rampart-integration/pom.xml index 1ce5619..c02da39 100644 --- a/modules/rampart-integration/pom.xml +++ b/modules/rampart-integration/pom.xml @@ -73,7 +73,7 @@ <plugin> <artifactId>maven-site-plugin</artifactId> <configuration> - <generateReports>false</generateReports> + <skip>true</skip> </configuration> </plugin> </plugins> diff --git a/modules/resource-bundle/pom.xml b/modules/resource-bundle/pom.xml index caf497a..629b80f 100644 --- a/modules/resource-bundle/pom.xml +++ b/modules/resource-bundle/pom.xml @@ -68,6 +68,12 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index d6df50c..f58709c 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -88,7 +88,7 @@ <plugin> <artifactId>maven-site-plugin</artifactId> <configuration> - <generateReports>false</generateReports> + <skip>true</skip> </configuration> </plugin> </plugins> diff --git a/modules/tests/pom.xml b/modules/tests/pom.xml index fd673e2..71beb7a 100644 --- a/modules/tests/pom.xml +++ b/modules/tests/pom.xml @@ -151,7 +151,7 @@ <plugin> <artifactId>maven-site-plugin</artifactId> <configuration> - <generateReports>false</generateReports> + <skip>true</skip> </configuration> </plugin> <plugin> diff --git a/pom.xml b/pom.xml index d3d03ae..0299832 100644 --- a/pom.xml +++ b/pom.xml @@ -150,6 +150,16 @@ <goals> <goal>aggregate</goal> </goals> + <configuration> + <breakiterator>true</breakiterator> + <!-- The notimestamp, windowtitle and bottom parameters are chosen to minimize the number + of changes between releases (to avoid mass changes when committing the site for a new release) --> + <notimestamp>true</notimestamp> + <windowtitle>Apache Sandesha2</windowtitle> + <bottom>Copyright © {organizationName}. All Rights Reserved.</bottom> + <!-- doctitle only appears in the summary and we should include the version there --> + <doctitle>Apache Sandesha2 ${project.version}</doctitle> + </configuration> </execution> </executions> </plugin> @@ -171,6 +181,20 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.2</version> + <configuration> + <!-- Required by maven-scm-publish-plugin --> + <skipDeploy>true</skipDeploy> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <version>1.0-beta-2</version> + </plugin> </plugins> <pluginManagement> <plugins> @@ -257,6 +281,13 @@ <url>http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6</url> </scm> + <distributionManagement> + <site> + <id>site</id> + <url>scm:svn:https://svn.apache.org/repos/asf/axis/site/axis2/java/sandesha</url> + </site> + </distributionManagement> + <pluginRepositories> <pluginRepository> <id>apache.snapshots</id> diff --git a/src/site/site.xml b/src/site/site.xml index 9688d95..ddf7802 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -34,16 +34,16 @@ </links> <menu name="Apache Sandesha2"> <item name="Home" href="index.html" /> - <item name="Downloads"> + <item name="Downloads" href="javascript:void(0)"> <item name="Releases" href="download.cgi"/> <item name="Source Code" href="http://svn.apache.org/repos/asf/axis/axis2/java/sandesha/trunk"/> </item> - <item name="Documentation"> + <item name="Documentation" href="javascript:void(0)"> <item name="User Guide" href="userGuide.html"/> <item name="Architecture Guide" href="architectureGuide.html"/> <item name="Java Docs" href="apidocs/index.html" /> </item> - <item name="Project Information"> + <item name="Project Information" href="javascript:void(0)"> <item name="Mailing Lists" href="mail-lists.html"/> <item name="Project Team" href="team-list.html"/> <item name="Issue Tracking" href="issue-tracking.html"/> diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm index f3d7ba6..d284652 100644 --- a/src/site/xdoc/download.xml.vm +++ b/src/site/xdoc/download.xml.vm @@ -53,14 +53,14 @@ the binary distribution and the source distribution.</p> </tr> <tr><td><a name="161"></a>1.6.1</td><td>Release</td><td> Source Distribution - <a href="[preferred]/axis/axis2/java/sandesha/1.6.1/sandesha2-1.6.1-src.zip">zip</a> | - <a href="http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.1/sandesha2-1.6.1-src.zip.md5">MD5</a> | - <a href="http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.1/sandesha2-1.6.1-src.zip.asc">PGP</a> + <a href="http://archive.apache.org/dist/axis/axis2/java/sandesha/1.6.1/sandesha2-1.6.1-src.zip">zip</a> | + <a href="http://archive.apache.org/dist/axis/axis2/java/sandesha/1.6.1/sandesha2-1.6.1-src.zip.md5">MD5</a> | + <a href="http://archive.apache.org/dist/axis/axis2/java/sandesha/1.6.1/sandesha2-1.6.1-src.zip.asc">PGP</a> <br></br> Binary Distribution - <a href="[preferred]/axis/axis2/java/sandesha/1.6.1/sandesha2-1.6.1-bin.zip">zip</a> | - <a href="http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.1/sandesha2-1.6.1-bin.zip.md5">MD5</a> | - <a href="http://www.apache.org/dist/axis/axis2/java/sandesha/1.6.1/sandesha2-1.6.1-bin.zip.asc">PGP</a> + <a href="http://archive.apache.org/dist/axis/axis2/java/sandesha/1.6.1/sandesha2-1.6.1-bin.zip">zip</a> | + <a href="http://archive.apache.org/dist/axis/axis2/java/sandesha/1.6.1/sandesha2-1.6.1-bin.zip.md5">MD5</a> | + <a href="http://archive.apache.org/dist/axis/axis2/java/sandesha/1.6.1/sandesha2-1.6.1-bin.zip.asc">PGP</a> <br></br> </td><td>10 - Dec - 2011</td> <td>1.6.1 Release (Archived)</td>