Improving site generation
diff --git a/pom.xml b/pom.xml
index 263fd5b..2d9f9dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,6 @@
<version>2.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Archiva Redback Components</name>
- <url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
<properties>
<commons-configuration.version>1.10</commons-configuration.version>
@@ -42,6 +41,10 @@
<springVersion>4.1.4.RELEASE</springVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <siteUrl>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/components</siteUrl>
+ <webUrl>http://archiva.apache.org/redback/components</webUrl>
+
+
</properties>
<description>Parent Pom for various components used in Redback, Apache Archiva and Apache Continuum.</description>
@@ -53,14 +56,6 @@
</scm>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/components/${project.artifactId}</url>
- </site>
- </distributionManagement>
-
-
<repositories>
<repository>
<id>archiva-repository.releases</id>
@@ -256,6 +251,23 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <topSiteURL>${siteUrl}</topSiteURL>
+ <relativizeDecorationLinks>false</relativizeDecorationLinks>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -277,32 +289,6 @@
<profiles>
<profile>
- <id>maven-3</id>
- <activation>
- <file>
- <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
- <exists>${basedir}</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>release</id>
<build>
<plugins>
diff --git a/src/site/site.xml b/src/site/site.xml
index 1543e0b..c4201e5 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -22,7 +22,7 @@
<bannerLeft>
<name>Apache Archiva</name>
- <src>http://archiva.apache.org/redback/images/redback.jpg</src>
+ <src>http://archiva.apache.org/images/archiva.png</src>
<!-- have to add the index.html to get the right location, due to bug in Doxia. Still not correct for subdirectories though -->
<href>http://archiva.apache.org/index.html</href>
</bannerLeft>
@@ -31,7 +31,6 @@
<src>http://www.apache.org/images/asf_logo_wide.png</src>
<href>http://www.apache.org/</href>
</bannerRight>
- <googleAnalyticsAccountId>UA-140879-5</googleAnalyticsAccountId>
<custom>
<fluidoSkin>
@@ -41,30 +40,28 @@
<googleSearch>
<sitesearch>http://archiva.apache.org/redback/components</sitesearch>
</googleSearch>
- <twitter>
- <user>archiva</user>
- <showUser>true</showUser>
- <showFollowers>false</showFollowers>
- </twitter>
<ohloh>
- <projectId>8659</projectId>
- <widget>stats</widget>
+ <projectId>6670</projectId>
+ <widget>thin-badge</widget>
</ohloh>
+ <gitHub>
+ <projectId>apache/archiva</projectId>
+ <ribbonOrientation>right</ribbonOrientation>
+ <ribbonColor>gray</ribbonColor>
+ </gitHub>
+
</fluidoSkin>
</custom>
-
- <publishDate format="yyyy-MM-dd" position="left" />
- <version position="left" />
+
+ <version position="right" />
<body>
- <links>
- <item name="Archiva" href="http://archiva.apache.org"/>
- </links>
-
+ <breadcrumbs>
+ <item name="Archiva" href="http://archiva.apache.org/index.html" />
+ </breadcrumbs>
<menu ref="modules" />
<menu ref="reports" />
-
<menu name="ASF" inherit="bottom">
<item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works.html"/>
<item name="Foundation" href="http://www.apache.org/foundation/"/>