You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/02/09 09:04:34 UTC
svn commit: r1068779 - in /karaf/sandbox/website: ./ src/main/webapp/
src/main/webapp/index/community/ src/main/webapp/index/community/download/
src/main/webapp/index/developers/ src/main/webapp/index/documentation/
src/main/webapp/index/documentation/...
Author: gnodet
Date: Wed Feb 9 08:04:34 2011
New Revision: 1068779
URL: http://svn.apache.org/viewvc?rev=1068779&view=rev
Log:
Update sandbox site with latest confluence changes
Added:
karaf/sandbox/website/src/main/webapp/index/community/download/karaf-2.1.3-release.page
karaf/sandbox/website/src/main/webapp/index/developers/roadmap.page
karaf/sandbox/website/src/main/webapp/index/developers/technical--architecture-discussions.page
Removed:
karaf/sandbox/website/src/main/webapp/index/documentation/karaf-users'-guide/
karaf/sandbox/website/src/main/webapp/index/documentation/karaf-users'-guide-in-one-page.page
karaf/sandbox/website/src/main/webapp/index/documentation/karaf-users'-guide.page
Modified:
karaf/sandbox/website/ (props changed)
karaf/sandbox/website/src/main/webapp/index.page
karaf/sandbox/website/src/main/webapp/index/community/download.page
karaf/sandbox/website/src/main/webapp/index/community/team.page
karaf/sandbox/website/src/main/webapp/index/developers/logo.page
karaf/sandbox/website/src/main/webapp/index/developers/release-guide.page
karaf/sandbox/website/src/main/webapp/logo-proposal.page
karaf/sandbox/website/src/main/webapp/logo-proposal/proposed-logo.page
karaf/sandbox/website/src/main/webapp/site/navigation.page
karaf/sandbox/website/src/main/webapp/snippets/karaf-overview.page
karaf/sandbox/website/src/main/webapp/snippets/karaf-welcome-screen.page
Propchange: karaf/sandbox/website/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 9 08:04:34 2011
@@ -0,0 +1 @@
+target
Modified: karaf/sandbox/website/src/main/webapp/index.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index.page?rev=1068779&r1=1068778&r2=1068779&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index.page (original)
+++ karaf/sandbox/website/src/main/webapp/index.page Wed Feb 9 08:04:34 2011
@@ -1,9 +1,9 @@
----
-title: Index
-page_version: 12
-page_creator: gnodet
-page_modifier: pieber
---- pipeline:conf
+---
+title: Index
+page_version: 12
+page_creator: gnodet
+page_modifier: pieber
+--- pipeline:conf
{section}
{column}
Apache Karaf is a small OSGi based runtime which provides a lightweight container onto which various components and applications can be deployed.
Modified: karaf/sandbox/website/src/main/webapp/index/community/download.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index/community/download.page?rev=1068779&r1=1068778&r2=1068779&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index/community/download.page (original)
+++ karaf/sandbox/website/src/main/webapp/index/community/download.page Wed Feb 9 08:04:34 2011
@@ -1,9 +1,9 @@
----
-title: Download
-page_version: 12
-page_creator: gnodet
-page_modifier: jgoodyear
---- pipeline:conf
+---
+title: Download
+page_version: 13
+page_creator: gnodet
+page_modifier: jgoodyear
+--- pipeline:conf
h2. Latest Releases
{section}
@@ -18,7 +18,7 @@ h2. Latest Releases
Grab these releases while they are hot!
-The latest release is [Karaf 2.1.2 Release].
+The latest release is [Karaf 2.1.3 Release].
Releases:
{children:sort=creation|reverse=true}
@@ -33,6 +33,20 @@ h2. Getting the latest distributions
{info:title=The URLs below use redirection}
The above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using [Mozilla Firefox|http://www.mozilla.com/en-US/firefox/]
{info}
+h2. Karaf 2.1.3
+
+h3. Binary Distribution
+
+||Description||Download Link|| || || ||
+|Windows Distribution| [apache-karaf-2.1.3.zip|http://www.apache.org/dyn/closer.cgi/karaf/2.1.3/apache-karaf-2.1.3.zip]|[PGP|http://www.apache.org/dist/karaf/2.1.3/apache-karaf-2.1.3.zip.asc]|[SHA1|http://www.apache.org/dist/karaf/2.1.3/apache-karaf-2.1.3.zip.sha1]|[MD5|http://www.apache.org/dist/karaf/2.1.3/apache-karaf-2.1.3.zip.md5]|
+|Unix/Linux/Cygwin Distribution| [apache-karaf-2.1.3.tar.gz|http://www.apache.org/dyn/closer.cgi/karaf/2.1.3/apache-karaf-2.1.3.tar.gz]|[PGP|http://www.apache.org/dist/karaf/2.1.3/apache-karaf-2.1.3.tar.gz.asc]|[SHA1|http://www.apache.org/dist/karaf/2.1.3/apache-karaf-2.1.3.tar.gz.sha1]|[MD5|http://www.apache.org/dist/karaf/2.1.3/apache-karaf-2.1.3.tar.gz.md5]|
+
+h3. Source Distribution
+
+||Description||Download Link|| || || ||
+|Windows Source Distribution| [apache-karaf-2.1.3-src.zip|http://www.apache.org/dyn/closer.cgi/karaf/2.1.3/apache-karaf-2.1.3-src.zip]|[PGP|http://www.apache.org/dist/karaf/2.1.3/apache-karaf-2.1.3-src.zip.asc]|[SHA1|http://www.apache.org/dist/karaf/2.1.3/apache-karaf-2.1.3-src.zip.sha1]|[MD5|http://www.apache.org/dist/karaf/2.1.3/apache-karaf-2.1.3-src.zip.md5]|
+|Unix/Linux/Cygwin Source Distribution| [apache-karaf-2.1.3-src.tar.gz|http://www.apache.org/dyn/closer.cgi/karaf/2.1.3/apache-karaf-2.1.3-src.tar.gz]|[PGP|http://www.apache.org/dist/karaf/2.1.3/apache-karaf-2.1.3-src.tar.gz.asc]|[SHA1|http://www.apache.org/dist/karaf/2.1.3/apache-karaf-2.1.3-src.tar.gz.sha1]|[MD5|http://www.apache.org/dist/karaf/2.1.3/apache-karaf-2.1.3-src.tar.gz.md5]|
+
h2. Karaf 2.1.2
h3. Binary Distribution
Added: karaf/sandbox/website/src/main/webapp/index/community/download/karaf-2.1.3-release.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index/community/download/karaf-2.1.3-release.page?rev=1068779&view=auto
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index/community/download/karaf-2.1.3-release.page (added)
+++ karaf/sandbox/website/src/main/webapp/index/community/download/karaf-2.1.3-release.page Wed Feb 9 08:04:34 2011
@@ -0,0 +1,43 @@
+---
+title: Karaf 2.1.3 Release
+page_version: 1
+page_creator: jgoodyear
+page_modifier: jgoodyear
+--- pipeline:conf
+h2. Download
+
+Download links can be found in the [Download] page.
+
+h2. Release Notes - Karaf - Version 2.1.3
+
+This release of Apache Karaf is based off of the 2.1.x series branch, representing an update to Apache Karaf 2.1.2. It contains several bug fixes identified in the prior release, and updates the versions of SLF4j, pax-url-mvn, spring, and pax-exam. For more detail please see the change log below.
+
+h3. Bug
+ * [KARAF-244|https://issues.apache.org/jira/browse/KARAF-244] - features-maven-plugin does not work with maven 3
+ * [KARAF-282|https://issues.apache.org/jira/browse/KARAF-282] - The shell:exec does not always capture the whole output
+ * [KARAF-292|https://issues.apache.org/jira/browse/KARAF-292] - Maven filtering issue for Windows batch files in kit
+ * [KARAF-299|https://issues.apache.org/jira/browse/KARAF-299] - \[patch\] miscellaneous cleanups
+ * [KARAF-300|https://issues.apache.org/jira/browse/KARAF-300] - Incorrect behavior of backspace/delete keys in web console Gogo plugin
+ * [KARAF-304|https://issues.apache.org/jira/browse/KARAF-304] - Startup problems: javax.naming.NoInitialContextException: Unable to determine caller'sBundleContext
+ * [KARAF-313|https://issues.apache.org/jira/browse/KARAF-313] - feature.xml is not read correct if it contains linebreaks
+ * [KARAF-319|https://issues.apache.org/jira/browse/KARAF-319] - Pom hierarchy error
+ * [KARAF-321|https://issues.apache.org/jira/browse/KARAF-321] - karaf shell script does not work with mingw and whitespaces in path
+ * [KARAF-326|https://issues.apache.org/jira/browse/KARAF-326] - eclipse:eclipse importing error
+ * [KARAF-327|https://issues.apache.org/jira/browse/KARAF-327] - Graceful shutdown of Windows service, revisited
+ * [KARAF-331|https://issues.apache.org/jira/browse/KARAF-331] - Failure to execute script against Karaf sshd.
+ * [KARAF-344|https://issues.apache.org/jira/browse/KARAF-344] - Deploying a new JAAS config requires to restart the framework
+ * [KARAF-347|https://issues.apache.org/jira/browse/KARAF-347] - org.ops4j.pax.url.mvn.cfg contains incorrect comment on last property
+ * [KARAF-357|https://issues.apache.org/jira/browse/KARAF-357] - shell.bat won't start with NoClassDefFoundError and NPE
+ * [KARAF-358|https://issues.apache.org/jira/browse/KARAF-358] - When the feature service calls refresh(), it should wait for the refresh to happen before returning
+ * [KARAF-360|https://issues.apache.org/jira/browse/KARAF-360] - Empty comment in some config files
+
+h3. Improvement
+ * [KARAF-314|https://issues.apache.org/jira/browse/KARAF-314] - feature-maven-plugin does not fail if component couldn't be found
+ * [KARAF-320|https://issues.apache.org/jira/browse/KARAF-320] - Missing svn:ignores
+ * [KARAF-329|https://issues.apache.org/jira/browse/KARAF-329] - improve test-util methods
+ * [KARAF-349|https://issues.apache.org/jira/browse/KARAF-349] - Upgrade to SLF4j 1.5.8
+
+h3. Task
+ * [KARAF-333|https://issues.apache.org/jira/browse/KARAF-333] - Update karaf to use pax-url-mvn ver 1.2.4
+ * [KARAF-345|https://issues.apache.org/jira/browse/KARAF-345] - upgrade to spring 3.0.5.RELEASE
+ * [KARAF-351|https://issues.apache.org/jira/browse/KARAF-351] - Upgrade to pax-exam 1.2.3
\ No newline at end of file
Modified: karaf/sandbox/website/src/main/webapp/index/community/team.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index/community/team.page?rev=1068779&r1=1068778&r2=1068779&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index/community/team.page (original)
+++ karaf/sandbox/website/src/main/webapp/index/community/team.page Wed Feb 9 08:04:34 2011
@@ -1,6 +1,6 @@
---
title: Team
-page_version: 19
+page_version: 24
page_creator: gnodet
page_modifier: gnodet
--- pipeline:conf
@@ -15,13 +15,14 @@ h3. Committers
| [?ukasz Dywicki|http://blog.code-house.org] | | | [Code-House|http://code-house.org] |
| Freeman Fang | ffang | (/) | [FuseSource|http://fusesource.com/] |
| Jarek Gawor | jgawor | (/) | [IBM|http://www.ibm.com] |
-| [Jamie Goodyear|http://icodebythesea.blogspot.com] | jgoodyear | (/) | [FuseSource|http://fusesource.com/] |
+| [Jamie Goodyear|http://icodebythesea.blogspot.com] | jgoodyear | (/) | |
| David Jencks | djencks | (/) | [IBM|http://www.ibm.com] |
| Alex Karasulu | akarasulu | (/) | |
| [Charles Moulliard|http://cmoulliard.blogspot.com] | cmoulliard | (/) | [FuseSource|http://fusesource.com/] |
-| Achim Nierbeck | | | |
+| Achim Nierbeck | anierbeck | (/) | |
| [Guillaume Nodet|http://gnodet.blogspot.com] | gnodet | (/) | [FuseSource|http://fusesource.com/] |
| Jean-Baptiste OnofrĀ | jbonofre | (/) | [Fimasys|http://www.fimasys.com] |
+| Andreas Pieber| pieber | (/) | |
| James Strachan | jstrachan | | [FuseSource|http://fusesource.com/] |
| Adrian Trenaman | | | [FuseSource|http://fusesource.com/] |
| Gert Vanthienen | gertv | (/) | [FuseSource|http://fusesource.com/] |
@@ -30,5 +31,5 @@ h3. Contributors
|| Name || Organisation ||
| [Lars Heinemann|http://lhein.blogspot.com/] | [FuseSource |http://fusesource.com/]|
-| Andreas Pieber| |
-
+| Michael Van Geertruy | |
+| Geert Schuring | |
Modified: karaf/sandbox/website/src/main/webapp/index/developers/logo.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index/developers/logo.page?rev=1068779&r1=1068778&r2=1068779&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index/developers/logo.page (original)
+++ karaf/sandbox/website/src/main/webapp/index/developers/logo.page Wed Feb 9 08:04:34 2011
@@ -8,5 +8,5 @@ h1. Logo
The current logo is available from this page in [PNG|^karaf-logo.png] and [SVG|^karaf-logo.svg] format.
-!karaf-logo.png!
+!/images/karaf-logo.png!
Modified: karaf/sandbox/website/src/main/webapp/index/developers/release-guide.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index/developers/release-guide.page?rev=1068779&r1=1068778&r2=1068779&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index/developers/release-guide.page (original)
+++ karaf/sandbox/website/src/main/webapp/index/developers/release-guide.page Wed Feb 9 08:04:34 2011
@@ -1,6 +1,6 @@
---
title: Release Guide
-page_version: 9
+page_version: 12
page_creator: gnodet
page_modifier: jgoodyear
--- pipeline:conf
@@ -9,12 +9,22 @@ h1. How to create and announce a Karaf r
h3. Required tools, practices and resources
* Use Maven 2.0.11 or greater.
-* JDK 1.5 (We try to maintain compatibility)
+* JDK 1.5 if version < 3.0.0, JDK 1.6 otherwise.
* Install [princexml|http://www.princexml.com/] 7.1 for manual generation.
* Each and every release must be [SIGNED|http://www.apache.org/dev/release-signing.html]
* Your public key should also be cross-signed by other Apache committers (not required, but suggested)
* Make sure you have all Apache servers defined in your [settings.xml|http://maven.apache.org/developers/committer-settings.html]
+h3. Versioning
+
+Sample versioning:
+|| SNAPSHOT || RELEASE||
+|1.0.0-SNAPSHOT | 1.0.0|
+|1.1.0-SNAPSHOT | 1.1.0|
+|1.1.1-SNAPSHOT | 1.1.1|
+|1.1.2-SNAPSHOT | 1.1.2|
+|2.0.0-SHAPSHOT | 2.0.0|
+
h3. Prepare
To prepare and perform a release you must be at least at Apache Karaf Committer.
@@ -51,6 +61,43 @@ Your settings.xml should look like:
</settings>
{code}
+h3. Community awareness message(s).
+
+In the lead up towards a release candidate the user base should be given some notification.
+
+In the case of dot zero release a new maintenance branch may be created with trunk continuing new development. The maintenance branch may be used for stabilization of the code base before a release candidate is cut. A notification message to the dev & user lists may be warranted.
+
+{code}
+To: "Karaf Developers List" <de...@karaf.apache.org>
+Subject: [NOTICE] Karaf trunk branched to create X.Y.0 maintenance branch.
+
+Hi,
+
+We've just branched off X.Y.0 from trunk and started to stabilize it; latest artifacts are
+available via apache-snapshot repo... simply add the following repo to your pom,
+change the version to and provide us with feedback.
+
+<<insert short description of the reason for branching here>>
+
+Thanks,
+
+-The Karaf team
+{code}
+
+A few weeks later the following message would be sent:
+
+{code}
+To: "Karaf Developers List" <de...@karaf.apache.org>
+Subject: [UPDATE] Karaf X.Y.0 release branch status.
+
+Hi,
+
+Thanks for all your feedback; we've fixed XX bugs/problems on the release branch
+and will start a release about next week; Thanks again for all your contributions.
+
+-The Karaf Team
+{code}
+
h3. Staging the Release Candidate
# Grab the latest source
Added: karaf/sandbox/website/src/main/webapp/index/developers/roadmap.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index/developers/roadmap.page?rev=1068779&view=auto
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index/developers/roadmap.page (added)
+++ karaf/sandbox/website/src/main/webapp/index/developers/roadmap.page Wed Feb 9 08:04:34 2011
@@ -0,0 +1,55 @@
+---
+title: Roadmap
+page_version: 5
+page_creator: nanthrax
+page_modifier: pieber
+--- pipeline:conf
+h1. Roadmap
+
+This page gathers open discussions regarding the Karaf roadmap.
+
+It's a place where all Karaf developers could share ideas before opening the corresponding Jira tasks.
+
+h2. Karaf profiles
+
+There where some discussions here that Karaf profiles might should be merged into features/kar concept...
+
+h2. JAAS easy configuration
+
+h2. Karaf Enterprise Repository
+
+The problem with the current way is that you have to remember the links of the different features. Instead we could manage a repo where does links could be entered. This way we could simply search them by name. Interesting extensions to this feature are also provided on the Karaf mailing list including commands to download the kar files but not installing them (download them while you're online, but install/uninstall them while you're offline)
+
+Some additional idea on the mailing list was to make the features available without versions. This means you can either install a feature without any version (repo:install xyz) or with a specific version (xyz/1). We can use mvn for this again.
+
+The enterprise repository could be a simply .xml file which is read by karaf and e.g. provided via karaf.apache.org/repository.xml. This xml could follow a structure like:
+
+{code}
+<repo>
+ <feature>
+ <id>standard</id>
+ <desc>Very basic feature extensions for Karaf such as OBR, SSH and Soring</desc>
+ <url>mvn:org.apache.karaf/apache-karaf</url>
+ <!-- Optionally if not using mvn and still want to provide multible versions -->
+ <versions>
+
+ </versions>
+ </feature>
+</repo>
+{code}
+
+Based on this we can either create a homepage presenting the different features with a short description of the file. The possible versions could be retrieved via maven-metadata.xml. The different features could be retrieved from the features.xml then including a description of each feature.
+
+A different method could be (if we assume everything is available via maven) to query some maven repos for classifier:features which should return all feature files in all versions from all artifacts. I think we should be able to create such a list quite efficient (if the m2 repos react fast enough and are indexed) to create this at runtime using a command such as repo:listfeatures
+
+h2. Pre\- and Post processing gogo scripts for features
+
+To add config files, libs and other settings, in addition to bundles, features should provide post and pre processing of a gogo script which can does the additional setup.
+
+h2. Minimize dependencies and distributions
+
+Currently a lot of different dependencies are directly included in Karaf. Instead we should minimize the Kernel again and rather provide additional projects for e.g. spring or at best "export" the features/kar configs into projects like aries, cxf, camel, ...
+
+h2. karaf-maven-plugin with at least run, distribution and kar
+
+While there are many possible goals here I think a run, distribution and kar goal would be the most important. The run-goal should unzip an assembly and execute the .sh/.bin files depending on your system, distribution should simply build a distribution out of lots of kar files which describe e.g. branding, features, configs, ...) but at best with nothing else required. If this is not possible giving only config, lib and some kind of "additional" directories would be also great here. For kar we simply package jar bundles and features.xml files. It may also include config files and other things required for setup.
\ No newline at end of file
Added: karaf/sandbox/website/src/main/webapp/index/developers/technical--architecture-discussions.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index/developers/technical--architecture-discussions.page?rev=1068779&view=auto
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index/developers/technical--architecture-discussions.page (added)
+++ karaf/sandbox/website/src/main/webapp/index/developers/technical--architecture-discussions.page Wed Feb 9 08:04:34 2011
@@ -0,0 +1,12 @@
+---
+title: Technical & Architecture Discussions
+page_version: 1
+page_creator: nanthrax
+page_modifier: nanthrax
+--- pipeline:conf
+This page hosts all open discussions and brainstorming around technical implementations and/or architecture design.
+
+The current topics are:
+- Clustering and Karaf nodes state sync
+- Feature livecycle and update
+- Karaf profiles
\ No newline at end of file
Modified: karaf/sandbox/website/src/main/webapp/logo-proposal.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/logo-proposal.page?rev=1068779&r1=1068778&r2=1068779&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/logo-proposal.page (original)
+++ karaf/sandbox/website/src/main/webapp/logo-proposal.page Wed Feb 9 08:04:34 2011
@@ -6,4 +6,4 @@ page_modifier: gnodet
--- pipeline:conf
h1. Logo proposals
-!karaf_logos.png!
+!/images/karaf_logos.png!
Modified: karaf/sandbox/website/src/main/webapp/logo-proposal/proposed-logo.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/logo-proposal/proposed-logo.page?rev=1068779&r1=1068778&r2=1068779&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/logo-proposal/proposed-logo.page (original)
+++ karaf/sandbox/website/src/main/webapp/logo-proposal/proposed-logo.page Wed Feb 9 08:04:34 2011
@@ -7,5 +7,5 @@ page_modifier: gnodet
h1. Proposed logo
||Number||Logo||
-|#1|!logokaraf.png!|
+|#1|!/images/logokaraf.png!|
|#2|!http://idisk.me.com/chirino/Public/Pictures/Skitch/Adobe_Fireworks_CS5-20101121-073046.jpg!|
\ No newline at end of file
Modified: karaf/sandbox/website/src/main/webapp/site/navigation.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/site/navigation.page?rev=1068779&r1=1068778&r2=1068779&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/site/navigation.page (original)
+++ karaf/sandbox/website/src/main/webapp/site/navigation.page Wed Feb 9 08:04:34 2011
@@ -1,8 +1,8 @@
---
title: Navigation
-page_version: 7
+page_version: 9
page_creator: gnodet
-page_modifier: gnodet
+page_modifier: nanthrax
--- pipeline:conf
h3. [Overview|Karaf Overview]
@@ -43,8 +43,8 @@ h3. [Community]
h3. [Developers]
- [Developer Guide|Developers]
+- [Roadmap]
- [Source]
- [Building]
- [JavaDoc]
-- [IRC Room]
-- [Maven Reports|http://karaf.apache.org/maven/index.html]
+- [IRC Room]
Modified: karaf/sandbox/website/src/main/webapp/snippets/karaf-overview.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/snippets/karaf-overview.page?rev=1068779&r1=1068778&r2=1068779&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/snippets/karaf-overview.page (original)
+++ karaf/sandbox/website/src/main/webapp/snippets/karaf-overview.page Wed Feb 9 08:04:34 2011
@@ -4,9 +4,9 @@ page_version: 3
page_creator: gnodet
page_modifier: gnodet
--- pipeline:conf
-Apache Karaf is a small OSGi based runtime which provides a lightweight container onto which various components and applications can be deployed.
-
-Here is a short list of features supported by the Karaf:
-{include:Karaf Features}
-
-!/images/karaf2.png!
+Apache Karaf is a small OSGi based runtime which provides a lightweight container onto which various components and applications can be deployed.
+
+Here is a short list of features supported by the Karaf:
+{include:Karaf Features}
+
+!/images/karaf2.png!
Modified: karaf/sandbox/website/src/main/webapp/snippets/karaf-welcome-screen.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/snippets/karaf-welcome-screen.page?rev=1068779&r1=1068778&r2=1068779&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/snippets/karaf-welcome-screen.page (original)
+++ karaf/sandbox/website/src/main/webapp/snippets/karaf-welcome-screen.page Wed Feb 9 08:04:34 2011
@@ -1,8 +1,8 @@
---
title: Karaf welcome screen
-page_version: 4
+page_version: 5
page_creator: gnodet
-page_modifier: gnodet
+page_modifier: nanthrax
--- pipeline:conf
{code:borderStyle=solid}
__ __ ____
@@ -11,7 +11,7 @@ page_modifier: gnodet
/ /| |/ /_/ / / / /_/ / __/
/_/ |_|\__,_/_/ \__,_/_/
- Apache Felix Karaf (2.0.0)
+ Apache Felix Karaf (2.1.2)
Hit '<tab>' for a list of available commands
and '[cmd] --help' for help on a specific command.