Author: veithen
Date: Mon Apr 2 17:57:24 2012
New Revision: 1308441
URL: http://svn.apache.org/viewvc?rev=1308441&view=rev
Log:
Migrated to maven-site-plugin 3.0 so that the site can be built with Maven 3.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml
webservices/commons/trunk/modules/axiom/pom.xml
webservices/commons/trunk/modules/axiom/src/site/apt/quickstart-samples.apt.vm
webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css
webservices/commons/trunk/modules/axiom/src/site/site.xml
webservices/commons/trunk/modules/axiom/src/site/xdoc/download.xml.vm
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml?rev=1308441&r1=1308440&r2=1308441&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml
(original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-parent/pom.xml Mon
Apr 2 17:57:24 2012
@@ -297,6 +297,14 @@
<attach>true</attach>
</configuration>
</plugin>
+ <!-- We don't need to generate the site in sub-modules -->
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
@@ -454,19 +462,6 @@
</dependency>
</dependencies>
</dependencyManagement>
- <reporting>
- <plugins>
- <!-- We don't need to generate the site in sub-modules;
- skip report generation -->
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
- <configuration>
- <generateReports>false</generateReports>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
<distributionManagement>
<site>
<id>website</id>
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=1308441&r1=1308440&r2=1308441&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Mon Apr 2 17:57:24 2012
@@ -235,12 +235,6 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom</developerConnection>
<url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom</url>
</scm>
- <properties>
- <!-- This variable is used in some Xdocs and is substituted using
Velocity. Note that
- we can't use the project.version variable directly because of the
dot. See
-
http://maven.apache.org/plugins/maven-site-plugin/examples/creating-content.html
-->
- <axiom_version>${project.version}</axiom_version>
- </properties>
<build>
<pluginManagement>
<plugins>
@@ -257,7 +251,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.1.1</version>
+ <version>3.0</version>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified:
webservices/commons/trunk/modules/axiom/src/site/apt/quickstart-samples.apt.vm
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/site/apt/quickstart-samples.apt.vm?rev=1308441&r1=1308440&r2=1308441&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/src/site/apt/quickstart-samples.apt.vm
(original)
+++
webservices/commons/trunk/modules/axiom/src/site/apt/quickstart-samples.apt.vm
Mon Apr 2 17:57:24 2012
@@ -31,12 +31,12 @@ Adding Axiom as a Maven dependency
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>${axiom_version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>${axiom_version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
+------------------------------------------------+
@@ -53,7 +53,7 @@ Adding Axiom as a Maven dependency
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-dom</artifactId>
- <version>${axiom_version}</version>
+ <version>${project.version}</version>
<scope>runtime</scope>
</dependency>
+------------------------------------------------+
Modified:
webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css?rev=1308441&r1=1308440&r2=1308441&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css
(original)
+++ webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css Mon
Apr 2 17:57:24 2012
@@ -61,18 +61,23 @@ div#leftColumn {
border: none;
}
-div#navcolumn > ul > li.expanded,
-div#navcolumn > ul > li.none {
- background-image: none;
- padding: 0.5em 0;
+div#navcolumn > h5 {
+ padding: 0.3em 0;
+ display: block;
+ color: black;
+ font-size: 1.1em;
}
div#navcolumn a,
div#navcolumn strong {
- padding: 0.3em 0;
+ padding: 0.5em 0;
display: block;
- background-image: none;
color: black;
+ font-size: 1.1em;
+}
+
+div#navcolumn > ul > li.expanded,
+div#navcolumn > ul > li.none {
}
div#navcolumn > ul > li.expanded > ul > li.none > a,
Modified: webservices/commons/trunk/modules/axiom/src/site/site.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/site/site.xml?rev=1308441&r1=1308440&r2=1308441&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/site/site.xml (original)
+++ webservices/commons/trunk/modules/axiom/src/site/site.xml Mon Apr 2
17:57:24 2012
@@ -33,27 +33,27 @@
<item name="WebServices" href="http://ws.apache.org/"/>
<item name="Axiom" href="http://ws.apache.org/axiom/index.html"/>
</links>
-
- <menu name="Axiom">
- <item name="About" href="index.html"/>
- <item name="Downloads">
- <item name="Releases" href="download.cgi"/>
- <item name="Source Code" href="source-repository.html"/>
- </item>
- <item name="Documentation" href="documentation.html">
- <item name="Quick start samples"
href="quickstart-samples.html"/>
- <item name="User guide" href="userguide/userguide.html"/>
- <item name="Developer guide" href="devguide/devguide.html"/>
- <item name="Articles" href="articles.html"/>
- <item name="Javadocs" href="/apidocs/index.html"/>
- <item name="FAQ" href="faq.html"/>
- <item name="View Source"
href="http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/?root=Apache-SVN"/>
- </item>
- <item name="Project Information">
- <item name="Mailing Lists" href="/mail-lists.html"/>
- <item name="Project Team" href="/team-list.html"/>
- <item name="Issue Tracking" href="issue-tracking.html"/>
- </item>
+ <menu name="About">
+ <item name="Introduction" href="index.html"/>
+ <item name="Mailing Lists" href="/mail-lists.html"/>
+ <item name="Project Team" href="/team-list.html"/>
+ <item name="Issue Tracking" href="issue-tracking.html"/>
+ </menu>
+ <menu name="Downloads">
+ <item name="Releases" href="download.cgi"/>
+ <item name="Source Code" href="source-repository.html"/>
+ </menu>
+ <menu name="Documentation">
+ <item name="Overview" href="documentation.html"/>
+ <item name="Quick start samples" href="quickstart-samples.html"/>
+ <item name="User guide" href="userguide/userguide.html"/>
+ <item name="Developer guide" href="devguide/devguide.html"/>
+ <item name="Articles" href="articles.html"/>
+ <item name="Javadocs" href="/apidocs/index.html"/>
+ <item name="FAQ" href="faq.html"/>
+ <item name="View Source"
href="http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/?root=Apache-SVN"/>
+ </menu>
+ <menu name="Apache">
<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"/>
Modified: webservices/commons/trunk/modules/axiom/src/site/xdoc/download.xml.vm
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/site/xdoc/download.xml.vm?rev=1308441&r1=1308440&r2=1308441&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/site/xdoc/download.xml.vm
(original)
+++ webservices/commons/trunk/modules/axiom/src/site/xdoc/download.xml.vm Mon
Apr 2 17:57:24 2012
@@ -30,7 +30,7 @@
<section name="Releases">
<div align="left">
<p>Axiom is becoming more and more stable and the latest
official version available for download is
- Axiom ${axiom_version}. All the releases are available
for download as source or binary. For more information,
+ Axiom ${project.version}. All the releases are available
for download as source or binary. For more information,
please see
<a href="http://www.apache.org/dev/release.html";>Apache
Release FAQ</a>
</p>
