You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2010/12/20 08:44:54 UTC

svn commit: r1051011 - in /archiva/site: ./ src/site/apt/ src/site/filtered-resources/ src/site/resources/ src/site/resources/js/ src/site/xdoc/

Author: brett
Date: Mon Dec 20 07:44:53 2010
New Revision: 1051011

URL: http://svn.apache.org/viewvc?rev=1051011&view=rev
Log:
update for new version of the site plugin, and use filtering instead for versions

Added:
    archiva/site/src/site/apt/download.apt.vm
      - copied, changed from r1050978, archiva/site/src/site/apt/download.apt
    archiva/site/src/site/apt/versions.apt.vm
      - copied, changed from r1050978, archiva/site/src/site/apt/versions.apt
    archiva/site/src/site/filtered-resources/
    archiva/site/src/site/filtered-resources/.htaccess
      - copied, changed from r1050978, archiva/site/src/site/resources/.htaccess
    archiva/site/src/site/resources/js/index.js   (with props)
    archiva/site/src/site/xdoc/index.xml.vm
      - copied, changed from r1050978, archiva/site/src/site/xdoc/index.xml
Removed:
    archiva/site/src/site/apt/download.apt
    archiva/site/src/site/apt/versions.apt
    archiva/site/src/site/resources/.htaccess
    archiva/site/src/site/xdoc/index.xml
Modified:
    archiva/site/pom.xml
    archiva/site/src/site/apt/get-involved.apt
    archiva/site/src/site/apt/known-issues.apt
    archiva/site/src/site/apt/security.apt

Modified: archiva/site/pom.xml
URL: http://svn.apache.org/viewvc/archiva/site/pom.xml?rev=1051011&r1=1051010&r2=1051011&view=diff
==============================================================================
--- archiva/site/pom.xml (original)
+++ archiva/site/pom.xml Mon Dec 20 07:44:53 2010
@@ -24,19 +24,50 @@
   <parent>
     <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-parent</artifactId>
-    <version>5</version>
+    <version>7-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <name>Archiva</name>
   <artifactId>archiva-site</artifactId>
   <packaging>pom</packaging>
   <version>1-SNAPSHOT</version>
-  <url>http://archiva.apache.org</url>
+  <url>http://archiva.apache.org/</url>
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/site</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/site</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/archiva/site</url>
   </scm>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>2.2</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/target/site</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/site/filtered-resources</directory>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
   <reporting>
     <excludeDefaults>true</excludeDefaults>
     <plugins>
@@ -71,4 +102,36 @@
       <url>${siteBaseDeployment}/</url>
     </site>
   </distributionManagement>
+  <properties>
+    <archivaReleaseVersion>1.3.3</archivaReleaseVersion>
+    <archivaReleaseDate>20 December 2010</archivaReleaseDate>
+    <supportedVersions>1.3.2</supportedVersions>
+    <unsupportedVersions>1.3.2,1.3.1,1.3,1.2.2,1.2.1,1.2,1.1.3,1.1.2,1.1.1,1.1,1.0.2,1.0.1,1.0</unsupportedVersions>
+  </properties>
+  <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>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-site-plugin</artifactId>
+              <version>3.0-beta-3</version>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+  </profiles>
+  <organization>
+    <name>The Apache Software Foundation</name>
+    <url>http://archiva.apache.org/</url>
+  </organization>
 </project>

Copied: archiva/site/src/site/apt/download.apt.vm (from r1050978, archiva/site/src/site/apt/download.apt)
URL: http://svn.apache.org/viewvc/archiva/site/src/site/apt/download.apt.vm?p2=archiva/site/src/site/apt/download.apt.vm&p1=archiva/site/src/site/apt/download.apt&r1=1050978&r2=1051011&rev=1051011&view=diff
==============================================================================
--- archiva/site/src/site/apt/download.apt (original)
+++ archiva/site/src/site/apt/download.apt.vm Mon Dec 20 07:44:53 2010
@@ -19,28 +19,28 @@ Download Archiva
 *----------------------+-----------------------------------------------------------------------------------------------------------+
 
 
-* Current Release: Archiva 1.3.2
+* Current Release: Archiva ${archivaReleaseVersion}
 
   This is the currently recommended version of Archiva.
 
-    * {{{docs/1.3.2/release-notes.html} Release Notes}}
+    * {{{./docs/${archivaReleaseVersion}/release-notes.html} Release Notes}}
 
