You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2013/05/04 13:26:52 UTC

svn commit: r1479080 - in /axis/axis2/java/sandesha/branches/1_6: ./ modules/client/ modules/core/ modules/distribution/ modules/interop/ modules/mar/ modules/persistence/ modules/policy/ modules/rampart-integration/ modules/resource-bundle/ modules/sa...

Author: veithen
Date: Sat May  4 11:26:51 2013
New Revision: 1479080

URL: http://svn.apache.org/r1479080
Log:
Merged site changes (r1479071 and r1479079) to the 1.6 branch.

Modified:
    axis/axis2/java/sandesha/branches/1_6/   (props changed)
    axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml
    axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml
    axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml
    axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml
    axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml
    axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml
    axis/axis2/java/sandesha/branches/1_6/modules/policy/pom.xml
    axis/axis2/java/sandesha/branches/1_6/modules/rampart-integration/pom.xml
    axis/axis2/java/sandesha/branches/1_6/modules/resource-bundle/pom.xml
    axis/axis2/java/sandesha/branches/1_6/modules/samples/pom.xml
    axis/axis2/java/sandesha/branches/1_6/modules/tests/pom.xml
    axis/axis2/java/sandesha/branches/1_6/pom.xml
    axis/axis2/java/sandesha/branches/1_6/src/site/site.xml
    axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm

Propchange: axis/axis2/java/sandesha/branches/1_6/
------------------------------------------------------------------------------
  Merged /axis/axis2/java/sandesha/trunk:r1479071,1479079

Modified: axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/client/pom.xml Sat May  4 11:26:51 2013
@@ -106,7 +106,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

Modified: axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/core/pom.xml Sat May  4 11:26:51 2013
@@ -73,7 +73,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

Modified: axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml Sat May  4 11:26:51 2013
@@ -161,7 +161,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
             <plugin>

Modified: axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/interop/pom.xml Sat May  4 11:26:51 2013
@@ -115,7 +115,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

Modified: axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/mar/pom.xml Sat May  4 11:26:51 2013
@@ -107,7 +107,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

Modified: axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/persistence/pom.xml Sat May  4 11:26:51 2013
@@ -110,7 +110,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

Modified: axis/axis2/java/sandesha/branches/1_6/modules/policy/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/policy/pom.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/policy/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/policy/pom.xml Sat May  4 11:26:51 2013
@@ -111,7 +111,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

Modified: axis/axis2/java/sandesha/branches/1_6/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/rampart-integration/pom.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/rampart-integration/pom.xml Sat May  4 11:26:51 2013
@@ -73,7 +73,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

Modified: axis/axis2/java/sandesha/branches/1_6/modules/resource-bundle/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/resource-bundle/pom.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/resource-bundle/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/resource-bundle/pom.xml Sat May  4 11:26:51 2013
@@ -68,6 +68,12 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

Modified: axis/axis2/java/sandesha/branches/1_6/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/samples/pom.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/samples/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/samples/pom.xml Sat May  4 11:26:51 2013
@@ -88,7 +88,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
         </plugins>

Modified: axis/axis2/java/sandesha/branches/1_6/modules/tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/tests/pom.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/tests/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/tests/pom.xml Sat May  4 11:26:51 2013
@@ -151,7 +151,7 @@
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <generateReports>false</generateReports>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
             <plugin>

Modified: axis/axis2/java/sandesha/branches/1_6/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/pom.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/pom.xml Sat May  4 11:26:51 2013
@@ -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 &#169; {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>

Modified: axis/axis2/java/sandesha/branches/1_6/src/site/site.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/src/site/site.xml?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/src/site/site.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/src/site/site.xml Sat May  4 11:26:51 2013
@@ -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"/>

Modified: axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm?rev=1479080&r1=1479079&r2=1479080&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm (original)
+++ axis/axis2/java/sandesha/branches/1_6/src/site/xdoc/download.xml.vm Sat May  4 11:26:51 2013
@@ -53,14 +53,14 @@ the binary distribution and the source d
       </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>