Author: fmeschbe
Date: Fri Jun 14 14:11:03 2013
New Revision: 1493079
URL: http://svn.apache.org/r1493079
Log:
Add links to the changelog.txt files (where identifiable and existing)
Modified:
felix/site/trunk/content/downloads.list
felix/site/trunk/lib/view.pm
Modified: felix/site/trunk/content/downloads.list
URL:
http://svn.apache.org/viewvc/felix/site/trunk/content/downloads.list?rev=1493079&r1=1493078&r2=1493079&view=diff
==============================================================================
--- felix/site/trunk/content/downloads.list (original)
+++ felix/site/trunk/content/downloads.list Fri Jun 14 14:11:03 2013
@@ -17,91 +17,103 @@ framework|4.2.1
#
# (2) Subprojects
# This list is sorted by the title before writing the table
-# Format: title|artifactId|version[|source-classifier[|classifier]]
+# Format: title|artifactId|version[|source-classifier[|classifier][|changelog]]
+#
+# - title: (required) user friendly module title
+# - artifactId: (required) bundle file base name (Maven artifactId)
+# - version: (required) module version
+# - source-classifier: (optional) Maven classifier for source release archive
+# default: source-release
+# for pre-Felix parent POM 2.1 releases use: project
+# - classifier: (optional) Non-Source Maven classifier (default: none)
+# - changelog: (optional) path to the change log file relative to the
+# bundle's release tag folder in SVN (default: changelog.txt)
+# Use - to not have a changelog link
+#
AutoConf Resource
Processor|org.apache.felix.deployment.rp.autoconf|0.1.4|project
-Bundle Repository|org.apache.felix.bundlerepository|1.6.6
+Bundle Repository|org.apache.felix.bundlerepository|1.6.6|||doc/changelog.txt
Configuration Admin|org.apache.felix.configadmin|1.6.0
-Dependency Manager|org.apache.felix.dependencymanager|3.1.0|project
-Dependency Manager
Annotation|org.apache.felix.dependencymanager.annotation|3.1.0|project
+Dependency Manager |org.apache.felix.dependencymanager|3.1.0|project
+Dependency Manager
Annotation|org.apache.felix.dependencymanager.annotation|3.1.0|project||doc/changelog.txt
Dependency Manager
Compat|org.apache.felix.dependencymanager.compat|3.0.1|project
-Dependency Manager
Runtime|org.apache.felix.dependencymanager.runtime|3.1.0|project
+Dependency Manager
Runtime|org.apache.felix.dependencymanager.runtime|3.1.0|project||doc/changelog.txt
Dependency Manager Shell|org.apache.felix.dependencymanager.shell|3.0.1|project
Deployment Admin|org.apache.felix.deploymentadmin|0.9.4|project
Event Admin|org.apache.felix.eventadmin|1.3.2
-File Install|org.apache.felix.fileinstall|3.2.6
-Framework|org.apache.felix.framework|4.2.1
-Framework Security|org.apache.felix.framework.security|2.2.0
-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
+File Install|org.apache.felix.fileinstall|3.2.6|||doc/changelog.txt
+Framework|org.apache.felix.framework|4.2.1|||doc/changelog.txt
+Framework
Security|org.apache.felix.framework.security|2.2.0|||doc/changelog.txt
+Gogo Runtime|org.apache.felix.gogo.runtime|0.10.0|project||doc/changelog.txt
+Gogo Shell|org.apache.felix.gogo.shell|0.10.0|project||doc/changelog.txt
+Gogo Command|org.apache.felix.gogo.command|0.12.0|project||doc/changelog.txt
+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||-
Inventory Printer|org.apache.felix.inventory|1.0.0
-iPOJO|org.apache.felix.ipojo|1.10.0|project
-iPOJO Runtime Project (containing all iPOJO runtime
modules)|org.apache.felix.ipojo.runtime-project|1.10.0|source-release
-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.1.0|source-release
-iPOJO Composite|org.apache.felix.ipojo.composite|1.10.0|project
-iPOJO Annotations|org.apache.felix.ipojo.annotations|1.10.0|project
-iPOJO Ant Task and CLI|org.apache.felix.ipojo.ant|1.10.0|project
-iPOJO BND Plugin|bnd-ipojo-plugin|1.10.0|project
-iPOJO WebConsole Plugin|org.apache.felix.ipojo.webconsole|1.7.0|project
-iPOJO API|org.apache.felix.ipojo.api|1.10.0|project
-iPOJO Manipulator|org.apache.felix.ipojo.manipulator|1.10.0|project
-iPOJO Manipulator Project (containing all iPOJO manipulator
modules)|org.apache.felix.ipojo.manipulator-project|1.10.0|source-release
-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.2.1|project
+iPOJO|org.apache.felix.ipojo|1.10.0|project||-
+iPOJO Runtime Project (containing all iPOJO runtime
modules)|org.apache.felix.ipojo.runtime-project|1.10.0|source-release||-
+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.1.0|source-release||-
+iPOJO Composite|org.apache.felix.ipojo.composite|1.10.0|project||-
+iPOJO Annotations|org.apache.felix.ipojo.annotations|1.10.0|project||-
+iPOJO Ant Task and CLI|org.apache.felix.ipojo.ant|1.10.0|project||-
+iPOJO BND Plugin|bnd-ipojo-plugin|1.10.0|project||-
+iPOJO WebConsole Plugin|org.apache.felix.ipojo.webconsole|1.7.0|project||-
+iPOJO API|org.apache.felix.ipojo.api|1.10.0|project||-
+iPOJO Manipulator|org.apache.felix.ipojo.manipulator|1.10.0|project||-
+iPOJO Manipulator Project (containing all iPOJO manipulator
modules)|org.apache.felix.ipojo.manipulator-project|1.10.0|source-release||-
+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||doc/changelog.txt
+junit4osgi - shell
command|org.apache.felix.ipojo.junit4osgi.felix-command|1.0.0|project||doc/changelog.txt
+junit4osgi - swing
gui|org.apache.felix.ipojo.junit4osgi.swing-gui|1.0.0|project||doc/changelog.txt
+Lightweight HTTP Service
Core|org.apache.felix.httplite.core|0.1.4|project||doc/changelog.txt
+Lightweight HTTP Service
Complete|org.apache.felix.httplite.complete|0.1.4|project||doc/changelog.txt
+Log|org.apache.felix.log|1.0.1|project||doc/changelog.txt
+Main|org.apache.felix.main|4.2.1|project||doc/changelog.txt
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
-Resolver|org.apache.felix.resolver|1.0.0
+OSGi OBR service API|org.osgi.service.obr|1.0.2|project||doc/changelog.txt
+Preferences|org.apache.felix.prefs|1.0.4|project||-
+Remote Shell|org.apache.felix.shell.remote|1.1.2|project||doc/changelog.txt
+Resolver|org.apache.felix.resolver|1.0.0|||doc/changelog.txt
SCR (Declarative Services)|org.apache.felix.scr|1.6.2
SCR Annotations|org.apache.felix.scr.annotations|1.9.4|project
SCR DS Annotations|org.apache.felix.scr.ds-annotations|1.2.2|project
SCR Generator|org.apache.felix.scr.generator|1.7.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
+Shell|org.apache.felix.shell|1.4.3|project||doc/changelog.txt
+Shell Text UI|org.apache.felix.shell.tui|1.4.1|project||doc/changelog.txt
+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||doc/changelog.txt
+UPnP Tester|org.apache.felix.upnp.tester|0.4.0|project||doc/changelog.txt
+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|||doc/changelog.txt
Web Console |org.apache.felix.webconsole|4.2.0
Web Console (all-in-one bundle)|org.apache.felix.webconsole|4.2.0||all
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 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 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 ServiceDiagnostics
Plugin|org.apache.felix.servicediagnostics.plugin|0.1.2|||-
Web Console UPNP Plugin|org.apache.felix.webconsole.plugins.upnp|1.0.2
-Web Console ServiceDiagnostics
Plugin|org.apache.felix.servicediagnostics.plugin|0.1.2
# (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.4.0
-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 Bundle Plugin|maven-bundle-plugin|2.4.0|||doc/changelog.txt
+Maven iPOJO Plugin|maven-ipojo-plugin|1.8.4|||-
+Maven junit4osgi Plugin|maven-junit4osgi-plugin|1.0.0|||doc/changelog.txt
+Maven OBR Plugin|maven-obr-plugin|1.2.0|||-
Maven SCR Plugin|maven-scr-plugin|1.13.0
# (3) Ant Tasks
Modified: felix/site/trunk/lib/view.pm
URL:
http://svn.apache.org/viewvc/felix/site/trunk/lib/view.pm?rev=1493079&r1=1493078&r2=1493079&view=diff
==============================================================================
--- felix/site/trunk/lib/view.pm (original)
+++ felix/site/trunk/lib/view.pm Fri Jun 14 14:11:03 2013
@@ -114,23 +114,26 @@ 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 $ant = "|Artifact | Version | Binary | Source|\n|--|--|--|--|\n";
+ my $result = "|Artifact | Version | Binary | Source |\n|--|--|--|--|\n";
+ my $maven = "|Artifact | Version | Binary | Source |\n|--|--|--|--|\n";
+ my $ant = "|Artifact | Version | Binary | Source |\n|--|--|--|--|\n";
my @lines = split( /\n/, $args{content} );
@lines = sort {lc($a) cmp lc($b)} @lines;
for my $line (@lines) {
next if (!$line || $line =~ /^\s*#/);
- my ($title, $artifact, $version, $srcClassifier, $classifier) =
split(/\|/, $line);
+ my ($title, $artifact, $version, $srcClassifier, $classifier,
$changelog) = split(/\|/, $line);
$srcClassifier = "source-release" unless ($srcClassifier);
$classifier = ($classifier) ? "-$classifier" : "";
+ $changelog = "changelog.txt" unless ($changelog);
if ($title eq "framework") {
# $artifact is actually the version
- $framework .= "| Felix Framework Distribution | $artifact | "
+ $framework .= "| Felix Framework Distribution | "
+ . changelogLink("org.apache.felix.main.distribution",
"$artifact", "doc/")
+ . " | "
.
downloadLink("org.apache.felix.main.distribution-$artifact.tar.gz", "tar.gz")
. " "
.
downloadLink("org.apache.felix.main.distribution-$artifact.zip", "zip")
@@ -145,7 +148,9 @@ sub downloads {
$target = \$ant;
}
- ${$target} .= "|$title|$version|"
+ ${$target} .= "|$title|"
+ . changelogLink("$artifact", "$version", $changelog)
+ . " | "
. downloadLink("$artifact-$version$classifier.jar",
"jar")
. " | "
.
downloadLink("$artifact-$version-$srcClassifier.tar.gz", "tar.gz")
@@ -356,6 +361,15 @@ sub downloadLink {
return "[$label]([preferred]/felix/$artifact)
([asc]($dp/felix/$artifact.asc), [md5]($dp/felix/$artifact.md5))";
}
+sub changelogLink {
+ my ($artifact, $version, $changelog) = @_;
+ if ($changelog eq "-") {
+ return "$version";
+ }
+
+ return "$version
([changes](http://svn.apache.org/repos/asf/felix/releases/${artifact}-${version}/${changelog}))";
+}
+
sub breadcrumbs {
my @path = split m!/!, shift;
pop @path;
