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 2015/12/23 11:00:09 UTC
svn commit: r1721516 - in /axis/axis2/java/rampart/branches/1_6: ./ apidocs/
code-coverage/ modules/distribution/ modules/rampart-core/
modules/rampart-integration/ modules/rampart-mar/ modules/rampart-policy/
modules/rampart-samples/ modules/rampart-t...
Author: veithen
Date: Wed Dec 23 10:00:09 2015
New Revision: 1721516
URL: http://svn.apache.org/viewvc?rev=1721516&view=rev
Log:
Merge r1721431, r1721512 and r1721514 to the 1.6 branch.
Removed:
axis/axis2/java/rampart/branches/1_6/src/site/resources/css/
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/apache-rampart-banner-background.jpg
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/apache-rampart-content-back.jpg
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/apache-rampart-menu-bottom.jpg
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/apache-rampart-menu-button.gif
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/apache-rampart-menu-top.jpg
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/apache-rampart-menu.jpg
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/apache-rampart-spliter.jpg
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/breadcrumbs-bg.gif
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/external.png
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/h2-bg.gif
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/home-top.gif
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/leftcolumn-bg.gif
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/logos/build-by-maven-black.png
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/logos/build-by-maven-white.png
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/logos/maven-feather.png
axis/axis2/java/rampart/branches/1_6/src/site/resources/images/menu-back.gif
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml
axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml
axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.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
axis/axis2/java/rampart/branches/1_6/src/site/site.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 23 10:00:09 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,1470281,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160,1718174-1718175,1718198,1718225,1718231-1718232,1718682-1718683,1718937,1718941,1719191,1719197,1719227,1719229,171923
2,1719236-1719237,1719502,1719522,1719525,1719538,1719557,1719636-1719637,1720480,1720677,1721007,1721012,1721059,1721246,1721321
+/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,1470281,1478156,1479069-1479070,1479160,1479183,1479188,1479299,1566329,1610243,1610817,1611122,1612072,1612138,1718154,1718156-1718157,1718159-1718160,1718174-1718175,1718198,1718225,1718231-1718232,1718682-1718683,1718937,1718941,1719191,1719197,1719227,1719229,171923
2,1719236-1719237,1719502,1719522,1719525,1719538,1719557,1719636-1719637,1720480,1720677,1721007,1721012,1721059,1721246,1721321,1721431,1721512,1721514
Modified: axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml?rev=1721516&r1=1721515&r2=1721516&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/apidocs/pom.xml Wed Dec 23 10:00:09 2015
@@ -112,21 +112,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>default-site</id>
- <phase>site</phase>
- <goals>
- <goal>site</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
Modified: axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml?rev=1721516&r1=1721515&r2=1721516&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/code-coverage/pom.xml Wed Dec 23 10:00:09 2015
@@ -175,12 +175,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
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=1721516&r1=1721515&r2=1721516&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 Dec 23 10:00:09 2015
@@ -95,12 +95,6 @@
<skip>true</skip>
</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-core/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/pom.xml?rev=1721516&r1=1721515&r2=1721516&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 Wed Dec 23 10:00:09 2015
@@ -53,12 +53,6 @@
<target>1.5</target>
</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-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml?rev=1721516&r1=1721515&r2=1721516&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 Wed Dec 23 10:00:09 2015
@@ -742,12 +742,6 @@
<skip>true</skip>
</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-mar/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-mar/pom.xml?rev=1721516&r1=1721515&r2=1721516&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 Wed Dec 23 10:00:09 2015
@@ -80,12 +80,6 @@
</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=1721516&r1=1721515&r2=1721516&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 Wed Dec 23 10:00:09 2015
@@ -53,12 +53,6 @@
<target>1.5</target>
</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-samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/pom.xml?rev=1721516&r1=1721515&r2=1721516&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 Wed Dec 23 10:00:09 2015
@@ -86,12 +86,6 @@
<skip>true</skip>
</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-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/pom.xml?rev=1721516&r1=1721515&r2=1721516&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 Wed Dec 23 10:00:09 2015
@@ -61,12 +61,6 @@
<skip>true</skip>
</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-mar/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-trust-mar/pom.xml?rev=1721516&r1=1721515&r2=1721516&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 Wed Dec 23 10:00:09 2015
@@ -60,12 +60,6 @@
<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=1721516&r1=1721515&r2=1721516&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 Wed Dec 23 10:00:09 2015
@@ -67,12 +67,6 @@
</includes>
</configuration-->
</plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
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=1721516&r1=1721515&r2=1721516&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Wed Dec 23 10:00:09 2015
@@ -255,6 +255,21 @@
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", "")
+ project.properties['skipSiteSite'] = String.valueOf(!new File(project.basedir, 'src/site/site.xml').exists())
+ </script>
+ </scripts>
+ </configuration>
+ </execution>
+ <execution>
+ <id>check-site</id>
+ <phase>post-site</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <scripts>
+ <script>
+ project.properties['skipSiteStage'] = String.valueOf(!new File(project.reporting.outputDirectory).exists())
</script>
</scripts>
</configuration>
@@ -353,6 +368,35 @@
</plugin>
<plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-site</id>
+ <phase>site</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ <configuration>
+ <skip>${skipSiteSite}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>site-stage</id>
+ <phase>site-deploy</phase>
+ <goals>
+ <goal>stage</goal>
+ </goals>
+ <configuration>
+ <skip>${skipSiteStage}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <!-- Don't deploy; we use 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>
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=1721516&r1=1721515&r2=1721516&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 Wed Dec 23 10:00:09 2015
@@ -21,8 +21,7 @@
<project name="Apache Rampart">
<bannerLeft>
- <name>Apache Rampart</name>
- <href>images/apache-rampart-logo.jpg</href>
+ <src>images/apache-rampart-logo.jpg</src>
</bannerLeft>
<bannerRight>
@@ -32,8 +31,8 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-default-skin</artifactId>
- <version>1.0</version>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.4</version>
</skin>
<publishDate format="dd MMM yyyy"/>