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/22 16:08:05 UTC

svn commit: r1026333 - in /servicemix/documentation/trunk: ./ src/main/ant/ src/main/webapp/ src/main/webapp/WEB-INF/scalate/layouts/ src/main/webapp/jbi/ src/main/webapp/jbi/components/ src/main/webapp/jbi/intro/ src/main/webapp/users-guide/ src/main/...

Author: gertv
Date: Fri Oct 22 14:08:04 2010
New Revision: 1026333

URL: http://svn.apache.org/viewvc?rev=1026333&view=rev
Log:
Move JBI guide into a separate 'document'

Added:
    servicemix/documentation/trunk/src/main/ant/
    servicemix/documentation/trunk/src/main/ant/generate-pdfs.xml
    servicemix/documentation/trunk/src/main/webapp/jbi/components/
    servicemix/documentation/trunk/src/main/webapp/jbi/components/index.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-bean.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-bean.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-camel.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-camel.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-cxf-bc.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-cxf-bc.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-cxf-se.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-cxf-se.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-drools.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-drools.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-eip.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-eip.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-file.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-file.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-ftp.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-ftp.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-http.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-http.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-jms.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-jms.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-mail.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-mail.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-osworkflow.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-osworkflow.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-quartz.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-quartz.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-saxon.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-saxon.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-scripting.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-scripting.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-snmp.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-snmp.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-validation.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-validation.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-vfs.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-vfs.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-wsn2005.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-wsn2005.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/components/servicemix-xmpp.conf
      - copied, changed from r1026332, servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-xmpp.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/index.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/intro/
    servicemix/documentation/trunk/src/main/webapp/jbi/intro/api.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/intro/meps.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/intro/what-is-jbi.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/jbi-guide.conf
    servicemix/documentation/trunk/src/main/webapp/jbi/toc.ssp
Removed:
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-bean.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-camel.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-cxf-bc.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-cxf-se.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-drools.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-eip.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-file.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-ftp.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-http.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-jms.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-mail.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-osworkflow.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-quartz.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-saxon.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-scripting.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-snmp.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-validation.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-vfs.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-wsn2005.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/jbi/servicemix-xmpp.conf
Modified:
    servicemix/documentation/trunk/pom.xml
    servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
    servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/print.ssp
    servicemix/documentation/trunk/src/main/webapp/index.ssp
    servicemix/documentation/trunk/src/main/webapp/users-guide/manual.conf
    servicemix/documentation/trunk/src/main/webapp/users-guide/toc.ssp

Modified: servicemix/documentation/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/pom.xml?rev=1026333&r1=1026332&r2=1026333&view=diff
==============================================================================
--- servicemix/documentation/trunk/pom.xml (original)
+++ servicemix/documentation/trunk/pom.xml Fri Oct 22 14:08:04 2010
@@ -261,6 +261,7 @@
           </instructions>
         </configuration>
       </plugin>
+      
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <version>1.2</version>
@@ -269,13 +270,8 @@
             <id>generate-pdf</id>
             <configuration>
               <tasks>
-                <echo message="Generating PDF using Prince XML (http://www.princexml.com/)"/>
-                <exec executable="prince">
-                  <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>
+                <ant antfile="${project.basedir}/src/main/ant/generate-pdfs.xml"
+                     dir="${project.basedir}"/>
             </tasks>
             </configuration>
             <goals>
@@ -304,6 +300,11 @@
                   <type>pdf</type>
                   <classifier>users-guide</classifier>
                 </artifact>
+                <artifact>
+                  <file>${project.build.directory}/sitegen/jbi/jbi-guide.pdf</file>
+                  <type>pdf</type>
+                  <classifier>jbi-guide</classifier>
+                </artifact>                
               </artifacts>
             </configuration>
           </execution>
@@ -323,5 +324,33 @@
     </profile>
   </profiles>
 
+  <!-- Scalate snapshots -->
+  <repositories>
+    <repository>
+      <id>fusesource.snapshots</id>
+      <url>http://repo.fusesource.com/nexus/content/groups/public-snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <!-- Scalate snapshots -->
+  <pluginRepositories>
+    <pluginRepository>
+      <id>fusesource.snapshots</id>
+      <url>http://repo.fusesource.com/nexus/content/groups/public-snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>      
+    </pluginRepository>
+  </pluginRepositories>
+
 </project>
 

