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 2011/10/29 03:07:28 UTC
svn commit: r1190726 - in /archiva/site: pom.xml
src/site/apt/download.apt.vm src/site/apt/versions.apt.vm
src/site/resources/js/index.js src/site/xdoc/index.xml.vm
Author: brett
Date: Sat Oct 29 01:07:27 2011
New Revision: 1190726
URL: http://svn.apache.org/viewvc?rev=1190726&view=rev
Log:
differentiate preview releases from production releases
Modified:
archiva/site/pom.xml
archiva/site/src/site/apt/download.apt.vm
archiva/site/src/site/apt/versions.apt.vm
archiva/site/src/site/resources/js/index.js
archiva/site/src/site/xdoc/index.xml.vm
Modified: archiva/site/pom.xml
URL: http://svn.apache.org/viewvc/archiva/site/pom.xml?rev=1190726&r1=1190725&r2=1190726&view=diff
==============================================================================
--- archiva/site/pom.xml (original)
+++ archiva/site/pom.xml Sat Oct 29 01:07:27 2011
@@ -114,8 +114,10 @@
</site>
</distributionManagement>
<properties>
- <archivaReleaseVersion>1.4-M1</archivaReleaseVersion>
- <archivaReleaseDate>26 October 2011</archivaReleaseDate>
+ <archivaPreviewVersion>1.4-M1</archivaPreviewVersion>
+ <archivaPreviewDate>26 October 2011</archivaPreviewDate>
+ <archivaReleaseVersion>1.3.5</archivaReleaseVersion>
+ <archivaReleaseDate>17 May 2011</archivaReleaseDate>
<supportedVersions></supportedVersions>
<!-- Dropped 1.2.x support in December 2010. 1.3 - 1.3.4 unsupported due to sec. vulnerability -->
<unsupportedVersions>1.3.4,1.3.3,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>
Modified: archiva/site/src/site/apt/download.apt.vm
URL: http://svn.apache.org/viewvc/archiva/site/src/site/apt/download.apt.vm?rev=1190726&r1=1190725&r2=1190726&view=diff
==============================================================================
--- archiva/site/src/site/apt/download.apt.vm (original)
+++ archiva/site/src/site/apt/download.apt.vm Sat Oct 29 01:07:27 2011
@@ -44,6 +44,33 @@ Download Archiva
*-------------------------------+---------+----------+-----------+
+#if ($archivaPreviewVersion)
+* Preview Release: Archiva ${archivaPreviewVersion}
+
+ This is a preview release of the next version of Archiva.
+
+ * {{{./docs/${archivaPreviewVersion}/release-notes.html} Release Notes}}
+
+ * {{{./known-issues.html}Known Issues and Errata}}
+
+ []
+
+*-------------------------------+---------+----------+-----------+
+| Archiva ${archivaPreviewVersion} | Mirrors | Checksum | Signature |
+*-------------------------------+---------+----------+-----------+
+| Archiva ${archivaPreviewVersion} Standalone | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-${archivaPreviewVersion}-bin.tar.gz} tar.gz}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaPreviewVersion}-bin.tar.gz.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaPreviewVersion}-bin.tar.gz.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+| | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-${archivaPreviewVersion}-bin.zip} zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaPreviewVersion}-bin.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaPreviewVersion}-bin.zip.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+| Archiva ${archivaPreviewVersion} WAR | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-${archivaPreviewVersion}.war} war}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaPreviewVersion}.war.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaPreviewVersion}.war.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+| Archiva ${archivaPreviewVersion} Documentation | {{{http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-${archivaPreviewVersion}-docs.zip} docs zip}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaPreviewVersion}-docs.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaPreviewVersion}-docs.zip.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+| Archiva ${archivaPreviewVersion} Sources | {{{http://www.apache.org/dyn/closer.cgi/archiva/source/apache-archiva-${archivaPreviewVersion}-src.zip} source zip}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-${archivaPreviewVersion}-src.zip.md5} md5}} | {{{http://www.apache.org/dist/archiva/source/apache-archiva-${archivaPreviewVersion}-src.zip.asc} asc}} |
+*-------------------------------+---------+----------+-----------+
+#end
+
+
* Previous Versions
More releases are available in the {{{http://archive.apache.org/dist/archiva/binaries/} Apache Archiva Archives}}
Modified: archiva/site/src/site/apt/versions.apt.vm
URL: http://svn.apache.org/viewvc/archiva/site/src/site/apt/versions.apt.vm?rev=1190726&r1=1190725&r2=1190726&view=diff
==============================================================================
--- archiva/site/src/site/apt/versions.apt.vm (original)
+++ archiva/site/src/site/apt/versions.apt.vm Sat Oct 29 01:07:27 2011
@@ -20,6 +20,20 @@ Archiva Documentation
~~ TODO: have more specific links than Documentation, and find a better link for developer reference
+#if ($archivaPreviewVersion)
+* Preview Release: Archiva ${archivaPreviewVersion}
+
+ The current stable release of Archiva is <${archivaPreviewVersion}>.
+
+ * {{{./docs/${archivaPreviewVersion}/release-notes.html} Release Notes}}
+
+ * {{{./docs/${archivaPreviewVersion}/index.html} Documentation}}
+
+ * {{{./ref/${archivaPreviewVersion}/index.html} Developer Reference}}
+
+~~ TODO: have more specific links than Documentation, and find a better link for developer reference
+#end
+
#if (!$supportedVersions.isEmpty())
* Previous Stable Releases
Modified: archiva/site/src/site/resources/js/index.js
URL: http://svn.apache.org/viewvc/archiva/site/src/site/resources/js/index.js?rev=1190726&r1=1190725&r2=1190726&view=diff
==============================================================================
--- archiva/site/src/site/resources/js/index.js (original)
+++ archiva/site/src/site/resources/js/index.js Sat Oct 29 01:07:27 2011
@@ -2,20 +2,23 @@ $(document).ready(function(){
$('#dialog').jqm();
$('#dialog').jqmAddTrigger($('span.expand:eq(0)').find('a'));
$('#dialog').jqmAddClose($('#dialog').find('span'));
- $("a#single_image").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic',
- 'speedIn' : 600,
- 'speedOut' : 200,
- 'overlayShow' : true
- });
- $("a.gallery_image").fancybox({
- 'transitionIn' : 'elastic',
- 'transitionOut' : 'elastic',
- 'speedIn' : 600,
- 'speedOut' : 200,
- 'overlayShow' : true,
- 'titlePosition': 'inside'
- });
+ $('#dialogPreview').jqm();
+ $('#dialogPreview').jqmAddTrigger($('span.expand:eq(1)').find('a'));
+ $('#dialogPreview').jqmAddClose($('#dialogPreview').find('span'));
+ $("a#single_image").fancybox({
+ 'transitionIn' : 'elastic',
+ 'transitionOut' : 'elastic',
+ 'speedIn' : 600,
+ 'speedOut' : 200,
+ 'overlayShow' : true
+ });
+ $("a.gallery_image").fancybox({
+ 'transitionIn' : 'elastic',
+ 'transitionOut' : 'elastic',
+ 'speedIn' : 600,
+ 'speedOut' : 200,
+ 'overlayShow' : true,
+ 'titlePosition': 'inside'
+ });
});
Modified: archiva/site/src/site/xdoc/index.xml.vm
URL: http://svn.apache.org/viewvc/archiva/site/src/site/xdoc/index.xml.vm?rev=1190726&r1=1190725&r2=1190726&view=diff
==============================================================================
--- archiva/site/src/site/xdoc/index.xml.vm (original)
+++ archiva/site/src/site/xdoc/index.xml.vm Sat Oct 29 01:07:27 2011
@@ -138,6 +138,13 @@
<strong>Latest stable release</strong>: <a href="#">Archiva ${archivaReleaseVersion}</a> - ${archivaReleaseDate}
</span>
<br/>
+#if ($archivaPreviewVersion)
+ <span class="expand">
+ <img src="images/collapsed.gif" width="7" height="7" alt="" />
+ <strong>Latest preview release</strong>: <a href="#">Archiva ${archivaPreviewVersion}</a> - ${archivaPreviewDate}
+ </span>
+ <br/>
+#end
<span class="expand">
<img src="images/collapsed.gif" width="7" height="7" alt="" />
<a href="download.html"><strong>All downloads</strong></a>
@@ -175,6 +182,38 @@
</div>
<p><a href="docs/${archivaReleaseVersion}/release-notes.html">Release Notes</a> | <a href="download.html">More downloads</a></p>
</div>
+#if ($archivaPreviewVersion)
+ <div id="dialogPreview" class="jqmWindow">
+ <span class="jqmClose">[x]</span>
+ <h1>Archiva ${archivaPreviewVersion}</h1>
+ <p>
+ This is a preview of the next release of Archiva.
+ </p>
+ <div class="linkBox">
+ <table>
+ <tr>
+ <th> </th>
+ <th>Mirrors</th>
+ <th>Checksum</th>
+ <th>Signature</th>
+ </tr>
+ <tr>
+ <td>Archiva ${archivaPreviewVersion} Standalone</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-${archivaPreviewVersion}-bin.zip">zip</a></td>
+ <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaPreviewVersion}-bin.zip.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaPreviewVersion}-bin.zip.asc">asc</a></td>
+ </tr>
+ <tr>
+ <td>Archiva ${archivaPreviewVersion} WAR</td>
+ <td><a href="http://www.apache.org/dyn/closer.cgi/archiva/binaries/apache-archiva-${archivaPreviewVersion}.war">war</a></td>
+ <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaPreviewVersion}.war.md5">md5</a></td>
+ <td><a href="http://www.apache.org/dist/archiva/binaries/apache-archiva-${archivaPreviewVersion}.war.asc">asc</a></td>
+ </tr>
+ </table>
+ </div>
+ <p><a href="docs/${archivaPreviewVersion}/release-notes.html">Release Notes</a> | <a href="download.html">More downloads</a></p>
+ </div>
+#end
<div class="mainBox">
<div>
<span class="bignumber">3</span>