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 2010/10/18 09:45:28 UTC

svn commit: r1023675 - in /servicemix/documentation/trunk: ./ src/main/webapp/ src/main/webapp/WEB-INF/scalate/layouts/ src/main/webapp/appendices/ src/main/webapp/camel/ src/main/webapp/getting-started/ src/main/webapp/jbi/ src/main/webapp/nmr/ src/ma...

Author: gertv
Date: Mon Oct 18 07:45:26 2010
New Revision: 1023675

URL: http://svn.apache.org/viewvc?rev=1023675&view=rev
Log:
Allow Karaf manual contents to be included

Added:
    servicemix/documentation/trunk/src/main/webapp/index.ssp
    servicemix/documentation/trunk/src/main/webapp/users-guide/
    servicemix/documentation/trunk/src/main/webapp/users-guide/appendices/
    servicemix/documentation/trunk/src/main/webapp/users-guide/appendices/migration.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/appendices/migration.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/camel/
    servicemix/documentation/trunk/src/main/webapp/users-guide/camel/camel-deployment.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/camel/camel-deployment.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/camel/camel-index.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/camel/camel-index.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/
    servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/discover.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/getting-started/discover.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/installation.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/getting-started/installation.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/getting-started/technology-selection.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/what-is-smx4.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/getting-started/what-is-smx4.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/index.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/index.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-bean.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-bean.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-camel.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-camel.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-cxf-bc.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-cxf-bc.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-cxf-se.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-cxf-se.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-drools.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-drools.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-eip.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-eip.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-file.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-file.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-ftp.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-ftp.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-http.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-http.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-jms.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-jms.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-mail.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-mail.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-osworkflow.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-osworkflow.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-quartz.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-quartz.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-saxon.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-saxon.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-scripting.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-scripting.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-snmp.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-snmp.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-validation.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-validation.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-vfs.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-vfs.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-wsn2005.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-wsn2005.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-xmpp.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-xmpp.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/manual.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/
    servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-camel.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/nmr/nmr-camel.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-event-listeners.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/nmr/nmr-event-listeners.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-index.conf
      - copied, changed from r1023674, servicemix/documentation/trunk/src/main/webapp/nmr/nmr-index.conf
Removed:
    servicemix/documentation/trunk/src/main/webapp/appendices/migration.conf
    servicemix/documentation/trunk/src/main/webapp/camel/camel-deployment.conf
    servicemix/documentation/trunk/src/main/webapp/camel/camel-index.conf
    servicemix/documentation/trunk/src/main/webapp/getting-started/discover.conf
    servicemix/documentation/trunk/src/main/webapp/getting-started/installation.conf
    servicemix/documentation/trunk/src/main/webapp/getting-started/technology-selection.conf
    servicemix/documentation/trunk/src/main/webapp/getting-started/what-is-smx4.conf
    servicemix/documentation/trunk/src/main/webapp/index.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-bean.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-camel.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-cxf-bc.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-cxf-se.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-drools.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-eip.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-file.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-ftp.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-http.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-jms.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-mail.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-osworkflow.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-quartz.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-saxon.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-scripting.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-snmp.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-validation.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-vfs.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-wsn2005.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-xmpp.conf
    servicemix/documentation/trunk/src/main/webapp/manual.conf
    servicemix/documentation/trunk/src/main/webapp/nmr/nmr-camel.conf
    servicemix/documentation/trunk/src/main/webapp/nmr/nmr-event-listeners.conf
    servicemix/documentation/trunk/src/main/webapp/nmr/nmr-index.conf
Modified:
    servicemix/documentation/trunk/pom.xml
    servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp

Modified: servicemix/documentation/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/pom.xml?rev=1023675&r1=1023674&r2=1023675&view=diff
==============================================================================
--- servicemix/documentation/trunk/pom.xml (original)
+++ servicemix/documentation/trunk/pom.xml Mon Oct 18 07:45:26 2010
@@ -86,6 +86,33 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>src-dependencies</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <!-- use copy-dependencies instead if you don't want to explode the sources -->
+              <goal>unpack</goal>
+            </goals>
+           <configuration>
+          <artifactItems>
+            <artifactItem>
+              <groupId>org.fusesource.doc</groupId>
+              <artifactId>karaf</artifactId>
+              <version>2.1.99-SNAPSHOT</version>
+              <type>war</type>
+              <outputDirectory>${project.build.directory}/webapp/karaf</outputDirectory>
+              <includes>commands/*.conf,developers-guide/*.conf,users-guide/*.conf</includes>
+            </artifactItem>
+          </artifactItems>
+
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
           <execution>
@@ -199,8 +226,8 @@
               <tasks>
                 <echo message="Generating PDF using Prince XML (http://www.princexml.com/)"/>
                 <exec executable="prince">
-                  <arg value="${project.build.directory}/sitegen/manual.html" />
-                  <arg value="${project.build.directory}/sitegen/manual.pdf" />
+                  <arg value="${project.build.directory}/sitegen/users-guide/manual.html" />
+                  <arg value="${project.build.directory}/sitegen/users-guide/manual.pdf" />
                   <arg value="--log"/>
                   <arg value="${project.build.directory}/prince.log"/>
                 </exec>
@@ -228,8 +255,9 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>${project.build.directory}/sitegen/manual.pdf</file>
+                  <file>${project.build.directory}/sitegen/users-guide/users-guide.pdf</file>
                   <type>pdf</type>
+                  <classifier>users-guide</classifier>
                 </artifact>
               </artifacts>
             </configuration>

Modified: servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp?rev=1023675&r1=1023674&r2=1023675&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp (original)
+++ servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp Mon Oct 18 07:45:26 2010
@@ -17,6 +17,7 @@ limitations under the License.
 --%>
 <%@ var body: String %>
 <%@ var title: String = "Apache ServiceMix ${servicemix.version}" %>
+<%@ var navigation: Boolean = true %>
 <!DOCTYPE html>
 <html>
 <head>
@@ -49,12 +50,13 @@ limitations under the License.
 
 
     <div id="main">
+      <% if (navigation) { %>
       <nav>
         <div id="navigation">
             ${include("/toc.ssp")}
         </div>
-
       </nav>
+      <% } %>
 
       <div id="body">
         <%= body %>

Added: servicemix/documentation/trunk/src/main/webapp/index.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/index.ssp?rev=1023675&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/index.ssp (added)
+++ servicemix/documentation/trunk/src/main/webapp/index.ssp Mon Oct 18 07:45:26 2010
@@ -0,0 +1,10 @@
+<% attributes("navigation") = false %>
+<h1>Welcome to the Apache ServiceMix documentation</h1>
+
+If you're new to Apache ServiceMix, we recommend you start here
+
+<h2>Related projects' reference manuals</h2>
+<ul>
+  <li><a href="karaf/users-guide">Karaf Users' Guide</a></li>
+  <li><a href="karaf/developers-guide">Karaf Developers' Guide</a></li>
+</ul>
\ No newline at end of file

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/appendices/migration.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/appendices/migration.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/appendices/migration.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/appendices/migration.conf&p1=servicemix/documentation/trunk/src/main/webapp/appendices/migration.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/camel/camel-deployment.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/camel/camel-deployment.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/camel/camel-deployment.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/camel/camel-deployment.conf&p1=servicemix/documentation/trunk/src/main/webapp/camel/camel-deployment.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/camel/camel-index.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/camel/camel-index.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/camel/camel-index.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/camel/camel-index.conf&p1=servicemix/documentation/trunk/src/main/webapp/camel/camel-index.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/discover.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/getting-started/discover.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/discover.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/discover.conf&p1=servicemix/documentation/trunk/src/main/webapp/getting-started/discover.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/installation.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/getting-started/installation.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/installation.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/installation.conf&p1=servicemix/documentation/trunk/src/main/webapp/getting-started/installation.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/getting-started/technology-selection.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/technology-selection.conf&p1=servicemix/documentation/trunk/src/main/webapp/getting-started/technology-selection.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/what-is-smx4.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/getting-started/what-is-smx4.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/what-is-smx4.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/getting-started/what-is-smx4.conf&p1=servicemix/documentation/trunk/src/main/webapp/getting-started/what-is-smx4.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/index.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/index.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/index.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/index.conf&p1=servicemix/documentation/trunk/src/main/webapp/index.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-bean.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-bean.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-bean.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-bean.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-bean.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-camel.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-camel.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-camel.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-camel.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-camel.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-cxf-bc.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-cxf-bc.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-cxf-bc.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-cxf-bc.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-cxf-bc.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-cxf-se.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-cxf-se.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-cxf-se.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-cxf-se.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-cxf-se.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-drools.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-drools.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-drools.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-drools.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-drools.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-eip.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-eip.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-eip.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-eip.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-eip.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-file.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-file.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-file.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-file.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-file.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-ftp.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-ftp.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-ftp.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-ftp.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-ftp.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-http.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-http.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-http.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-http.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-http.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-jms.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-jms.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-jms.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-jms.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-jms.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-mail.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-mail.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-mail.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-mail.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-mail.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-osworkflow.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-osworkflow.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-osworkflow.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-osworkflow.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-osworkflow.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-quartz.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-quartz.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-quartz.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-quartz.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-quartz.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-saxon.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-saxon.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-saxon.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-saxon.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-saxon.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-scripting.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-scripting.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-scripting.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-scripting.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-scripting.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-snmp.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-snmp.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-snmp.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-snmp.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-snmp.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-validation.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-validation.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-validation.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-validation.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-validation.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-vfs.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-vfs.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-vfs.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-vfs.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-vfs.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-wsn2005.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-wsn2005.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-wsn2005.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-wsn2005.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-wsn2005.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-xmpp.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-xmpp.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-xmpp.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-xmpp.conf&p1=servicemix/documentation/trunk/src/main/webapp/jbi/servicemix-xmpp.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Added: servicemix/documentation/trunk/src/main/webapp/users-guide/manual.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/manual.conf?rev=1023675&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/manual.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/manual.conf Mon Oct 18 07:45:26 2010
@@ -0,0 +1,43 @@
+{attributes:layout=/WEB-INF/scalate/layouts/print.ssp}
+
+h1. Getting started
+{include:users-guide/getting-started/what-is-smx4.conf}
+{include:users-guide/getting-started/installation.conf}
+{include:users-guide/getting-started/discover.conf}
+{include:users-guide/getting-started/technology-selection.conf}
+
+h1. Camel
+{include:users-guide/camel/camel-index.conf}
+{include:users-guide/camel/camel-deployment.conf}
+
+h1. NMR
+{include:users-guide/nmr-index}
+{include:users-guide/nmr-camel}
+{include:users-guide/nmr-event-listeners}
+
+h1. JBI
+
+h1. JBI Component Reference
+{include:users-guide/jbi/servicemix-bean.conf}
+{include:users-guide/jbi/servicemix-camel.conf}
+{include:users-guide/jbi/servicemix-cxf-bc.conf}
+{include:users-guide/jbi/servicemix-cxf-se.conf}
+{include:users-guide/jbi/servicemix-drools.conf}
+{include:users-guide/jbi/servicemix-eip.conf}
+{include:users-guide/jbi/servicemix-file.conf}
+{include:users-guide/jbi/servicemix-ftp.conf}
+{include:users-guide/jbi/servicemix-http.conf}
+{include:users-guide/jbi/servicemix-jms.conf}
+{include:users-guide/jbi/servicemix-mail.conf}
+{include:users-guide/jbi/servicemix-osworkflow.conf}
+{include:users-guide/jbi/servicemix-quartz.conf}
+{include:users-guide/jbi/servicemix-saxon.conf}
+{include:users-guide/jbi/servicemix-scripting.conf}
+{include:users-guide/jbi/servicemix-snmp.conf}
+{include:users-guide/jbi/servicemix-validation.conf}
+{include:users-guide/jbi/servicemix-vfs.conf}
+{include:users-guide/jbi/servicemix-wsn2005.conf}
+{include:users-guide/jbi/servicemix-xmpp.conf}
+
+h1. Appendices
+{include:users-guide/appendices/migration.conf}

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-camel.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/nmr/nmr-camel.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-camel.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-camel.conf&p1=servicemix/documentation/trunk/src/main/webapp/nmr/nmr-camel.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-event-listeners.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/nmr/nmr-event-listeners.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-event-listeners.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-event-listeners.conf&p1=servicemix/documentation/trunk/src/main/webapp/nmr/nmr-event-listeners.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)

Copied: servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-index.conf (from r1023674, servicemix/documentation/trunk/src/main/webapp/nmr/nmr-index.conf)
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-index.conf?p2=servicemix/documentation/trunk/src/main/webapp/users-guide/nmr/nmr-index.conf&p1=servicemix/documentation/trunk/src/main/webapp/nmr/nmr-index.conf&r1=1023674&r2=1023675&rev=1023675&view=diff
==============================================================================
    (empty)