Added: servicemix/documentation/trunk/src/main/ant/generate-pdfs.xml
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/ant/generate-pdfs.xml?rev=1026333&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/ant/generate-pdfs.xml (added)
+++ servicemix/documentation/trunk/src/main/ant/generate-pdfs.xml Fri Oct 22 14:08:04 2010
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2009-2010 the original author or authors.
+    See the notice.md file distributed with this work for additional
+    information regarding copyright ownership.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project name="generate-pdfs" default="all" basedir=".">
+
+  <property name="sitegen" value="${basedir}/target/sitegen"/>
+  <property name="target" value="${basedir}/target"/>
+
+  <macrodef name="prince">
+    <attribute name="document" />
+    <attribute name="input" default="${sitegen}/@{document}.html"/>
+    <attribute name="output" default="${sitegen}/@{document}.pdf"/>
+    <sequential>
+      <echo message="Running Prince XML (http://princexml.com) on @{input}" />
+      <exec executable="prince">
+        <arg value="@{input}" />
+        <arg value="@{output}" />
+        <arg value="--log"/>
+        <arg value="${target}/prince.log"/>
+      </exec>
+      <echo  message="Successfully created @{output}"/>      
+    </sequential>
+  </macrodef>
+
+  <target name="jbi" description="Generate the JBI Guide PDF">
+    <prince document="jbi/jbi-guide"/>
+  </target>
+
+  <target name="guide" description="Generate the User Guide PDF">
+    <prince document="users-guide/manual"/>
+  </target>
+
+  <target name="all" depends="jbi,guide" description="Generate all the PDF documents">
+    <!-- convenience target to generate all the PDFs -->
+  </target>
+
+</project>
\ No newline at end of file

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=1026333&r1=1026332&r2=1026333&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 Fri Oct 22 14:08:04 2010
@@ -18,6 +18,7 @@ limitations under the License.
 <%@ var body: String %>
 <%@ var title: String = "Apache ServiceMix ${servicemix.version}" %>
 <%@ var navigation: Boolean = true %>
+<% escapeMarkup = false %>
 <% import org.fusesource.scalate.servlet.ServletRenderContext._ %>
 <% import org.apache.servicemix.documentation.Helper._ %>
 <!DOCTYPE html>

Modified: servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/print.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/print.ssp?rev=1026333&r1=1026332&r2=1026333&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/print.ssp (original)
+++ servicemix/documentation/trunk/src/main/webapp/WEB-INF/scalate/layouts/print.ssp Fri Oct 22 14:08:04 2010
@@ -17,6 +17,7 @@ limitations under the License.
 --%>
 <%@ var body: String %>
 <%@ var title: String = "Apache ServiceMix ${servicemix.version}" %>
+<% escapeMarkup = false %>
 <!DOCTYPE html>
 <html>
 <head>

Modified: servicemix/documentation/trunk/src/main/webapp/index.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/index.ssp?rev=1026333&r1=1026332&r2=1026333&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/index.ssp (original)
+++ servicemix/documentation/trunk/src/main/webapp/index.ssp Fri Oct 22 14:08:04 2010
@@ -28,6 +28,20 @@
   <% } %>
 </div>
 
+<div class="left">
+  <a href="jbi/index.html">
+    <h2>ServiceMix<br/>JBI Manual</h2>
+  </a>
+</div>
+
+<div class="right">
+  Information about the JBI (Java Business Integration) support in Apache ServiceMix and a description for all the JBI components.
+  <% if (sitegen(engine)) { %>
+    <div class="pdf">
+      <a href="jbi/jbi-guide.pdf" class="pdf">PDF document</a>
+    </div>
+  <% } %>
+</div>
 
 <div class="left">
   <a href="karaf/index.html">

