You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2012/07/20 22:09:32 UTC
svn commit: r1363930 - in /servicemix/documentation/trunk/src/main/webapp:
./ activemq/ architecture/ camel/ camel/deployment/ nmr/ users-guide/
users-guide/activemq/ users-guide/camel/ users-guide/camel/deployment/
users-guide/getting-started/ users-g...
Author: gertv
Date: Fri Jul 20 20:09:30 2012
New Revision: 1363930
URL: http://svn.apache.org/viewvc?rev=1363930&view=rev
Log:
Flatten documentation hierarchy
Added:
servicemix/documentation/trunk/src/main/webapp/activemq/
servicemix/documentation/trunk/src/main/webapp/activemq/activemq-camel-example.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/activemq/activemq-camel-example.conf
servicemix/documentation/trunk/src/main/webapp/activemq/index.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/activemq/activemq-index.conf
servicemix/documentation/trunk/src/main/webapp/architecture/
servicemix/documentation/trunk/src/main/webapp/architecture/index.conf
servicemix/documentation/trunk/src/main/webapp/architecture/technology-selection.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf
servicemix/documentation/trunk/src/main/webapp/architecture/toc.ssp
servicemix/documentation/trunk/src/main/webapp/architecture/what-is-smx4.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/what-is-smx4.conf
servicemix/documentation/trunk/src/main/webapp/camel/camel-guide.pdf.conf
servicemix/documentation/trunk/src/main/webapp/camel/deployment/
servicemix/documentation/trunk/src/main/webapp/camel/deployment/index.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/index.conf
servicemix/documentation/trunk/src/main/webapp/camel/deployment/osgi-bundle-blueprint.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-blueprint.conf
servicemix/documentation/trunk/src/main/webapp/camel/deployment/osgi-bundle-spring.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-spring.conf
servicemix/documentation/trunk/src/main/webapp/camel/deployment/plain-blueprint.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/plain-blueprint.conf
servicemix/documentation/trunk/src/main/webapp/camel/deployment/plain-spring.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/plain-spring.conf
servicemix/documentation/trunk/src/main/webapp/camel/index.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf
servicemix/documentation/trunk/src/main/webapp/camel/installing-components.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/installing-components.conf
servicemix/documentation/trunk/src/main/webapp/camel/toc.ssp
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/toc.ssp
servicemix/documentation/trunk/src/main/webapp/camel/troubleshooting.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/troubleshooting.conf
servicemix/documentation/trunk/src/main/webapp/nmr/index.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/index.conf
servicemix/documentation/trunk/src/main/webapp/nmr/nmr-camel.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-camel.conf
servicemix/documentation/trunk/src/main/webapp/nmr/nmr-event-listeners.conf
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-event-listeners.conf
servicemix/documentation/trunk/src/main/webapp/nmr/nmr-guide.pdf.conf
servicemix/documentation/trunk/src/main/webapp/nmr/toc.ssp
- copied, changed from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/toc.ssp
Removed:
servicemix/documentation/trunk/src/main/webapp/users-guide/activemq/activemq-camel-example.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/activemq/activemq-index.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/camel-guide.pdf.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/index.conf
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/deployment/plain-blueprint.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/plain-spring.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/installing-components.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/toc.ssp
servicemix/documentation/trunk/src/main/webapp/users-guide/camel/troubleshooting.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/discover.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/index.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/installation.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/manual.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/toc.ssp
servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/what-is-smx4.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/index.ssp
servicemix/documentation/trunk/src/main/webapp/users-guide/migration/index.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/migration/manual.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/migration/toc.ssp
servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/index.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-camel.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-event-listeners.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-guide.pdf.conf
servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/toc.ssp
Modified:
servicemix/documentation/trunk/src/main/webapp/index.ssp
Copied: servicemix/documentation/trunk/src/main/webapp/activemq/activemq-camel-example.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/activemq/activemq-camel-example.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/activemq/activemq-camel-example.conf?p2=servicemix/documentation/trunk/src/main/webapp/activemq/activemq-camel-example.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/activemq/activemq-camel-example.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Copied: servicemix/documentation/trunk/src/main/webapp/activemq/index.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/activemq/activemq-index.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/activemq/index.conf?p2=servicemix/documentation/trunk/src/main/webapp/activemq/index.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/activemq/activemq-index.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Added: servicemix/documentation/trunk/src/main/webapp/architecture/index.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/architecture/index.conf?rev=1363930&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/architecture/index.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/architecture/index.conf Fri Jul 20 20:09:30 2012
@@ -0,0 +1,5 @@
+Apache ServiceMix consists of a lot of different components and other Apache projects. This guide will explain you how
+to use all of these technologies combined and how to select the right components for your own problem or project.
+
+* [What is (in) Apache ServiceMix 4|what-is-smx4]
+* [Technology selection guidelines|technology-selection]
\ No newline at end of file
Copied: servicemix/documentation/trunk/src/main/webapp/architecture/technology-selection.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/architecture/technology-selection.conf?p2=servicemix/documentation/trunk/src/main/webapp/architecture/technology-selection.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Added: servicemix/documentation/trunk/src/main/webapp/architecture/toc.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/architecture/toc.ssp?rev=1363930&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/architecture/toc.ssp (added)
+++ servicemix/documentation/trunk/src/main/webapp/architecture/toc.ssp Fri Jul 20 20:09:30 2012
@@ -0,0 +1,11 @@
+<ul>
+ <li id="introduction">
+ <a href="${uri("/architecture/index.html")}">Introduction</a>
+ </li>
+ <li id="what-is-smx4">
+ <a href="${uri("/architecture/what-is-smx4.html")}">What is (in) Apache ServiceMix?</a>
+ </li>
+ <li id="basic-commands">
+ <a href="${uri("/architecture/technology-selection.html")}">Technology selection guidelines</a>
+ </li>
+</ul>
\ No newline at end of file
Copied: servicemix/documentation/trunk/src/main/webapp/architecture/what-is-smx4.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/what-is-smx4.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/architecture/what-is-smx4.conf?p2=servicemix/documentation/trunk/src/main/webapp/architecture/what-is-smx4.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/what-is-smx4.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Added: servicemix/documentation/trunk/src/main/webapp/camel/camel-guide.pdf.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/camel/camel-guide.pdf.conf?rev=1363930&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/camel/camel-guide.pdf.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/camel/camel-guide.pdf.conf Fri Jul 20 20:09:30 2012
@@ -0,0 +1,20 @@
+{attributes:layout=/WEB-INF/scalate/layouts/print.ssp}
+{attributes:title=Camel User Guide}
+
+h1. Introduction
+{include:camel/index.conf}
+
+h1. Deployment options
+{include:camel/deployment/index.conf}
+{include:camel/deployment/plain-spring.conf}
+{include:camel/deployment/plain-blueprint.conf}
+{include:camel/deployment/osgi-bundle-spring.conf}
+{include:camel/deployment/osgi-bundle-blueprint.conf}
+
+h1. Installing components
+{include:camel/installing-components.conf}
+
+h1. Troubleshooting
+{include:camel/troubleshooting.conf}
+
+
Copied: servicemix/documentation/trunk/src/main/webapp/camel/deployment/index.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/index.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/camel/deployment/index.conf?p2=servicemix/documentation/trunk/src/main/webapp/camel/deployment/index.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/index.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Copied: servicemix/documentation/trunk/src/main/webapp/camel/deployment/osgi-bundle-blueprint.conf (from r1344761, 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/camel/deployment/osgi-bundle-blueprint.conf?p2=servicemix/documentation/trunk/src/main/webapp/camel/deployment/osgi-bundle-blueprint.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-blueprint.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Copied: servicemix/documentation/trunk/src/main/webapp/camel/deployment/osgi-bundle-spring.conf (from r1344761, 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/camel/deployment/osgi-bundle-spring.conf?p2=servicemix/documentation/trunk/src/main/webapp/camel/deployment/osgi-bundle-spring.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/osgi-bundle-spring.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Copied: servicemix/documentation/trunk/src/main/webapp/camel/deployment/plain-blueprint.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/plain-blueprint.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/camel/deployment/plain-blueprint.conf?p2=servicemix/documentation/trunk/src/main/webapp/camel/deployment/plain-blueprint.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/plain-blueprint.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Copied: servicemix/documentation/trunk/src/main/webapp/camel/deployment/plain-spring.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/plain-spring.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/camel/deployment/plain-spring.conf?p2=servicemix/documentation/trunk/src/main/webapp/camel/deployment/plain-spring.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/camel/deployment/plain-spring.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Copied: servicemix/documentation/trunk/src/main/webapp/camel/index.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/camel/index.conf?p2=servicemix/documentation/trunk/src/main/webapp/camel/index.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/camel/index.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Copied: servicemix/documentation/trunk/src/main/webapp/camel/installing-components.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/installing-components.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/camel/installing-components.conf?p2=servicemix/documentation/trunk/src/main/webapp/camel/installing-components.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/camel/installing-components.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Copied: servicemix/documentation/trunk/src/main/webapp/camel/toc.ssp (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/toc.ssp)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/camel/toc.ssp?p2=servicemix/documentation/trunk/src/main/webapp/camel/toc.ssp&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/camel/toc.ssp&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Copied: servicemix/documentation/trunk/src/main/webapp/camel/troubleshooting.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/camel/troubleshooting.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/camel/troubleshooting.conf?p2=servicemix/documentation/trunk/src/main/webapp/camel/troubleshooting.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/camel/troubleshooting.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Modified: servicemix/documentation/trunk/src/main/webapp/index.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/index.ssp?rev=1363930&r1=1363929&r2=1363930&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/index.ssp (original)
+++ servicemix/documentation/trunk/src/main/webapp/index.ssp Fri Jul 20 20:09:30 2012
@@ -20,18 +20,58 @@
</div>
<div class="left">
- <a href="users-guide/index.html">
- <h2>User Guides</h2>
+ <a href="architecture/index.html">
+ <h2>Architecture Guide</h2>
</a>
</div>
<div class="right">
- <p>Guides explaining all of the features and components in Apache ServiceMix.</p>
+ <p>Apache ServiceMix contains a lot of different components and it embeds a lot of other Apache projects. This architecture guide will help you select and configure the right components when building your own solution.</p>
+</div>
+
+<div class="left">
+ <a href="activemq/index.html">
+ <h2>ActiveMQ Guide</h2>
+ </a>
+</div>
+
+<div class="right">
+ <p>Apache ServiceMix embeds Apache ActiveMQ to provide a JMS message broker that you can interact with from your Camel routes, providing support for message persistence, clustering, failover, ...</p>
+</div>
+
+<div class="left">
+ <a href="camel/index.html">
+ <h2>Camel Guide</h2>
+ </a>
+</div>
+
+<div class="right">
+ <p>Apache Camel is a core component of Apache ServiceMix. This guide will show you how to build and deploy Camel routes for Apache ServiceMix.</p>
+ <% if (sitegen(engine)) { %>
+ <div class="pdf">
+ <a href="camel/camel-guide.pdf" class="pdf">PDF document</a>
+ </div>
+ <% } %>
+</div>
+
+<div class="left">
+ <a href="nmr/index.html">
+ <h2>NMR Guide</h2>
+ </a>
+</div>
+
+<div class="right">
+ <p>The NMR is a lightweight mechanism for communicating between Camel routes and CXF endpoints. It also provides listener interfaces to learn about exchanges and endpoints at runtime.</p>
+ <% if (sitegen(engine)) { %>
+ <div class="pdf">
+ <a href="jbi/jbi-guide.pdf" class="pdf">PDF document</a>
+ </div>
+ <% } %>
</div>
<div class="left">
<a href="jbi/index.html">
- <h2>ServiceMix JBI Manual</h2>
+ <h2>JBI Guide</h2>
</a>
</div>
Copied: servicemix/documentation/trunk/src/main/webapp/nmr/index.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/index.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/nmr/index.conf?p2=servicemix/documentation/trunk/src/main/webapp/nmr/index.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/index.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Copied: servicemix/documentation/trunk/src/main/webapp/nmr/nmr-camel.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-camel.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/nmr/nmr-camel.conf?p2=servicemix/documentation/trunk/src/main/webapp/nmr/nmr-camel.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-camel.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Copied: servicemix/documentation/trunk/src/main/webapp/nmr/nmr-event-listeners.conf (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-event-listeners.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/nmr/nmr-event-listeners.conf?p2=servicemix/documentation/trunk/src/main/webapp/nmr/nmr-event-listeners.conf&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-event-listeners.conf&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)
Added: servicemix/documentation/trunk/src/main/webapp/nmr/nmr-guide.pdf.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/nmr/nmr-guide.pdf.conf?rev=1363930&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/nmr/nmr-guide.pdf.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/nmr/nmr-guide.pdf.conf Fri Jul 20 20:09:30 2012
@@ -0,0 +1,6 @@
+{attributes:layout=/WEB-INF/scalate/layouts/print.ssp}
+{attributes:title=Using the NMR}
+
+{include:nmr/index}
+{include:nmr/nmr-camel}
+{include:nmr/nmr-event-listeners}
\ No newline at end of file
Copied: servicemix/documentation/trunk/src/main/webapp/nmr/toc.ssp (from r1344761, servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/toc.ssp)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/nmr/toc.ssp?p2=servicemix/documentation/trunk/src/main/webapp/nmr/toc.ssp&p1=servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/toc.ssp&r1=1344761&r2=1363930&rev=1363930&view=diff
==============================================================================
(empty)