Author: jakob
Date: Mon Nov 25 08:45:22 2013
New Revision: 1545174
URL: http://svn.apache.org/r1545174
Log:
Updated download-paths for the releases
Modified:
marmotta/site/trunk/content/markdown/download.md.vm
Modified: marmotta/site/trunk/content/markdown/download.md.vm
URL:
http://svn.apache.org/viewvc/marmotta/site/trunk/content/markdown/download.md.vm?rev=1545174&r1=1545173&r2=1545174&view=diff
==============================================================================
--- marmotta/site/trunk/content/markdown/download.md.vm (original)
+++ marmotta/site/trunk/content/markdown/download.md.vm Mon Nov 25 08:45:22 2013
@@ -1,25 +1,33 @@
##
## Add further releases here:
-## 'version':['release-date','jira-versionid'],
+## 'version':['release-date','jira-versionid',isArchived],
#set( $releases = {
- '3.1.0-incubating':['2013-10-03','12324026'],
- '3.0.0-incubating':['2013-04-26','12323952']
+ '3.1.0-incubating':['2013-10-03','12324026',false],
+ '3.0.0-incubating':['2013-04-26','12323952',false]
})
##
#set($jira_pid = '12314321')
-#set($dyn = 'http://www.apache.org/dyn/closer.cgi/incubator')
-#set($www = 'http://www.apache.org/dist/incubator')
+#set($dyn = 'http://www.apache.org/dyn/closer.cgi')
+#set($www = 'http://www.apache.org/dist')
+#set($arch = 'http://archive.apache.org/dist')
#set($dh='##')
##
#macro(link $prefix $version $qualifier $ext $linkText)
[${linkText}]($prefix/marmotta/${version}/apache-marmotta-${version}-${qualifier}.${ext})##
#end
-#macro(package $version $qualifier $ext $linkText)
+#macro(package $version $qualifier $ext $linkText, $a)
+#if( $a )
+#link($arch, $version, $qualifier, $ext, $linkText)
+ (#link($arch, $version, $qualifier, "${ext}.asc", 'pgp'),
+ #link($arch, $version, $qualifier, "${ext}.sha1", 'sha1'),
+ #link($arch, $version, $qualifier, "${ext}.md5", 'md5'))
+#else
#link($dyn, $version, $qualifier, $ext, $linkText)
(#link($www, $version, $qualifier, "${ext}.asc", 'pgp'),
#link($www, $version, $qualifier, "${ext}.sha1", 'sha1'),
#link($www, $version, $qualifier, "${ext}.md5", 'md5'))
#end
+#end
#macro(toc $version $dString)
* [$version](#a$version) ($dString)
#end
@@ -28,29 +36,54 @@
#set($vid = $info.get(1))
#set($d = $date.toDate('yyyy-MM-dd', $dString))
-$dh $version
+$dh# $version
**Apache Marmotta ${version}** has been published on $date.format('MMM dd,
yyyy', $d) and is available for
download in the [ASF Distribution
Directory](http://www.apache.org/dyn/closer.cgi/incubator/marmotta/${version}/).
Before installing or using the files check the signatures using the following
[KEYS](${www}/marmotta/${version}/KEYS) file.
* Source
- * #package( $version 'source' 'zip' 'ZIP')
- * #package( $version 'source' 'tar.gz' 'TGZ')
+ * #package( $version 'source' 'zip' 'ZIP', false)
+ * #package( $version 'source' 'tar.gz' 'TGZ', false)
* WAR
- * #package( $version 'webapp' 'zip' 'ZIP')
- * #package( $version 'webapp' 'tar.gz' 'TGZ')
+ * #package( $version 'webapp' 'zip' 'ZIP', false)
+ * #package( $version 'webapp' 'tar.gz' 'TGZ', false)
* Installer
- * #package( $version 'installer' 'zip' 'ZIP')
- * #package( $version 'installer' 'tar.gz' 'TGZ')
+ * #package( $version 'installer' 'zip' 'ZIP', false)
+ * #package( $version 'installer' 'tar.gz' 'TGZ', false)
* LDPath
- * #package( $version 'ldpath' 'zip' 'ZIP')
- * #package( $version 'ldpath' 'tar.gz' 'TGZ')
+ * #package( $version 'ldpath' 'zip' 'ZIP', false)
+ * #package( $version 'ldpath' 'tar.gz' 'TGZ', false)
The
[Changelog](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=${jira_pid}&version=${vid}&styleName=Text)
is available from the [AFS
Jira](https://issues.apache.org/jira/browse/MARMOTTA).
#end
+##
+#macro(archive $version $info)
+#set($dString = $info.get(0))
+#set($vid = $info.get(1))
+#set($d = $date.toDate('yyyy-MM-dd', $dString))
+
+$dh# $version
+
+The
[Changelog](https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=${jira_pid}&version=${vid}&styleName=Text)
+is available from the [AFS
Jira](https://issues.apache.org/jira/browse/MARMOTTA).
+
+ * Source:
+ #package( $version 'source' 'zip' 'ZIP', true) /
+ #package( $version 'source' 'tar.gz' 'TGZ', true)
+ * WAR:
+ #package( $version 'webapp' 'zip' 'ZIP', true) /
+ #package( $version 'webapp' 'tar.gz' 'TGZ', true)
+ * Installer:
+ #package( $version 'installer' 'zip' 'ZIP', true) /
+ #package( $version 'installer' 'tar.gz' 'TGZ', true)
+ * LDPath:
+ #package( $version 'ldpath' 'zip' 'ZIP', true) /
+ #package( $version 'ldpath' 'tar.gz' 'TGZ', true)
+
+#end
<head>
<title>Download</title> <!-- awaiting for
https://jira.codehaus.org/browse/DOXIA-472 -->
<meta name="keywords" content="Download, Source, Installer, War, LDPath,
zip, tar.gz, tgz, Apache Marmotta, Distribution, Release" />
@@ -61,10 +94,19 @@ Besides getting Apache Marmotta from the
from here you can get any of the versions already published:
#foreach( $release in $sorter.sort($releases.entrySet(), "key:desc") )
- #toc( $release.key, $release.value.get(0) )
+#if( $release.value.get(2) == false )#toc( $release.key, $release.value.get(0)
)#end
+#end
+## * [Archive](#Archive)
+
+#foreach( $release in $sorter.sort($releases.entrySet(), "key:desc") )
+#if( $release.value.get(2) == false )#section( $release.key, $release.value
)#end
#end
+##$dh Archive
+
+##Here follows a list of older versions:
+
#foreach( $release in $sorter.sort($releases.entrySet(), "key:desc") )
- #section( $release.key, $release.value )
+#if( $release.value.get(2) == true )#archive( $release.key, $release.value
)#end
#end