Added: servicemix/documentation/trunk/src/main/webapp/jbi/components/index.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/jbi/components/index.conf?rev=1026333&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/jbi/components/index.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/jbi/components/index.conf Fri Oct 22 14:08:04 2010
@@ -0,0 +1,26 @@
+h2. JBI Components
+ServiceMix 4 ships with a full set of JBI components.
+
+h3. Binding components
+* [servicemix-cxf-bc] for exposing and invoking all kinds of web services (WS-* as well as REST)
+* [servicemix-file] for reading and writing to the local file system
+* [servicemix-ftp] for reading and writing files on an FTP server
+* [servicemix-http] for sending and receiving messages using HTTP or SOAP/HTTP
+* [servicemix-jms] for sending and receiving messages using JMS or SOAP/JMS
+* [servicemix-mail] for sending and receiving messages using standard mail protocols (POP, IMAP, SMTP)
+* [servicemix-snmp]  provides support for receiving [SNMP|http://en.wikipedia.org/wiki/SNMP] events via the enterprise service bus by using the [SNMP4J|http://www.snmp4j.org/] library.
+* [servicemix-vfs] for sending and receiving files on any of the file system implementation supported by [Commons VFS|http://commons.apache.org/vfs]
+* [servicemix-xmpp] for sending and receiving messages using XMPP (Jabber)
+
+h3. Service Engines
+* [servicemix-bean] for using plain Java beans for handling messages
+* [servicemix-camel] leverages [Apache Camel|http://camel.apache.org] for EIP support and much more
+* [servicemix-cxf-se] uses [Apache CXF|http://cxf.apache.org] to build web service implementations
+* [servicemix-drools] allows for rule-based handling of messages using [Drools|http://www.jboss.org/drools]
+* [servicemix-eip] implements some of the EIP.  This component has been largely superseded by the [servicemix-camel] component
+* [servicemix-osworkflow] allows using [OSWorkflow|http://www.opensymphony.com/osworkflow/] for defining workflows to handle messages
+* [servicemix-quartz] uses [Quartz|http://www.quartz-scheduler.org/] to schedule new messages
+* [servicemix-saxon] uses [Saxon|http://www.saxonica.com/contact.html] to support XQuery and XSL-T
+* [servicemix-scripting] enables support for writing services in JSR-223 scripting languages
+* [servicemix-validation] provides schema validation of documents using JAXP 1.3 and XMLSchema or RelaxNG
+* [servicemix-wsn2005] implements the [WS Notification|http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsn] specification from Oasis
\ No newline at end of file

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Added: servicemix/documentation/trunk/src/main/webapp/jbi/index.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/jbi/index.conf?rev=1026333&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/jbi/index.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/jbi/index.conf Fri Oct 22 14:08:04 2010
@@ -0,0 +1,7 @@
+h1. Java Business Integration (JSR-208)
+This manual explains all about ServiceMix' support the JBI 1.0 specification.
+
+ServiceMix 4 ships with:
+- a JBI 1.0 container implementation
+- a set of JBI components
+- a JBI clustering engine
\ No newline at end of file

Added: servicemix/documentation/trunk/src/main/webapp/jbi/intro/api.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/jbi/intro/api.conf?rev=1026333&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/jbi/intro/api.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/jbi/intro/api.conf Fri Oct 22 14:08:04 2010
@@ -0,0 +1,2 @@
+h2. JBI API
+TODO: Describe the standard JBI API (MessageExchange, NormalizedMessage, ...)
\ No newline at end of file

Added: servicemix/documentation/trunk/src/main/webapp/jbi/intro/meps.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/jbi/intro/meps.conf?rev=1026333&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/jbi/intro/meps.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/jbi/intro/meps.conf Fri Oct 22 14:08:04 2010
@@ -0,0 +1,2 @@
+h2. Message Exchange Patterns
+TODO: Describe the four standard JBI MEPs
\ No newline at end of file

Added: servicemix/documentation/trunk/src/main/webapp/jbi/intro/what-is-jbi.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/jbi/intro/what-is-jbi.conf?rev=1026333&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/jbi/intro/what-is-jbi.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/jbi/intro/what-is-jbi.conf Fri Oct 22 14:08:04 2010
@@ -0,0 +1,2 @@
+h2. What is JBI?
+TODO: Describe what the JBI specification is all about
\ No newline at end of file

Added: servicemix/documentation/trunk/src/main/webapp/jbi/jbi-guide.conf
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/jbi/jbi-guide.conf?rev=1026333&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/jbi/jbi-guide.conf (added)
+++ servicemix/documentation/trunk/src/main/webapp/jbi/jbi-guide.conf Fri Oct 22 14:08:04 2010
@@ -0,0 +1,28 @@
+{attributes:layout=/WEB-INF/scalate/layouts/print.ssp}
+
+h1. Introduction to JBI
+{include:jbi/intro/what-is-jbi.conf}
+{include:jbi/intro/meps.conf}
+{include:jbi/intro/api.conf}
+
+h1. JBI Components
+{include:jbi/components/servicemix-bean.conf}
+{include:jbi/components/servicemix-camel.conf}
+{include:jbi/components/servicemix-cxf-bc.conf}
+{include:jbi/components/servicemix-cxf-se.conf}
+{include:jbi/components/servicemix-drools.conf}
+{include:jbi/components/servicemix-eip.conf}
+{include:jbi/components/servicemix-file.conf}
+{include:jbi/components/servicemix-ftp.conf}
+{include:jbi/components/servicemix-http.conf}
+{include:jbi/components/servicemix-jms.conf}
+{include:jbi/components/servicemix-mail.conf}
+{include:jbi/components/servicemix-osworkflow.conf}
+{include:jbi/components/servicemix-quartz.conf}
+{include:jbi/components/servicemix-saxon.conf}
+{include:jbi/components/servicemix-scripting.conf}
+{include:jbi/components/servicemix-snmp.conf}
+{include:jbi/components/servicemix-validation.conf}
+{include:jbi/components/servicemix-vfs.conf}
+{include:jbi/components/servicemix-wsn2005.conf}
+{include:jbi/components/servicemix-xmpp.conf}
\ No newline at end of file

Added: servicemix/documentation/trunk/src/main/webapp/jbi/toc.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/jbi/toc.ssp?rev=1026333&view=auto
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/jbi/toc.ssp (added)
+++ servicemix/documentation/trunk/src/main/webapp/jbi/toc.ssp Fri Oct 22 14:08:04 2010
@@ -0,0 +1,42 @@
+
+<ul>
+    <li id="jbi-introduction">
+        <a href="#">Introducing JBI</a>
+        <ul>
+            <li id="jbi-what-is-jbi">
+                <a href="${uri("/jbi/intro/what-is-jbi.html")}">What is JBI?</a>
+            </li>
+            <li id="jbi-meps">
+                <a href="${uri("/jbi/intro/meps.html")}">JBI MEPs</a>
+            </li>
+            <li id="jbi-api">
+                <a href="${uri("/jbi/intro/api.html")}">JBI API</a>
+            </li>
+        </ul>
+    </li>
+    <li id="jbi-components">
+        <a href="${uri("/jbi/components/index.html")}">JBI Components</a>
+        <ul>
+            <li id="servicemix-bean"><a href="${uri("/jbi/components/servicemix-bean.html")}">servicemix-bean</a></li>
+            <li id="servicemix-camel"><a href="${uri("/jbi/components/servicemix-camel.html")}">servicemix-camel</a></li>
+            <li id="servicemix-cxf-bc"><a href="${uri("/jbi/components/servicemix-cxf-bc.html")}">servicemix-cxf-bc</a></li>
+            <li id="servicemix-cxf-se"><a href="${uri("/jbi/components/servicemix-cxf-se.html")}">servicemix-cxf-se</a></li>
+            <li id="servicemix-drools"><a href="${uri("/jbi/components/servicemix-drools.html")}">servicemix-drools</a></li>
+            <li id="servicemix-eip"><a href="${uri("/jbi/components/servicemix-eip.html")}">servicemix-eip</a></li>
+            <li id="servicemix-file"><a href="${uri("/jbi/components/servicemix-file.html")}">servicemix-file</a></li>
+            <li id="servicemix-ftp"><a href="${uri("/jbi/components/servicemix-ftp.html")}">servicemix-ftp</a></li>
+            <li id="servicemix-http"><a href="${uri("/jbi/components/servicemix-http.html")}">servicemix-http</a></li>
+            <li id="servicemix-jms"><a href="${uri("/jbi/components/servicemix-jms.html")}">servicemix-jms</a></li>
+            <li id="servicemix-mail"><a href="${uri("/jbi/components/servicemix-mail.html")}">servicemix-mail</a></li>
+            <li id="servicemix-osworkflow"><a href="${uri("/jbi/components/servicemix-osworkflow.html")}">servicemix-osworkflow</a></li>
+            <li id="servicemix-quartz"><a href="${uri("/jbi/components/servicemix-quartz.html")}">servicemix-quartz</a></li>
+            <li id="servicemix-saxon"><a href="${uri("/jbi/components/servicemix-saxon.html")}">servicemix-saxon</a></li>
+            <li id="servicemix-scripting"><a href="${uri("/jbi/components/servicemix-scripting.html")}">servicemix-scripting</a></li>
+            <li id="servicemix-snmp"><a href="${uri("/jbi/components/servicemix-snmp.html")}">servicemix-snmp</a></li>
+            <li id="servicemix-validation"><a href="${uri("/jbi/components/servicemix-validation.html")}">servicemix-validation</a></li>
+            <li id="servicemix-vfs"><a href="${uri("/jbi/components/servicemix-vfs.html")}">servicemix-vfs</a></li>
+            <li id="servicemix-wsn2005"><a href="${uri("/jbi/components/servicemix-wsn2005.html")}">servicemix-wsn2005</a></li>
+            <li id="servicemix-xmpp"><a href="${uri("/jbi/components/servicemix-xmpp.html")}">servicemix-xmpp</a></li>
+        </ul>
+    </li>
+</ul>
\ No newline at end of file

Modified: 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=1026333&r1=1026332&r2=1026333&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/manual.conf (original)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/manual.conf Fri Oct 22 14:08:04 2010
@@ -15,29 +15,5 @@ h1. NMR
 {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}

Modified: servicemix/documentation/trunk/src/main/webapp/users-guide/toc.ssp
URL: http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/users-guide/toc.ssp?rev=1026333&r1=1026332&r2=1026333&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/users-guide/toc.ssp (original)
+++ servicemix/documentation/trunk/src/main/webapp/users-guide/toc.ssp Fri Oct 22 14:08:04 2010
@@ -22,31 +22,6 @@
             <li id="nmr-event-listeners"><a href="${uri("/users-guide/nmr/nmr-event-listeners.html")}">Event Listeners</a></li>
         </ul>
     </li>
-    <li id="jbi-components">
-        <a href="#">JBI Components</a>
-        <ul>
-            <li id="servicemix-bean"><a href="${uri("/users-guide/jbi/servicemix-bean.html")}">servicemix-bean</a></li>
-            <li id="servicemix-camel"><a href="${uri("/users-guide/jbi/servicemix-camel.html")}">servicemix-camel</a></li>
-            <li id="servicemix-cxf-bc"><a href="${uri("/users-guide/jbi/servicemix-cxf-bc.html")}">servicemix-cxf-bc</a></li>
-            <li id="servicemix-cxf-se"><a href="${uri("/users-guide/jbi/servicemix-cxf-se.html")}">servicemix-cxf-se</a></li>
-            <li id="servicemix-drools"><a href="${uri("/users-guide/jbi/servicemix-drools.html")}">servicemix-drools</a></li>
-            <li id="servicemix-eip"><a href="${uri("/users-guide/jbi/servicemix-eip.html")}">servicemix-eip</a></li>
-            <li id="servicemix-file"><a href="${uri("/users-guide/jbi/servicemix-file.html")}">servicemix-file</a></li>
-            <li id="servicemix-ftp"><a href="${uri("/users-guide/jbi/servicemix-ftp.html")}">servicemix-ftp</a></li>
-            <li id="servicemix-http"><a href="${uri("/users-guide/jbi/servicemix-http.html")}">servicemix-http</a></li>
-            <li id="servicemix-jms"><a href="${uri("/users-guide/jbi/servicemix-jms.html")}">servicemix-jms</a></li>
-            <li id="servicemix-mail"><a href="${uri("/users-guide/jbi/servicemix-mail.html")}">servicemix-mail</a></li>
-            <li id="servicemix-osworkflow"><a href="${uri("/users-guide/jbi/servicemix-osworkflow.html")}">servicemix-osworkflow</a></li>
-            <li id="servicemix-quartz"><a href="${uri("/users-guide/jbi/servicemix-quartz.html")}">servicemix-quartz</a></li>
-            <li id="servicemix-saxon"><a href="${uri("/users-guide/jbi/servicemix-saxon.html")}">servicemix-saxon</a></li>
-            <li id="servicemix-scripting"><a href="${uri("/users-guide/jbi/servicemix-scripting.html")}">servicemix-scripting</a></li>
-            <li id="servicemix-snmp"><a href="${uri("/users-guide/jbi/servicemix-snmp.html")}">servicemix-snmp</a></li>
-            <li id="servicemix-validation"><a href="${uri("/users-guide/jbi/servicemix-validation.html")}">servicemix-validation</a></li>
-            <li id="servicemix-vfs"><a href="${uri("/users-guide/jbi/servicemix-vfs.html")}">servicemix-vfs</a></li>
-            <li id="servicemix-wsn2005"><a href="${uri("/users-guide/jbi/servicemix-wsn2005.html")}">servicemix-wsn2005</a></li>
-            <li id="servicemix-xmpp"><a href="${uri("/users-guide/jbi/servicemix-xmpp.html")}">servicemix-xmpp</a></li>
-        </ul>
-    </li>
     <li id="appendices">
         <a href="#">Appendices</a>
         <ul>