-    * {{{known-issues.html}Known Issues and Errata}}
+    * {{{./known-issues.html}Known Issues and Errata}}
 
   []
 
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.3.2                 | Mirrors | Checksum | Signature |
+| Archiva ${archivaReleaseVersion}                 | Mirrors | Checksum | Signature |
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.3.2 Standalone        | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.3.2-bin.tar.gz} tar.gz}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.3.2-bin.tar.gz.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.3.2-bin.tar.gz.asc} asc}} |
+| Archiva ${archivaReleaseVersion} Standalone        | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-${archivaReleaseVersion}-bin.tar.gz} tar.gz}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaReleaseVersion}-bin.tar.gz.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaReleaseVersion}-bin.tar.gz.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
-|                               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.3.2-bin.zip} zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.3.2-bin.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.3.2-bin.zip.asc} asc}} |
+|                               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip} zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.3.2 WAR               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.3.2.war} war}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.3.2.war.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.3.2.war.asc} asc}} |
+| Archiva ${archivaReleaseVersion} WAR               | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-${archivaReleaseVersion}.war} war}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaReleaseVersion}.war.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaReleaseVersion}.war.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.3.2 Documentation     | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.3.2-docs.zip} docs zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.3.2-docs.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-1.3.2-docs.zip.asc} asc}} |
+| Archiva ${archivaReleaseVersion} Documentation     | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-${archivaReleaseVersion}-docs.zip} docs zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaReleaseVersion}-docs.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaReleaseVersion}-docs.zip.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
-| Archiva 1.3.2 Sources           | {{{http://www.apache.org/dyn/closer.cgi/archiva/source/apache-archiva-1.3.2-src.zip} source zip}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.3.2-src.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-1.3.2-src.zip.asc} asc}} |
+| Archiva ${archivaReleaseVersion} Sources           | {{{http://www.apache.org/dyn/closer.cgi/archiva/source/apache-archiva-${archivaReleaseVersion}-src.zip} source zip}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-${archivaReleaseVersion}-src.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-${archivaReleaseVersion}-src.zip.asc} asc}} |
 *-------------------------------+---------+----------+-----------+
 
 

Modified: archiva/site/src/site/apt/get-involved.apt
URL: http://svn.apache.org/viewvc/archiva/site/src/site/apt/get-involved.apt?rev=1051011&r1=1051010&r2=1051011&view=diff
==============================================================================
--- archiva/site/src/site/apt/get-involved.apt (original)
+++ archiva/site/src/site/apt/get-involved.apt Mon Dec 20 07:44:53 2010
@@ -17,7 +17,7 @@ Getting Involved in the Archiva Project
   There are a number of ways to find help if you have an issue. 
 
   * <<Read the documentation>>\
-  Read the {{{docs/current/userguide}user}} and {{{docs/current/adminguide}administration}}
+  Read the {{{./docs/current/userguide}user}} and {{{./docs/current/adminguide}administration}}
   documentation. 
 
   * <<Search the Wiki>>\
@@ -26,12 +26,12 @@ Getting Involved in the Archiva Project
   Lots of useful information has been contributed by users here.
 
   * <<Submit an issue>>\
-  Search the {{{issue-tracking.html}Jira}} issue tracking system. The problem
+  Search the {{{./issue-tracking.html}Jira}} issue tracking system. The problem
   you are experiencing may be a known issue and others may have suggested
   work-arounds.  If the issue is new, you should consider submitting a report.
   
   * <<Search the mailing lists>>\
-  Search the mailing lists. Look {{{mail-lists.html}here}} for a list of
+  Search the mailing lists. Look {{{./mail-lists.html}here}} for a list of
   Archiva mailing lists.  If you cannot find everything you need, ask a
   question on the appropriate list.
 
@@ -53,15 +53,15 @@ Getting Involved in the Archiva Project
   As with any open source project, there are several ways you can help:
 
   * <<Join a mailing list>>\
-    Join a {{{mail-lists.html}mailing list}} and answer other user's questions
+    Join a {{{./mail-lists.html}mailing list}} and answer other user's questions
 
   * <<Fix bugs>>\
     Report bugs, feature requests and other issues in the
-    {{{issue-tracking.html}Jira}} issue tracking system. Also, read up on 
-    {{{developers/how-we-do-things.html}how we do things}} in Archiva.
+    {{{./issue-tracking.html}Jira}} issue tracking system. Also, read up on 
+    {{{./developers/how-we-do-things.html}how we do things}} in Archiva.
 
   * <<Build it>>\
-	 Check out the {{{source-repository.html}source code}} and {{{developers/building.html}build Archiva}} for yourself.
+	 Check out the {{{./source-repository.html}source code}} and {{{./developers/building.html}build Archiva}} for yourself.
 	 Fix bugs and submit patches for reported issues (both those you find, or that others have filed).
 
   * <<Write documentation>>\

Modified: archiva/site/src/site/apt/known-issues.apt
URL: http://svn.apache.org/viewvc/archiva/site/src/site/apt/known-issues.apt?rev=1051011&r1=1051010&r2=1051011&view=diff
==============================================================================
--- archiva/site/src/site/apt/known-issues.apt (original)
+++ archiva/site/src/site/apt/known-issues.apt Mon Dec 20 07:44:53 2010
@@ -25,11 +25,5 @@
 
 Known Issues and Errata
 
-* Archiva 1.3.2
-
-** Known Issues
-
-~~ NOTE: This should link to a list of issues that has an Affects version of this release and are still Open
-
-  * For a list of all JIRA issues reported against Archiva 1.3.x, click  {{{http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+MRM+AND+(affectedVersion+%3D+%221.3.1%22+OR+affectedVersion+%3D+%221.3%22+OR+affectedVersion+%3D+%221.3.2%22+)}here}}.
+  For a list of all JIRA issues reported against released versions of Archiva, see {{{http://jira.codehaus.org/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+MRM+AND+resolution+%3D+Unresolved+and+affectedVersion+in+releasedVersions()} JIRA}}.
 

Modified: archiva/site/src/site/apt/security.apt
URL: http://svn.apache.org/viewvc/archiva/site/src/site/apt/security.apt?rev=1051011&r1=1051010&r2=1051011&view=diff
==============================================================================
--- archiva/site/src/site/apt/security.apt (original)
+++ archiva/site/src/site/apt/security.apt Mon Dec 20 07:44:53 2010
@@ -33,7 +33,7 @@ Security Vulnerabilities
   Apache Archiva doesn't check which form sends credentials. An attacker can create a specially crafted page and force
   archiva administrators to view it and change their credentials. To fix this, a referrer check was added to the security
   interceptor for all secured actions. A prompt for the administrator's password when changing a user account was also set
-  in place. This fix is available in version {{{download.html} 1.3.2}} of Apache Archiva. All users must upgrade to this
+  in place. This fix is available in version {{{./download.html} 1.3.2}} of Apache Archiva. All users must upgrade to this
   version (or higher).
 
 

Copied: archiva/site/src/site/apt/versions.apt.vm (from r1050978, archiva/site/src/site/apt/versions.apt)
URL: http://svn.apache.org/viewvc/archiva/site/src/site/apt/versions.apt.vm?p2=archiva/site/src/site/apt/versions.apt.vm&p1=archiva/site/src/site/apt/versions.apt&r1=1050978&r2=1051011&rev=1051011&view=diff
==============================================================================
--- archiva/site/src/site/apt/versions.apt (original)
+++ archiva/site/src/site/apt/versions.apt.vm Mon Dec 20 07:44:53 2010
@@ -8,48 +8,30 @@
 
 Archiva Documentation
 
-* Current Release: Archiva 1.3.2
+* Current Release: Archiva ${archivaReleaseVersion}
 
-  The current stable release of Archiva is <1.3.2>.
+  The current stable release of Archiva is <${archivaReleaseVersion}>.
 
-    * {{{docs/1.3.2/release-notes.html} Release Notes}}
+    * {{{./docs/${archivaReleaseVersion}/release-notes.html} Release Notes}}
 
-    * {{{docs/1.3.2/index.html} Documentation}}
+    * {{{./docs/${archivaReleaseVersion}/index.html} Documentation}}
 
-    * {{{ref/1.3.2/index.html} Developer Reference}}
+    * {{{./ref/${archivaReleaseVersion}/index.html} Developer Reference}}
 
 ~~ TODO: have more specific links than Documentation, and find a better link for developer reference
 
 * Previous Stable Releases
 
 *------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.3.1 | {{{docs/1.3.1/release-notes.html} Release Notes}} | {{{docs/1.3.1/learn.html} Documentation}} | {{{ref/1.3.1/index.html} Developer Reference}} |
-*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.3 | {{{docs/1.3/release-notes.html} Release Notes}} | {{{docs/1.3/learn.html} Documentation}} | {{{ref/1.3/index.html} Developer Reference}} |
-*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.2.2 | {{{docs/1.2.2/release-notes.html} Release Notes}} | {{{docs/1.2.2/learn.html} Documentation}} | {{{ref/1.2.2/index.html} Developer Reference}} |
-*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.2.1 | {{{docs/1.2.1/release-notes.html} Release Notes}} | {{{docs/1.2.1/learn.html} Documentation}} | {{{ref/1.2.1/index.html} Developer Reference}} |
-*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.2 | {{{docs/1.2/release-notes.html} Release Notes}} | {{{docs/1.2/learn.html} Documentation}} | {{{ref/1.2/index.html} Developer Reference}} |
-*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.1.3 | {{{docs/1.1.3/release-notes.html} Release Notes}} | {{{docs/1.1.3/learn.html} Documentation}} | {{{ref/1.1.3/index.html} Developer Reference}} |
-*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.1.2 | {{{docs/1.1.2/release-notes.html} Release Notes}} | {{{docs/1.1.2/learn.html} Documentation}} | {{{ref/1.1.2/index.html} Developer Reference}} |
-*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.1.1 | {{{docs/1.1.1/release-notes.html} Release Notes}} | {{{docs/1.1.1/learn.html} Documentation}} | {{{ref/1.1.1/index.html} Developer Reference}} |
-*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.1 | {{{docs/1.1/release-notes.html} Release Notes}} | {{{docs/1.1/learn.html} Documentation}} | {{{ref/1.1/index.html} Developer Reference}} |
-*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.0.2 | {{{docs/1.0.2/release-notes.html} Release Notes}} | {{{docs/1.0.2/learn.html} Documentation}} | {{{ref/1.0.2/index.html} Developer Reference}} |
-*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.0.1 | {{{docs/1.0.1/release-notes.html} Release Notes}} | {{{docs/1.0.1/learn.html} Documentation}} | {{{ref/1.0.1/index.html} Developer Reference}} |
-*------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.0 | {{{docs/1.0/release-notes.html} Release Notes}} | {{{docs/1.0/learn.html} Documentation}} | {{{ref/1.0/index.html} Developer Reference}} |
+#foreach ($v in $supportedVersions.split(","))
+| $v | {{{./docs/$v/release-notes.html} Release Notes}} | {{{./docs/$v/learn.html} Documentation}} | {{{./ref/$v/index.html} Developer Reference}} |
 *------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
+#end
 
-* Previous Preview Releases
+* Unsupported Releases
 
 *------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
-| 1.2-M1 | {{{docs/1.2-M1/release-notes.html} Release Notes}} | {{{docs/1.2-M1/learn.html} Documentation}} | {{{ref/1.2-M1/index.html} Developer Reference}} |
+#foreach ($v in $unsupportedVersions.split(","))
+| $v | {{{./docs/$v/release-notes.html} Release Notes}} | {{{./docs/$v/learn.html} Documentation}} | {{{./ref/$v/index.html} Developer Reference}} |
 *------------+-------------------------------------------------+-----------------------------------------+----------------------------------------------------+
+#end

Copied: archiva/site/src/site/filtered-resources/.htaccess (from r1050978, archiva/site/src/site/resources/.htaccess)
URL: http://svn.apache.org/viewvc/archiva/site/src/site/filtered-resources/.htaccess?p2=archiva/site/src/site/filtered-resources/.htaccess&p1=archiva/site/src/site/resources/.htaccess&r1=1050978&r2=1051011&rev=1051011&view=diff
==============================================================================
--- archiva/site/src/site/resources/.htaccess (original)
+++ archiva/site/src/site/filtered-resources/.htaccess Mon Dec 20 07:44:53 2010
@@ -1,2 +1,2 @@
-Redirect Permanent /reports http://archiva.apache.org/ref/1.3.2
-Redirect Permanent /docs/current http://archiva.apache.org/docs/1.3.2
+Redirect Permanent /reports http://archiva.apache.org/ref/${archivaReleaseVersion}
+Redirect Permanent /docs/current http://archiva.apache.org/docs/${archivaReleaseVersion}

Added: archiva/site/src/site/resources/js/index.js
URL: http://svn.apache.org/viewvc/archiva/site/src/site/resources/js/index.js?rev=1051011&view=auto
==============================================================================
--- archiva/site/src/site/resources/js/index.js (added)
+++ archiva/site/src/site/resources/js/index.js Mon Dec 20 07:44:53 2010
@@ -0,0 +1,5 @@
+            $(document).ready(function(){ $('#dialog').jqm();
+ $('#dialog').jqmAddTrigger($('span.expand:eq(0)').find('a'));
+ $('#dialog').jqmAddClose($('#dialog').find('span'));
+            }); 
+

Propchange: archiva/site/src/site/resources/js/index.js
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: archiva/site/src/site/xdoc/index.xml.vm (from r1050978, archiva/site/src/site/xdoc/index.xml)
URL: http://svn.apache.org/viewvc/archiva/site/src/site/xdoc/index.xml.vm?p2=archiva/site/src/site/xdoc/index.xml.vm&p1=archiva/site/src/site/xdoc/index.xml&r1=1050978&r2=1051011&rev=1051011&view=diff
==============================================================================
--- archiva/site/src/site/xdoc/index.xml (original)
+++ archiva/site/src/site/xdoc/index.xml.vm Mon Dec 20 07:44:53 2010
@@ -8,15 +8,7 @@
     <link rel="stylesheet" href="css/jqModal.css" type="text/css" media="screen" />
     <script src="js/jquery-1.2.6.pack.js" type="text/javascript"></script>
     <script src="js/jqModal.js" type="text/javascript"></script>
-    <script type="text/javascript">
-<![CDATA[
-            $(document).ready(function(){
- $('#dialog').jqm();
- $('#dialog').jqmAddTrigger($('span.expand:eq(0)').find('a'));
- $('#dialog').jqmAddClose($('#dialog').find('span'));
-            });
-]]>
-    </script>
+    <script type="text/javascript" src="js/index.js"></script>
 
     <style type="text/css">
       div.section {
@@ -24,69 +16,69 @@
       }
     </style>
     <div id="rhs">
-      <h4>Features</h4>
+      <span style="display: block; font-size: 13px; font-weight: bold; margin-top: 1.5em; margin-bottom: 1.5em">Features</span>
       <p>
-        <a href="docs/1.3.2/tour/project.html">
+        <a href="docs/${archivaReleaseVersion}/tour/project.html">
           <img src="images/screenshots/project.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Project Information
         </a>
       </p>
       <p>
-        <a href="docs/1.3.2/tour/search.html">
+        <a href="docs/${archivaReleaseVersion}/tour/search.html">
           <img src="images/screenshots/search.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Artifact Search
         </a>
       </p>
       <p>
-        <a href="docs/1.3.2/tour/proxy.html">
+        <a href="docs/${archivaReleaseVersion}/tour/proxy.html">
           <img src="images/screenshots/proxy.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Remote Proxying Cache
         </a>
       </p>
       <p>
-        <a href="docs/1.3.2/tour/upload.html">
+        <a href="docs/${archivaReleaseVersion}/tour/upload.html">
           <img src="images/screenshots/upload.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Artifact Upload
         </a>
       </p>
       <p>
-        <a href="docs/1.3.2/tour/admin.html">
+        <a href="docs/${archivaReleaseVersion}/tour/admin.html">
           <img src="images/screenshots/admin.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Graphical Administration
         </a>
       </p>
       <p>
-        <a href="docs/1.3.2/tour/virtual-repos.html">
+        <a href="docs/${archivaReleaseVersion}/tour/virtual-repos.html">
           <img src="images/screenshots/virtual-repos.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Repository Groups
         </a>
       </p>
       <p>
-        <a href="docs/1.3.2/tour/rss.html">
+        <a href="docs/${archivaReleaseVersion}/tour/rss.html">
           <img src="images/screenshots/rss.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           RSS Feeds
         </a>
       </p>
       <p>
-        <a href="docs/1.3.2/tour/security.html">
+        <a href="docs/${archivaReleaseVersion}/tour/security.html">
           <img src="images/screenshots/security.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Role-based Security
         </a>
       </p>
       <p>
-        <a href="docs/1.3.2/tour/reports.html">
+        <a href="docs/${archivaReleaseVersion}/tour/reports.html">
           <img src="images/screenshots/reports.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Integrity Reports
         </a>
       </p>
       <p>
-        <a href="docs/1.3.2/tour/audit-log.html">
+        <a href="docs/${archivaReleaseVersion}/tour/audit-log.html">
           <img src="images/screenshots/audit-log.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Audit Log Report
         </a>
       </p>
       <p>
-        <a href="docs/1.3.2/tour/maintenance.html">
+        <a href="docs/${archivaReleaseVersion}/tour/maintenance.html">
           <img src="images/screenshots/maintenance.png" width="150" height="93" style="border: 1px solid silver; margin-left: 0.25em; margin-bottom: 0.25em" alt="" /><br/>
           Maintenance
         </a>
@@ -118,8 +110,7 @@
           <span class="bignumber">1</span>
 
           <p>
-            <!-- TODO: use velocity and property throughout - note that we don't include beta in here -->
-            <a href="docs/1.3.2/tour/index.html">Take a look around <img src="images/arrow.png" width="16" height="16" alt="" /></a>
+            <a href="docs/${archivaReleaseVersion}/tour/index.html">Take a look around <img src="images/arrow.png" width="16" height="16" alt="" /></a>
           </p>
           <p>
             <!-- Commenting out while we still don't have a live demo  
@@ -139,9 +130,8 @@
           </p>
           <p>
             <span class="expand">
-              <!-- TODO: use velocity and property throughout -->
               <img src="images/collapsed.gif" width="7" height="7" alt="" />
-              <strong>Latest stable release</strong>: <a href="#">Archiva 1.3.2</a> - November 29, 2010
+              <strong>Latest stable release</strong>: <a href="#">Archiva ${archivaReleaseVersion}</a> - ${archivaReleaseDate}
             </span>
             <br/>
             <span class="expand">
@@ -153,7 +143,7 @@
       </div>
       <div id="dialog" class="jqmWindow">
         <span class="jqmClose">[x]</span>
-        <h2>Archiva 1.3.2</h2>
+        <h1>Archiva ${archivaReleaseVersion}</h1>
         <p>
           This is the recommended latest release of Archiva.
         </p>
@@ -166,34 +156,34 @@
               <th>Signature</th>
             </tr>
             <tr>
-              <td>Archiva 1.3.2 Standalone</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.3.2-bin.zip">zip</a></td>
-              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.3.2-bin.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.3.2-bin.zip.asc">asc</a></td>
+              <td>Archiva ${archivaReleaseVersion} Standalone</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip">zip</a></td>
+              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaReleaseVersion}-bin.zip.asc">asc</a></td>
             </tr>
             <tr>
-              <td>Archiva 1.3.2 WAR</td>
-              <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-1.3.2.war">war</a></td>
-              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.3.2.war.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-1.3.2.war.asc">asc</a></td>
+              <td>Archiva ${archivaReleaseVersion} WAR</td>
+              <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-${archivaReleaseVersion}.war">war</a></td>
+              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaReleaseVersion}.war.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaReleaseVersion}.war.asc">asc</a></td>
             </tr>
           </table> 
         </div>
-        <p><a href="docs/1.3.2/release-notes.html">Release Notes</a> | <a href="download.html">More downloads</a></p>
+        <p><a href="docs/${archivaReleaseVersion}/release-notes.html">Release Notes</a> | <a href="download.html">More downloads</a></p>
       </div>
       <div class="mainBox">
         <div>
           <span class="bignumber">3</span>
 
           <p>
-            <a href="docs/1.3.2/index.html">Documentation <img src="images/arrow.png" width="16" height="16" alt="" /></a>
+            <a href="docs/${archivaReleaseVersion}/index.html">Documentation <img src="images/arrow.png" width="16" height="16" alt="" /></a>
           </p>
           <p>
             <img src="images/collapsed.gif" width="7" height="7" alt="" />
-            Simple out of the box configuration and <a href="docs/1.3.2/quick-start.html">quick start guide</a>
+            Simple out of the box configuration and <a href="docs/${archivaReleaseVersion}/quick-start.html">quick start guide</a>
             <br/>
             <img src="images/collapsed.gif" width="7" height="7" alt="" />
-            Read the <a href="docs/1.3.2/userguide/index.html">users guide</a> and <a href="docs/1.3.2/adminguide/index.html">administration documentation</a>
+            Read the <a href="docs/${archivaReleaseVersion}/userguide/index.html">users guide</a> and <a href="docs/${archivaReleaseVersion}/adminguide/index.html">administration documentation</a>
             <br/>
             <img src="images/collapsed.gif" width="7" height="7" alt="" />
             For security issues, read the <a href="security.html">security vulnerabilities document</a>