Author: gertv
Date: Mon Dec 5 21:47:53 2011
New Revision: 1210656
URL: http://svn.apache.org/viewvc?rev=1210656&view=rev
Log:
Prepare 4.4.0 docs section and add reference to the appropriate Camel examples
Modified:
servicemix/documentation/trunk/pom.xml
servicemix/documentation/trunk/src/main/webapp/karaf/toc.ssp
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-blueprint.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-spring.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf
Modified: servicemix/documentation/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/pom.xml?rev=1210656&r1=1210655&r2=1210656&view=diff
==============================================================================
--- servicemix/documentation/trunk/pom.xml (original)
+++ servicemix/documentation/trunk/pom.xml Mon Dec 5 21:47:53 2011
@@ -32,7 +32,7 @@
<groupId>org.apache.servicemix</groupId>
<artifactId>documentation</artifactId>
<name>Apache ServiceMix Documentation</name>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.4.0-SNAPSHOT</version>
<packaging>war</packaging>
<properties>
@@ -50,10 +50,10 @@
<scalate.mode>production</scalate.mode>
<scalate.workdir>${basedir}/target/scalateWorkDir</scalate.workdir>
- <camel.version>2.6.0</camel.version>
+ <camel.version>2.8.3</camel.version>
<components.version>2011.01</components.version>
- <karaf.version>2.1.99-SNAPSHOT</karaf.version>
- <servicemix.version>4.3.0-SNAPSHOT</servicemix.version>
+ <karaf.version>2.2.3</karaf.version>
+ <servicemix.version>4.4.0</servicemix.version>
</properties>
<dependencies>
@@ -312,11 +312,16 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.karaf</groupId>
-
<artifactId>org.apache.karaf.doc</artifactId>
+ <artifactId>manual</artifactId>
<version>${karaf.version}</version>
<type>war</type>
<outputDirectory>${project.build.directory}/webapp/karaf</outputDirectory>
<includes>developers-guide/*.conf,users-guide/*.conf</includes>
+ <!-- TODO: figure out how to handle these
files that refer to the karaf codebase -->
+ <excludes>
+
developers-guide/security-framework.conf,
+ users-guide/provisioning-schema.conf
+ </excludes>
</artifactItem>
</artifactItems>
</configuration>
@@ -332,7 +337,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.karaf</groupId>
-
<artifactId>org.apache.karaf.doc</artifactId>
+ <artifactId>manual</artifactId>
<version>${karaf.version}</version>
<type>war</type>
<outputDirectory>${project.build.directory}/webapp</outputDirectory>
Modified: servicemix/documentation/trunk/src/main/webapp/karaf/toc.ssp
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/karaf/toc.ssp?rev=1210656&r1=1210655&r2=1210656&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/karaf/toc.ssp (original)
+++ servicemix/documentation/trunk/src/main/webapp/karaf/toc.ssp Mon Dec 5
21:47:53 2011
@@ -52,9 +52,6 @@
<li id="extending-console">
<a
href="${uri("/karaf/developers-guide/extending-console.html")}">Extending
Console</a>
</li>
- <li id="security-framework">
- <a
href="${uri("/karaf/developers-guide/security-framework.html")}">Security
Framework</a>
- </li>
<li id="writing-tests">
<a href="${uri("/karaf/developers-guide/writing-tests.html")}">Tests
with Pax Exam</a>
</li>
Modified:
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-blueprint.conf
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-blueprint.conf?rev=1210656&r1=1210655&r2=1210656&view=diff
==============================================================================
---
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-blueprint.conf
(original)
+++
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-blueprint.conf
Mon Dec 5 21:47:53 2011
@@ -30,4 +30,8 @@ If your RouteBuilder classes have been d
</camelContext>
</blueprint>
-{pygmentize}
\ No newline at end of file
+{pygmentize}
+
+h3. Example in the distribution
+
+Another example for using this deployment option can be found in the
{{camel-blueprint}} example that is shipped with Apache ServiceMix.
Modified:
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-spring.conf
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-spring.conf?rev=1210656&r1=1210655&r2=1210656&view=diff
==============================================================================
---
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-spring.conf
(original)
+++
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-spring.conf
Mon Dec 5 21:47:53 2011
@@ -31,4 +31,9 @@ If your RouteBuilder classes have been d
</camelContext>
</beans>
-{pygmentize}
\ No newline at end of file
+{pygmentize}
+
+h3. Example in the distribution
+
+Another example for using this deployment option can be found in the
{{camel-osgi}} example that is shipped with Apache ServiceMix.
+
Modified:
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf?rev=1210656&r1=1210655&r2=1210656&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf
(original)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf
Mon Dec 5 21:47:53 2011
@@ -11,6 +11,10 @@ The goal of this guide is to look into t
* deployment options
* installing additional components
+h2. Examples
+
+The Apache ServiceMix distributions also contain a set of Camel examples. You
can find these examples in the {{examples/camel}} directory.
+
h2. More information about Camel
More information about Camel itself, can be found on [http://camel.apache.org].
