You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2012/12/16 00:09:18 UTC
svn commit: r1422404 - in /felix/site/trunk: content/downloads.cgi
content/downloads.list lib/view.pm templates/downloads.html
Author: fmeschbe
Date: Sat Dec 15 23:09:17 2012
New Revision: 1422404
URL: http://svn.apache.org/viewvc?rev=1422404&view=rev
Log:
FELIX-3816 Convert downloads page to artifact list
Added:
felix/site/trunk/content/downloads.cgi (with props)
felix/site/trunk/content/downloads.list
Modified:
felix/site/trunk/lib/view.pm
felix/site/trunk/templates/downloads.html
Added: felix/site/trunk/content/downloads.cgi
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/downloads.cgi?rev=1422404&view=auto
==============================================================================
--- felix/site/trunk/content/downloads.cgi (added)
+++ felix/site/trunk/content/downloads.cgi Sat Dec 15 23:09:17 2012
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Wrapper script around mirrors.cgi script
+# (we must change to that directory in order for python to pick up the
+# python includes correctly)
+cd /www/www.apache.org/dyn/mirrors
+/www/www.apache.org/dyn/mirrors/mirrors.cgi $*
Propchange: felix/site/trunk/content/downloads.cgi
------------------------------------------------------------------------------
svn:executable = *
Added: felix/site/trunk/content/downloads.list
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/downloads.list?rev=1422404&view=auto
==============================================================================
--- felix/site/trunk/content/downloads.list (added)
+++ felix/site/trunk/content/downloads.list Sat Dec 15 23:09:17 2012
@@ -0,0 +1,104 @@
+#
+# List of Sling downloads
+# This file is processed by the downloads template and view
+# lines starting with a hash sign and empty lines are ignored
+
+#
+# This file contains three parts:
+# (1) version number of the Felix Framework Distribution
+# (2) Subprojects
+# (3) Maven Plugins
+# (4) Ant Tasks
+
+#
+# (1) Felix Framework Distribution version
+framework|4.0.3
+
+#
+# (2) Subprojects
+# This list is sorted by the title before writing the table
+# Format: title|artifactId|version[|source-classifier[|classifier]]
+AutoConf Resource Processor|org.apache.felix.deployment.rp.autoconf|0.1.0|project
+Bundle Repository|org.apache.felix.bundlerepository|1.6.6
+Configuration Admin|org.apache.felix.configadmin|1.6.0
+Dependency Manager Annotation|org.apache.felix.dependencymanager.annotation|3.0.0|project
+Dependency Manager Compat|org.apache.felix.dependencymanager.compat|3.0.0|project
+Dependency Manager Runtime|org.apache.felix.dependencymanager.runtime|3.0.0|project
+Dependency Manager Shell|org.apache.felix.dependencymanager.shell|3.0.0|project
+Deployment Admin|org.apache.felix.deploymentadmin|0.9.0|project
+Event Admin|org.apache.felix.eventadmin|1.3.0
+File Install|org.apache.felix.fileinstall|3.2.4
+Framework|org.apache.felix.framework|4.0.3
+Framework Security|org.apache.felix.framework.security|2.0.1
+Gogo Runtime|org.apache.felix.gogo.runtime|0.10.0|project
+Gogo Shell|org.apache.felix.gogo.shell|0.10.0|project
+Gogo Command|org.apache.felix.gogo.command|0.12.0|project
+HTTP Service API|org.apache.felix.http.api|2.2.0|project
+HTTP Service Base|org.apache.felix.http.base|2.2.0|project
+HTTP Service Bridge|org.apache.felix.http.bridge|2.2.0|project
+HTTP Service Bundle|org.apache.felix.http.bundle|2.2.0|project
+HTTP Service Jetty|org.apache.felix.http.jetty|2.2.0|project
+HTTP Service Proxy|org.apache.felix.http.proxy|2.2.0|project
+HTTP Service Whiteboard|org.apache.felix.http.whiteboard|2.2.0|project
+iPOJO|org.apache.felix.ipojo|1.8.4|project
+iPOJO Architecture Command for the Felix Shell|org.apache.felix.ipojo.arch|1.6.0|project
+iPOJO Architecture Command for Gogo|org.apache.felix.ipojo.arch.gogo|1.0.1|project
+iPOJO Composite|org.apache.felix.ipojo.composite|1.8.4|project
+iPOJO Annotations|org.apache.felix.ipojo.annotations|1.8.4|project
+iPOJO Ant Task|org.apache.felix.ipojo.ant|1.8.6|project
+iPOJO BND Plugin|bnd-ipojo-plugin|1.8.6|project
+iPOJO WebConsole Plugin|org.apache.felix.ipojo.webconsole|1.6.0|project
+iPOJO API|org.apache.felix.ipojo.api|1.6.0|project
+iPOJO Manipulator|org.apache.felix.ipojo.manipulator|1.8.6|project
+iPOJO Whiteboard pattern handler|org.apache.felix.ipojo.handler.whiteboard|1.6.0|project
+iPOJO Extender pattern handler|org.apache.felix.ipojo.handler.extender|1.4.0|project
+iPOJO JMX handler|org.apache.felix.ipojo.handler.jmx|1.4.0|project
+iPOJO Event Admin handler|org.apache.felix.ipojo.handler.eventadmin|1.8.0|project
+iPOJO Temporal Dependency handler|org.apache.felix.ipojo.handler.temporal|1.6.0|project
+junit4osgi|org.apache.felix.ipojo.junit4osgi|1.0.0|project
+junit4osgi - shell command|org.apache.felix.ipojo.junit4osgi.felix-command|1.0.0|project
+junit4osgi - swing gui|org.apache.felix.ipojo.junit4osgi.swing-gui|1.0.0|project
+Lightweight HTTP Service Core|org.apache.felix.httplite.core|0.1.4|project
+Lightweight HTTP Service Complete|org.apache.felix.httplite.complete|0.1.4|project
+Log|org.apache.felix.log|1.0.1|project
+Main|org.apache.felix.main|4.0.3|project
+Metatype|org.apache.felix.metatype|1.0.6
+OSGi OBR service API|org.osgi.service.obr|1.0.2|project
+Preferences|org.apache.felix.prefs|1.0.4|project
+Remote Shell|org.apache.felix.shell.remote|1.1.2|project
+SCR (Declarative Services)|org.apache.felix.scr|1.6.2
+SCR Annotations|org.apache.felix.scr.annotations|1.7.0|project
+SCR DS Annotations|org.apache.felix.scr.ds-annotations|1.2.0|project
+SCR Generator|org.apache.felix.scr.generator|1.3.0|project
+Shell|org.apache.felix.shell|1.4.3|project
+Shell Text UI|org.apache.felix.shell.tui|1.4.1|project
+UPnP Base Driver (JDK 1.4+)|org.apache.felix.upnp.basedriver|0.8.0|project
+UPnP Base Driver (JDK 1.3)|org.apache.felix.upnp.basedriver|0.8.0|project|jdk13
+UPnP Extra|org.apache.felix.upnp.extra|0.4.0|project
+UPnP Tester|org.apache.felix.upnp.tester|0.4.0|project
+User Admin|org.apache.felix.useradmin|1.0.3|project
+User Admin File-based store|org.apache.felix.useradmin.filestore|1.0.2|project
+User Admin MongoDB-based store|org.apache.felix.useradmin.mongodb|1.0.1|project
+Utils|org.apache.felix.utils|1.2.0
+Web Console|org.apache.felix.webconsole|4.0.0
+Web Console DS Plugin|org.apache.felix.webconsole.plugins.ds|1.0.0
+Web Console Event Admin Plugin|org.apache.felix.webconsole.plugins.event|1.0.2|project
+Web Console Memory Usage Plugin|org.apache.felix.webconsole.plugins.memoryusage|1.0.4
+Web Console OBR Plugin|org.apache.felix.webconsole.plugins.obr|1.0.0
+Web Console PackageAdmin Plugin|org.apache.felix.webconsole.plugins.packageadmin|1.0.0
+Web Console UPNP Plugin|org.apache.felix.webconsole.plugins.upnp|1.0.2
+Web Console ServiceDiagnostics Plugin|org.apache.felix.servicediagnostics.plugin|0.1.1
+
+# (3) Maven Plugins
+# This list is sorted by the title before writing the table
+# Format: title|artifactId|version[|classifier[|extension]]
+Maven Bundle Plugin|maven-bundle-plugin|2.3.7
+Maven iPOJO Plugin|maven-ipojo-plugin|1.8.4
+Maven junit4osgi Plugin|maven-junit4osgi-plugin|1.0.0
+Maven OBR Plugin|maven-obr-plugin|1.2.0
+Maven SCR Plugin|maven-scr-plugin|1.9.0
+
+# (3) Ant Tasks
+# This list is sorted by the title before writing the table
+# Format: title|artifactId|version[|classifier[|extension]]
+SCR Ant Task|org.apache.felix.scr.ant|1.3.0
Modified: felix/site/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/felix/site/trunk/lib/view.pm?rev=1422404&r1=1422403&r2=1422404&view=diff
==============================================================================
--- felix/site/trunk/lib/view.pm (original)
+++ felix/site/trunk/lib/view.pm Sat Dec 15 23:09:17 2012
@@ -104,47 +104,52 @@ sub downloads {
read_text_file $file, \%args;
+ my $framework = "| Artifact | Version | Binary |\n|-|-|-|\n";
my $result = "|Artifact | Version | Binary | Source|\n|--|--|--|--|\n";
my $maven = "|Artifact | Version | Binary | Source|\n|--|--|--|--|\n";
- my $launchpad = "| Artifact | Version | Provides | Package |\n|-|-|-|-|\n";
+ my $ant = "|Artifact | Version | Binary | Source|\n|--|--|--|--|\n";
my @lines = split( /\n/, $args{content} );
@lines = sort @lines;
for my $line (@lines) {
next if (!$line || $line =~ /^\s*#/);
- my ($title, $artifact, $version, $classifier, $ext) = split(/\|/, $line);
- $ext = "jar" unless ($ext);
- $classifier = ($classifier) ? "-$classifier" : "";
+ my ($title, $artifact, $version, $srcClassifier, $classifier) = split(/\|/, $line);
+ $srcClassifier = "source-release" unless ($srcClassifier);
+ $classifier = ($classifier) ? "-$classifier" : "";
- if ($title eq "sling") {
+ if ($title eq "framework") {
- $launchpad .="| Sling Standalone Application | $artifact | A self-runnable Sling jar. | " . downloadLink("org.apache.sling.launchpad-$artifact-standalone.jar"). "|\n";
- $launchpad .="| Sling Web Application | $artifact | A ready-to run Sling webapp as a war file. | " . downloadLink("org.apache.sling.launchpad-$artifact.war"). "|\n";
- $launchpad .="| Sling Source Package | $artifact | The released Sling source code. | " . downloadLink("sling-$artifact-source-release.tar.gz")."<br/>" . downloadLink("sling-$artifact-source-release.zip")." |\n";
+ # $artifact is actually the version
+ $framework .= "| Felix Framework Distribution | $artifact | "
+ . downloadLink("org.apache.felix.main.distribution-$artifact.tar.gz", "tar.gz")
+ . " "
+ . downloadLink("org.apache.felix.main.distribution-$artifact.zip", "zip")
+ . " |\n";
} else {
my $target = \$result;
- my $artifactLabel;
- if ($ext eq "war") {
- $artifactLabel = "Web Application";
- } elsif ($classifier eq "-app") {
- $artifactLabel = "Java Application";
- } elsif ($artifact =~/^maven-/) {
+ if ($artifact =~ /^maven-/) {
$target = \$maven;
- $artifactLabel = "Maven Plugin";
- } else {
- $artifactLabel = "Bundle";
+ } elsif ($artifact =~ /ant/) {
+ $target = \$ant;
}
- ${$target} .= "|$title|$version|" . downloadLink("$artifact-$version$classifier.$ext", $artifactLabel) . " | " . downloadLink("$artifact-$version-source-release.zip", "Source ZIP") . "|\n";
+ ${$target} .= "|$title|$version|"
+ . downloadLink("$artifact-$version$classifier.jar", "jar")
+ . " | "
+ . downloadLink("$artifact-$version-$srcClassifier.tar.gz", "tar.gz")
+ . " "
+ . downloadLink("$artifact-$version-$srcClassifier.zip", "zip")
+ . "|\n";
}
}
- $args{launchpad} = $launchpad;
+ $args{framework} = $framework;
$args{content} = $result;
$args{maven} = $maven;
+ $args{ant} = $ant;
return Dotiac::DTL::Template($template)->render(\%args), html => \%args;
}
@@ -339,7 +344,7 @@ sub downloadLink {
my ($artifact, $label) = @_;
my $dp = "http://www.apache.org/dist";
$label = $artifact unless ($label);
- return "[$label]([preferred]/sling/$artifact) ([asc]($dp/sling/$artifact.asc), [md5]($dp/sling/$artifact.md5))";
+ return "[$label]([preferred]/felix/$artifact) ([asc]($dp/felix/$artifact.asc), [md5]($dp/felix/$artifact.md5))";
}
sub breadcrumbs {
Modified: felix/site/trunk/templates/downloads.html
URL: http://svn.apache.org/viewvc/felix/site/trunk/templates/downloads.html?rev=1422404&r1=1422403&r2=1422404&view=diff
==============================================================================
--- felix/site/trunk/templates/downloads.html (original)
+++ felix/site/trunk/templates/downloads.html Sat Dec 15 23:09:17 2012
@@ -2,28 +2,29 @@
{% block title %}Downloads{% endblock %}
{% block content %}
<p>
-To get the latest development release of Apache Sling, you can check out
-the <a href="/project-information.html#source-repository">Source Code</a>
-and <a href="/documentation/development/getting-and-building-sling.html">Getting and Building Sling</a>
+To get the latest development release of Apache Felix, you can check out
+the <a href="/documentation/development/source-code.html" title="Source Code">sources</a> and
+<a href="/documentation/development/building-felix.html" title="Building Felix">build Felix</a>
yourself. Otherwise, the releases below are available for download. To
install, just download and extract. These
-<a href="http://www.apache.org/dist/sling/KEYS">KEYS</a> can be used to verify the
-release archive.
+<a href="http://www.apache.org/dist/felix/KEYS" class="external-link" rel="nofollow">KEYS</a>
+can be used to verify the release archive.
</p>
<p>
-All Apache Sling products are distributed under the terms of The Apache
+All Apache Felix products are distributed under the terms of The Apache
Software License (version 2.0). See our
-<a href="/project-information/project-license.html">license</a>, or the LICENSE file included
-in each distribution.
+<a href="license.html" title="license">license page</a>, or the LICENSE
+file included in each distribution.
</p>
<div class="toc">
<ul>
<li><a href="#mirrors">Mirrors</a></li>
-<li><a href="#application">Sling Application</a></li>
-<li><a href="#components">Sling Components</a></li>
+<li><a href="#framework">Felix Framework Distribution</a></li>
+<li><a href="#subprojects">Subprojects</a></li>
<li><a href="#maven">Maven Plugins</a></li>
+<li><a href="#ant">Ant Tasks</a></li>
</ul>
</div>
@@ -31,7 +32,7 @@ in each distribution.
<p>
Use the links below to download binary or source distributions of Apache
-Sling from one of our mirrors.
+Felix from one of our mirrors.
</p>
<p>
@@ -58,27 +59,21 @@ please reload this page by <a href="/dow
<input type="submit" value="Change"></input>
</form>
-<h2 id="application">Sling Application</h2>
+<h2 id="framework">Felix Framework Distribution</h2>
+{{ framework|markdown }}
-{{ launchpad|markdown }}
-
-<p>
-If you want to experiment with bleeding edge code,
-<a href="/documentation/development/getting-and-building-sling.html">building Sling yourself</a>
-is not that hard.
-</p>
-
-<p>
-If you are looking for previous releases of Apache Sling, have a look in
-the <a href="http://archive.apache.org/dist/sling/">archives</a>. For previous
-incubator releases of Apache Sling, have a look in the
-<a href="http://archive.apache.org/dist/incubator/sling/">Incubator archives</a>.
-</p>
-
-<h2 id="components">Sling Components</h2>
+<h2 id="subprojects">Subprojects</h2>
{{ content|markdown }}
<h2 id="maven">Maven Plugins</h2>
{{ maven|markdown }}
+<h2 id="ant">Ant Tasks</h2>
+{{ ant|markdown }}
+
+<p>
+If you are looking for previous releases of Apache Felix, have a look in
+the <a href="http://archive.apache.org/dist/felix/">archives</a>.
+</p>
+
{% endblock %}