Prepare 4.4.0 docs section and add reference to the appropriate Camel examples
git-svn-id: https://svn.apache.org/repos/asf/servicemix/documentation/trunk@1210656 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 2b8d86d..ce88608 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/main/webapp/karaf/toc.ssp b/src/main/webapp/karaf/toc.ssp
index 8cc7ce5..0b6a064 100644
--- a/src/main/webapp/karaf/toc.ssp
+++ b/src/main/webapp/karaf/toc.ssp
@@ -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>
diff --git a/src/main/webapp/users-guide/camel/deployment/osgi-bundle-blueprint.conf b/src/main/webapp/users-guide/camel/deployment/osgi-bundle-blueprint.conf
index 3b9c24f..e8de877 100644
--- a/src/main/webapp/users-guide/camel/deployment/osgi-bundle-blueprint.conf
+++ b/src/main/webapp/users-guide/camel/deployment/osgi-bundle-blueprint.conf
@@ -30,4 +30,8 @@
</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.
diff --git a/src/main/webapp/users-guide/camel/deployment/osgi-bundle-spring.conf b/src/main/webapp/users-guide/camel/deployment/osgi-bundle-spring.conf
index 5ebb651..e97f59a 100644
--- a/src/main/webapp/users-guide/camel/deployment/osgi-bundle-spring.conf
+++ b/src/main/webapp/users-guide/camel/deployment/osgi-bundle-spring.conf
@@ -31,4 +31,9 @@
</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.
+
diff --git a/src/main/webapp/users-guide/camel/index.conf b/src/main/webapp/users-guide/camel/index.conf
index 982fc65..08ae15d 100644
--- a/src/main/webapp/users-guide/camel/index.conf
+++ b/src/main/webapp/users-guide/camel/index.conf
@@ -11,6 +11,10 @@
* 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].
