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/11 13:24:53 UTC
svn commit: r1069771 - in /karaf/sandbox/website: ./ src/main/webapp/
src/main/webapp/images/ src/main/webapp/index/
src/main/webapp/index/community/
src/main/webapp/index/documentation/karaf-users-guide/6.-advanced-uses/
src/main/webapp/site/
Author: gnodet
Date: Fri Feb 11 12:24:52 2011
New Revision: 1069771
URL: http://svn.apache.org/viewvc?rev=1069771&view=rev
Log:
Fix team page
Added:
karaf/sandbox/website/src/main/webapp/images/check.gif (with props)
Modified:
karaf/sandbox/website/conf-export.sh
karaf/sandbox/website/src/main/webapp/index.page
karaf/sandbox/website/src/main/webapp/index/community/team.page
karaf/sandbox/website/src/main/webapp/index/documentation.page
karaf/sandbox/website/src/main/webapp/index/documentation/karaf-users-guide/6.-advanced-uses/6.2.-custom-distributions.page
karaf/sandbox/website/src/main/webapp/site/navigation.page
Modified: karaf/sandbox/website/conf-export.sh
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/conf-export.sh?rev=1069771&r1=1069770&r2=1069771&view=diff
==============================================================================
--- karaf/sandbox/website/conf-export.sh (original)
+++ karaf/sandbox/website/conf-export.sh Fri Feb 11 12:24:52 2011
@@ -10,7 +10,7 @@ do
if [[ -f $i ]]
then
echo $i
- perl -i -p -e 's/\!([^\/]*\.png)/\!\/images\/\1/' $i
+ perl -i -p -e 's/\!([^\/]*\.png|[^\/]*\.gif)/\!\/images\/\1/' $i
fi
done
echo "================================="
Added: karaf/sandbox/website/src/main/webapp/images/check.gif
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/images/check.gif?rev=1069771&view=auto
==============================================================================
Binary file - no diff available.
Propchange: karaf/sandbox/website/src/main/webapp/images/check.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: karaf/sandbox/website/src/main/webapp/index.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index.page?rev=1069771&r1=1069770&r2=1069771&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index.page (original)
+++ karaf/sandbox/website/src/main/webapp/index.page Fri Feb 11 12:24:52 2011
@@ -1,9 +1,9 @@
----
-title: Index
-page_version: 15
-page_creator: gnodet
-page_modifier: gnodet
---- pipeline:conf
+---
+title: Index
+page_version: 15
+page_creator: gnodet
+page_modifier: gnodet
+--- 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/team.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index/community/team.page?rev=1069771&r1=1069770&r2=1069771&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index/community/team.page (original)
+++ karaf/sandbox/website/src/main/webapp/index/community/team.page Fri Feb 11 12:24:52 2011
@@ -1,6 +1,6 @@
---
title: Team
-page_version: 24
+page_version: 25
page_creator: gnodet
page_modifier: gnodet
--- pipeline:conf
@@ -9,23 +9,23 @@ This page lists who we are. By all means
h3. Committers
|| Name || ID || PMC || Organisation ||
-| Ioannis Canellos | iocanel |(/)| [Upstream S.A.|http://corp.upstreamsystems.com/] |
-| Hiram Chirino | chirino | | [FuseSource|http://fusesource.com/] |
-| Chris Custine | ccustine | (/) | [FuseSource|http://fusesource.com/] |
+| Ioannis Canellos | iocanel | !/images/check.gif! | [Upstream S.A.|http://corp.upstreamsystems.com/] |
+| Hiram Chirino | chirino | | [FuseSource|http://fusesource.com/] |
+| Chris Custine | ccustine | !/images/check.gif! | [FuseSource|http://fusesource.com/] |
| [Å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 | (/) | |
-| David Jencks | djencks | (/) | [IBM|http://www.ibm.com] |
-| Alex Karasulu | akarasulu | (/) | |
-| [Charles Moulliard|http://cmoulliard.blogspot.com] | cmoulliard | (/) | [FuseSource|http://fusesource.com/] |
-| 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 | (/) | |
+| Freeman Fang | ffang | !/images/check.gif! | [FuseSource|http://fusesource.com/] |
+| Jarek Gawor | jgawor | !/images/check.gif! | [IBM|http://www.ibm.com] |
+| [Jamie Goodyear|http://icodebythesea.blogspot.com] | jgoodyear | !/images/check.gif! | |
+| David Jencks | djencks | !/images/check.gif! | [IBM|http://www.ibm.com] |
+| Alex Karasulu | akarasulu | !/images/check.gif! | |
+| [Charles Moulliard|http://cmoulliard.blogspot.com] | cmoulliard | !/images/check.gif! | [FuseSource|http://fusesource.com/] |
+| Achim Nierbeck | anierbeck |!/images/check.gif! | |
+| [Guillaume Nodet|http://gnodet.blogspot.com] | gnodet | !/images/check.gif! | [FuseSource|http://fusesource.com/] |
+| Jean-Baptiste Onofré | jbonofre | !/images/check.gif! | [Fimasys|http://www.fimasys.com] |
+| Andreas Pieber| pieber | !/images/check.gif! | |
| James Strachan | jstrachan | | [FuseSource|http://fusesource.com/] |
| Adrian Trenaman | | | [FuseSource|http://fusesource.com/] |
-| Gert Vanthienen | gertv | (/) | [FuseSource|http://fusesource.com/] |
+| Gert Vanthienen | gertv | !/images/check.gif! | [FuseSource|http://fusesource.com/] |
h3. Contributors
Modified: karaf/sandbox/website/src/main/webapp/index/documentation.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index/documentation.page?rev=1069771&r1=1069770&r2=1069771&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index/documentation.page (original)
+++ karaf/sandbox/website/src/main/webapp/index/documentation.page Fri Feb 11 12:24:52 2011
@@ -1,9 +1,22 @@
---
title: Documentation
-page_version: 2
+page_version: 3
page_creator: gnodet
page_modifier: gnodet
--- pipeline:conf
h1. Documentation
-{children}
\ No newline at end of file
+h2. Karaf 2.2.x manual
+
+* [Karaf Manual|http://karaf.apache.org/manual/2.1.99-SNAPSHOT/index.html]
+
+h2. Karaf 2.1.x manual
+
+* [Karaf Users' Guide|https://cwiki.apache.org/KARAF/karaf-users-guide.html]
+* [Karaf Users' Guide in one page|https://cwiki.apache.org/KARAF/karaf-users-guide-in-one-page.html]
+
+h2. XML Schemas
+
+* [Karaf Features v1.0.0|http://karaf.apache.org/xmlns/features/v1.0.0]
+* [Karaf JAAS v1.0.0|http://karaf.apache.org/xmlns/jaas/v1.0.0]
+* [Karaf Shell v1.0.0|http://karaf.apache.org/xmlns/shell/v1.0.0]
\ No newline at end of file
Modified: karaf/sandbox/website/src/main/webapp/index/documentation/karaf-users-guide/6.-advanced-uses/6.2.-custom-distributions.page
URL: http://svn.apache.org/viewvc/karaf/sandbox/website/src/main/webapp/index/documentation/karaf-users-guide/6.-advanced-uses/6.2.-custom-distributions.page?rev=1069771&r1=1069770&r2=1069771&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/index/documentation/karaf-users-guide/6.-advanced-uses/6.2.-custom-distributions.page (original)
+++ karaf/sandbox/website/src/main/webapp/index/documentation/karaf-users-guide/6.-advanced-uses/6.2.-custom-distributions.page Fri Feb 11 12:24:52 2011
@@ -1,6 +1,6 @@
---
title: 6.2. Custom distributions
-page_version: 7
+page_version: 8
page_creator: gnodet
page_modifier: nanthrax
--- pipeline:conf
@@ -109,15 +109,108 @@ For instance, the Maven POM could look l
</execution>
</executions>
</plugin>
- <!-- TODO complete with dependency plugin section -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <!-- Define here the artifacts which should be considered in the assembly -->
+ <!-- For instance, the branding jar -->
+ <artifactItems>
+ <artifactItem>
+ <groupId>my.groupId</groupId>
+ <artifactId>my.branding.id</artifactId>
+ <version>1.0</version>
+ <outputDirectory>target/dependencies</outputDirectory>
+ <destFileName>mybranding.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- Uncompress the standard Karaf distribution -->
+ <id>unpack</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>tar.gz</type>
+ <outputDirectory>target/dependencies</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/bin.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
{code}
+The Maven POM will download the Karaf standard distribution and prepares resources to be processed by the Maven assembly plugin.
+
+Your Maven project structure should look like:
+
+* pom.xml: the previous POM file
+* src/main/descriptors/bin.xml: the assembly maven plugin descriptor (see below)
+* src/main/filtered-resources: contains all files where some maven properties should be replaced/filtered. Typically, it contains the features descriptor and configuration files.
+* src/main/distribution: contains all raw files which will be copied into your custom distribution.
+
+For instance, {{src/main/filtered-resources}} could contains:
+* {{my-features.xml}} where maven properties will be replaced
+* {{etc/org.apache.karaf.features.cfg}} file containing your my-features descriptor:
+{code}
+#
+# Comma separated list of features repositories to register by default
+#
+featuresRepositories=mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features,mvn:my.groupId/my-features/${project.version}/xml/features
+
+#
+# Comma separated list of features to install at startup
+#
+featuresBoot=config,ssh,management,my-feature
+{code}
+
+
+
TODO Complete
+h2. Roadmap
+
+A distribution goal is in preparation in the next Karaf
+
h2. Custom distribution examples
* [Apache ServiceMix 4|http://svn.apache.org/repos/asf/servicemix/smx4/features/trunk/assembly/]
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=1069771&r1=1069770&r2=1069771&view=diff
==============================================================================
--- karaf/sandbox/website/src/main/webapp/site/navigation.page (original)
+++ karaf/sandbox/website/src/main/webapp/site/navigation.page Fri Feb 11 12:24:52 2011
@@ -1,6 +1,6 @@
---
title: Navigation
-page_version: 14
+page_version: 15
page_creator: gnodet
page_modifier: gnodet
--- pipeline:conf
@@ -11,7 +11,7 @@ h3. [Overview|Karaf Overview]
- [FAQ]
- [Download]
-h3. [Documentation|http://karaf.apache.org/manual/2.1.99-SNAPSHOT]
+h3. [Documentation]
- [Users' Guide|http://karaf.apache.org/manual/2.1.99-SNAPSHOT/users-guide/index.html]
- [Developer Guide|http://karaf.apache.org/manual/2.1.99-SNAPSHOT/developers-guide/index.html]