You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bu...@apache.org on 2013/09/23 17:19:39 UTC

svn commit: r879599 [1/2] - in /websites/production/camel/content: book-architecture.html book-in-one-page.html cache/main.pageCache component-list.html components.html transport.html uris.html

Author: buildbot
Date: Mon Sep 23 15:19:39 2013
New Revision: 879599

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/book-architecture.html
    websites/production/camel/content/book-in-one-page.html
    websites/production/camel/content/cache/main.pageCache
    websites/production/camel/content/component-list.html
    websites/production/camel/content/components.html
    websites/production/camel/content/transport.html
    websites/production/camel/content/uris.html

Modified: websites/production/camel/content/book-architecture.html
==============================================================================
--- websites/production/camel/content/book-architecture.html (original)
+++ websites/production/camel/content/book-architecture.html Mon Sep 23 15:19:39 2013
@@ -165,17 +165,17 @@ aws-ses://from[?<options>]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For working with <a shape="rect" class="external-link" href="http://aws.amazon.com/ses/" rel="nofollow">Amazon's Simple Email Service (SES)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="aws-sns.html" title="AWS-SNS">AWS-SNS</a> / <a shape="rect" href="aws.html" title="AWS">camel-aws</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-aws-sns://topicname[?&lt;options&gt;]
+aws-sns://topicName[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For Messaging with <a shape="rect" class="external-link" href="http://aws.amazon.com/sns/" rel="nofollow">Amazon's Simple Notification Service (SNS)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="aws-sqs.html" title="AWS-SQS">AWS-SQS</a> / <a shape="rect" href="aws.html" title="AWS">camel-aws</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-aws-sqs://queuename[?&lt;options&gt;]
+aws-sqs://queueName[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For Messaging with <a shape="rect" class="external-link" href="http://aws.amazon.com/sqs/" rel="nofollow">Amazon's Simple Queue Service (SQS)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="aws-s3.html" title="AWS-S3">AWS-S3</a> / <a shape="rect" href="aws.html" title="AWS">camel-aws</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-aws-s3://bucketname[?&lt;options&gt;]
+aws-s3://bucketName[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For working with <a shape="rect" class="external-link" href="http://aws.amazon.com/s3/" rel="nofollow">Amazon's Simple Storage Service (S3)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="bean.html" title="Bean">Bean</a> / camel-core
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -275,10 +275,14 @@ dns:operation[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To lookup domain information and run DNS queries using <a shape="rect" class="external-link" href="http://www.xbill.org/dnsjava/" rel="nofollow">DNSJava</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="disruptor.html" title="Disruptor">Disruptor</a> / camel-disruptor
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-disruptor:someName[?&lt;option&gt;]
 disruptor-vm:someName[?&lt;option&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To provide the implementation of <a shape="rect" href="seda.html" title="SEDA">SEDA</a> which is based on <a shape="rect" class="external-link" href="https://github.com/LMAX-Exchange/disruptor" rel="nofollow">disruptor</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="ejb.html" title="EJB">EJB</a> / camel-ejb
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To provide the implementation of <a shape="rect" href="seda.html" title="SEDA">SEDA</a> which is based on <a shape="rect" class="external-link" href="https://github.com/LMAX-Exchange/disruptor" rel="nofollow">disruptor</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[Disruptor VM]</span> / camel-disruptor
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+disruptor-vm:someName[?&lt;option&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="ejb.html" title="EJB">EJB</a> / camel-ejb
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 ejb:ejbName[?&lt;options&gt;]
@@ -306,7 +310,7 @@ exec://executable[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For executing system commands </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="facebook.html" title="Facebook">Facebook</a> / camel-facebook
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-facebook://[endpoint]?[options]
+facebook://endpoint[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Providing access to all of the Facebook APIs accessible using <a shape="rect" class="external-link" href="http://facebook4j.org/en/index.html" rel="nofollow">Facebook4J</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="file2.html" title="File2">File</a> / camel-core
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -361,8 +365,7 @@ gtask://queue-name[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Supports asynchronous message processing on Google App Engine by using the <a shape="rect" class="external-link" href="http://code.google.com/appengine/docs/java/taskqueue/" rel="nofollow">task queueing service</a> as message queue. See also <a shape="rect" href="gae.html" title="GAE">Camel Components for Google App Engine</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="gmail.html" title="gmail">GMail</a> / <a shape="rect" href="gae.html" title="GAE">camel-gae</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-gmail://user@gmail.com[?&lt;options&gt;]
-gmail://user@googlemail.com[?&lt;options&gt;]
+gmail://user@g[oogle]mail.com[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Supports sending of emails via the <a shape="rect" class="external-link" href="http://code.google.com/appengine/docs/java/mail/" rel="nofollow">mail service</a> of Google App Engine. See also <a shape="rect" href="gae.html" title="GAE">Camel Components for Google App Engine</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="geocoder.html" title="Geocoder">Geocoder</a> / camel-geocoder
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -402,7 +405,7 @@ http:hostName[:port][/resourceUri][?&lt;
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For calling out to external HTTP servers using Apache HTTP Client 3.x </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="http4.html" title="HTTP4">HTTP4</a> / camel-http4
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-http4:hostName[:port][/resourceUri]
+http4:hostName[:port][/resourceUri][?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For calling out to external HTTP servers using Apache HTTP Client 4.x </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="ibatis.html" title="iBATIS">iBATIS</a> / camel-ibatis
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -413,9 +416,13 @@ ibatis://statementName[?&lt;options&gt;]
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 imap://[username@]hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Internet_Message_Access_Protocol" rel="nofollow">IMAP</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">IMAPS</a> / camel-mail
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 imaps://[username@]hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Internet_Message_Access_Protocol" rel="nofollow">IMAP</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="irc.html" title="IRC">IRC</a> / camel-irc
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="irc.html" title="IRC">IRC</a> / camel-irc
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 irc:[login@]hostName[:port]/#room[?&lt;options&gt;]
@@ -568,10 +575,14 @@ paxlogging:appender
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving Pax-Logging events in OSGi </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">POP</a> / camel-mail
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-pop3://[username@]hostName port][?&lt;options&gt;]
 pop3s://[username@]hostName port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using POP3 and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="printer.html" title="Printer">Printer</a> / camel-printer
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using POP3 and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">POP</a> / camel-mail
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+pop3s://[username@]hostName port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="printer.html" title="Printer">Printer</a> / camel-printer
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 lpr://host:port/path/to/printer[?&lt;options&gt;]
@@ -586,7 +597,7 @@ properties://key[?&lt;options&gt;]
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 quartz://groupName/timerName[?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Provides a scheduled delivery of messages using the <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/" rel="nofollow">Quartz 1.x scheduler</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="quartz2.html" title="Quartz2">Quartz2</a> / camel-quartz2<span class="error">[?options]</span>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Provides a scheduled delivery of messages using the <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/" rel="nofollow">Quartz 1.x scheduler</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="quartz2.html" title="Quartz2">Quartz2</a> / camel-quartz2
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 quartz2://groupName/timerName[?&lt;options&gt;]
@@ -594,8 +605,7 @@ quartz2://groupName/timerName[?&lt;optio
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Provides a scheduled delivery of messages using the <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/" rel="nofollow">Quartz 2.x scheduler</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="quickfix.html" title="Quickfix">Quickfix</a> / camel-quickfix
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-quickfix-server:configFile[?&lt;options&gt;]
-quickfix-client:configFile[?&lt;options&gt;]
+quickfix:configFile[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Implementation of the QuickFix for Java engine which allow to send/receive <a shape="rect" class="external-link" href="http://www.fixprotocol.org" rel="nofollow">FIX</a> messages </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="rabbitmq.html" title="RabbitMQ">RabbitMQ</a> / camel-rabbitmq
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -666,9 +676,13 @@ sftp://[username@]hostName[:port]/direct
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 sip://user@hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Publish/Subscribe communication capability using the Telecom SIP protocol. <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc3903.txt" rel="nofollow">RFC3903 - Session Initiation Protocol (SIP) Extension for Event</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[SIPS]</span> / camel-sip
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 sips://user@hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Publish/Subscribe communication capability using the Telecom SIP protocol. <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc3903.txt" rel="nofollow">RFC3903 - Session Initiation Protocol (SIP) Extension for Event</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="sjms.html" title="SJMS">SJMS</a> / camel-sjms
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="sjms.html" title="SJMS">SJMS</a> / camel-sjms
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 sjms:[queue:|topic:]destinationName[?&lt;options&gt;]
@@ -676,16 +690,24 @@ sjms:[queue:|topic:]destinationName[?&lt
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> A ground up implementation of a JMS client </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">SMTP</a> / camel-mail
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-smtp://[username@]hostName[:port][?&lt;options&gt;]
 smtps://[username@]hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sending email using SMTP and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="smpp.html" title="SMPP">SMPP</a> / camel-smpp
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sending email using SMTP and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">SMTP</a> / camel-mail
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-smpp[s]://[username@]hostName[:port][?&lt;options&gt;]
-
+smtps://[username@]hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="smpp.html" title="SMPP">SMPP</a> / camel-smpp
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+smpp://[username@]hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To send and receive SMS using Short Messaging Service Center using the <a shape="rect" class="external-link" href="http://code.google.com/p/jsmpp/" rel="nofollow">JSMPP library</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[SMPPS]</span> / camel-smpp
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+smpps://[username@]hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To send and receive SMS using Short Messaging Service Center using the <a shape="rect" class="external-link" href="http://code.google.com/p/jsmpp/" rel="nofollow">JSMPP library</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="snmp.html" title="SNMP">SNMP</a> / camel-snmp
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="snmp.html" title="SNMP">SNMP</a> / camel-snmp
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 snmp://hostName[:port][?&lt;options&gt;]
@@ -834,7 +856,7 @@ xslt:templateName[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Generates a response using an <a shape="rect" class="external-link" href="http://www.w3.org/TR/xslt" rel="nofollow">XSLT</a> template </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="yammer.html" title="Yammer">Yammer</a> / camel-yammer
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-yammer://function[?options]
+yammer://function[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Allows you to interact with the <a shape="rect" class="external-link" href="http://yammer.com" rel="nofollow">Yammer</a> enterprise social network </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="zookeeper.html" title="Zookeeper">Zookeeper</a> / camel-zookeeper
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">

Modified: websites/production/camel/content/book-in-one-page.html
==============================================================================
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Mon Sep 23 15:19:39 2013
@@ -579,17 +579,17 @@ aws-ses://from[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For working with <a shape="rect" class="external-link" href="http://aws.amazon.com/ses/" rel="nofollow">Amazon's Simple Email Service (SES)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="aws-sns.html" title="AWS-SNS">AWS-SNS</a> / <a shape="rect" href="aws.html" title="AWS">camel-aws</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-aws-sns://topicname[?&lt;options&gt;]
+aws-sns://topicName[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For Messaging with <a shape="rect" class="external-link" href="http://aws.amazon.com/sns/" rel="nofollow">Amazon's Simple Notification Service (SNS)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="aws-sqs.html" title="AWS-SQS">AWS-SQS</a> / <a shape="rect" href="aws.html" title="AWS">camel-aws</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-aws-sqs://queuename[?&lt;options&gt;]
+aws-sqs://queueName[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For Messaging with <a shape="rect" class="external-link" href="http://aws.amazon.com/sqs/" rel="nofollow">Amazon's Simple Queue Service (SQS)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="aws-s3.html" title="AWS-S3">AWS-S3</a> / <a shape="rect" href="aws.html" title="AWS">camel-aws</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-aws-s3://bucketname[?&lt;options&gt;]
+aws-s3://bucketName[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For working with <a shape="rect" class="external-link" href="http://aws.amazon.com/s3/" rel="nofollow">Amazon's Simple Storage Service (S3)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="bean.html" title="Bean">Bean</a> / camel-core
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -689,10 +689,14 @@ dns:operation[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To lookup domain information and run DNS queries using <a shape="rect" class="external-link" href="http://www.xbill.org/dnsjava/" rel="nofollow">DNSJava</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="disruptor.html" title="Disruptor">Disruptor</a> / camel-disruptor
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-disruptor:someName[?&lt;option&gt;]
 disruptor-vm:someName[?&lt;option&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To provide the implementation of <a shape="rect" href="seda.html" title="SEDA">SEDA</a> which is based on <a shape="rect" class="external-link" href="https://github.com/LMAX-Exchange/disruptor" rel="nofollow">disruptor</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="ejb.html" title="EJB">EJB</a> / camel-ejb
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To provide the implementation of <a shape="rect" href="seda.html" title="SEDA">SEDA</a> which is based on <a shape="rect" class="external-link" href="https://github.com/LMAX-Exchange/disruptor" rel="nofollow">disruptor</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[Disruptor VM]</span> / camel-disruptor
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+disruptor-vm:someName[?&lt;option&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="ejb.html" title="EJB">EJB</a> / camel-ejb
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 ejb:ejbName[?&lt;options&gt;]
@@ -720,7 +724,7 @@ exec://executable[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For executing system commands </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="facebook.html" title="Facebook">Facebook</a> / camel-facebook
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-facebook://[endpoint]?[options]
+facebook://endpoint[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Providing access to all of the Facebook APIs accessible using <a shape="rect" class="external-link" href="http://facebook4j.org/en/index.html" rel="nofollow">Facebook4J</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="file2.html" title="File2">File</a> / camel-core
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -775,8 +779,7 @@ gtask://queue-name[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Supports asynchronous message processing on Google App Engine by using the <a shape="rect" class="external-link" href="http://code.google.com/appengine/docs/java/taskqueue/" rel="nofollow">task queueing service</a> as message queue. See also <a shape="rect" href="gae.html" title="GAE">Camel Components for Google App Engine</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="gmail.html" title="gmail">GMail</a> / <a shape="rect" href="gae.html" title="GAE">camel-gae</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-gmail://user@gmail.com[?&lt;options&gt;]
-gmail://user@googlemail.com[?&lt;options&gt;]
+gmail://user@g[oogle]mail.com[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Supports sending of emails via the <a shape="rect" class="external-link" href="http://code.google.com/appengine/docs/java/mail/" rel="nofollow">mail service</a> of Google App Engine. See also <a shape="rect" href="gae.html" title="GAE">Camel Components for Google App Engine</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="geocoder.html" title="Geocoder">Geocoder</a> / camel-geocoder
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -816,7 +819,7 @@ http:hostName[:port][/resourceUri][?&lt;
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For calling out to external HTTP servers using Apache HTTP Client 3.x </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="http4.html" title="HTTP4">HTTP4</a> / camel-http4
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-http4:hostName[:port][/resourceUri]
+http4:hostName[:port][/resourceUri][?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For calling out to external HTTP servers using Apache HTTP Client 4.x </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="ibatis.html" title="iBATIS">iBATIS</a> / camel-ibatis
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -827,9 +830,13 @@ ibatis://statementName[?&lt;options&gt;]
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 imap://[username@]hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Internet_Message_Access_Protocol" rel="nofollow">IMAP</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">IMAPS</a> / camel-mail
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 imaps://[username@]hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Internet_Message_Access_Protocol" rel="nofollow">IMAP</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="irc.html" title="IRC">IRC</a> / camel-irc
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="irc.html" title="IRC">IRC</a> / camel-irc
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 irc:[login@]hostName[:port]/#room[?&lt;options&gt;]
@@ -982,10 +989,14 @@ paxlogging:appender
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving Pax-Logging events in OSGi </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">POP</a> / camel-mail
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-pop3://[username@]hostName port][?&lt;options&gt;]
 pop3s://[username@]hostName port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using POP3 and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="printer.html" title="Printer">Printer</a> / camel-printer
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using POP3 and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">POP</a> / camel-mail
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+pop3s://[username@]hostName port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="printer.html" title="Printer">Printer</a> / camel-printer
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 lpr://host:port/path/to/printer[?&lt;options&gt;]
@@ -1000,7 +1011,7 @@ properties://key[?&lt;options&gt;]
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 quartz://groupName/timerName[?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Provides a scheduled delivery of messages using the <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/" rel="nofollow">Quartz 1.x scheduler</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="quartz2.html" title="Quartz2">Quartz2</a> / camel-quartz2<span class="error">[?options]</span>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Provides a scheduled delivery of messages using the <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/" rel="nofollow">Quartz 1.x scheduler</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="quartz2.html" title="Quartz2">Quartz2</a> / camel-quartz2
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 quartz2://groupName/timerName[?&lt;options&gt;]
@@ -1008,8 +1019,7 @@ quartz2://groupName/timerName[?&lt;optio
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Provides a scheduled delivery of messages using the <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/" rel="nofollow">Quartz 2.x scheduler</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="quickfix.html" title="Quickfix">Quickfix</a> / camel-quickfix
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-quickfix-server:configFile[?&lt;options&gt;]
-quickfix-client:configFile[?&lt;options&gt;]
+quickfix:configFile[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Implementation of the QuickFix for Java engine which allow to send/receive <a shape="rect" class="external-link" href="http://www.fixprotocol.org" rel="nofollow">FIX</a> messages </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="rabbitmq.html" title="RabbitMQ">RabbitMQ</a> / camel-rabbitmq
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -1080,9 +1090,13 @@ sftp://[username@]hostName[:port]/direct
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 sip://user@hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Publish/Subscribe communication capability using the Telecom SIP protocol. <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc3903.txt" rel="nofollow">RFC3903 - Session Initiation Protocol (SIP) Extension for Event</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[SIPS]</span> / camel-sip
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 sips://user@hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Publish/Subscribe communication capability using the Telecom SIP protocol. <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc3903.txt" rel="nofollow">RFC3903 - Session Initiation Protocol (SIP) Extension for Event</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="sjms.html" title="SJMS">SJMS</a> / camel-sjms
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="sjms.html" title="SJMS">SJMS</a> / camel-sjms
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 sjms:[queue:|topic:]destinationName[?&lt;options&gt;]
@@ -1090,16 +1104,24 @@ sjms:[queue:|topic:]destinationName[?&lt
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> A ground up implementation of a JMS client </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">SMTP</a> / camel-mail
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-smtp://[username@]hostName[:port][?&lt;options&gt;]
 smtps://[username@]hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sending email using SMTP and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="smpp.html" title="SMPP">SMPP</a> / camel-smpp
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sending email using SMTP and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">SMTP</a> / camel-mail
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-smpp[s]://[username@]hostName[:port][?&lt;options&gt;]
-
+smtps://[username@]hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="smpp.html" title="SMPP">SMPP</a> / camel-smpp
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+smpp://[username@]hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To send and receive SMS using Short Messaging Service Center using the <a shape="rect" class="external-link" href="http://code.google.com/p/jsmpp/" rel="nofollow">JSMPP library</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[SMPPS]</span> / camel-smpp
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+smpps://[username@]hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To send and receive SMS using Short Messaging Service Center using the <a shape="rect" class="external-link" href="http://code.google.com/p/jsmpp/" rel="nofollow">JSMPP library</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="snmp.html" title="SNMP">SNMP</a> / camel-snmp
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="snmp.html" title="SNMP">SNMP</a> / camel-snmp
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 snmp://hostName[:port][?&lt;options&gt;]
@@ -1248,7 +1270,7 @@ xslt:templateName[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Generates a response using an <a shape="rect" class="external-link" href="http://www.w3.org/TR/xslt" rel="nofollow">XSLT</a> template </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="yammer.html" title="Yammer">Yammer</a> / camel-yammer
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-yammer://function[?options]
+yammer://function[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Allows you to interact with the <a shape="rect" class="external-link" href="http://yammer.com" rel="nofollow">Yammer</a> enterprise social network </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="zookeeper.html" title="Zookeeper">Zookeeper</a> / camel-zookeeper
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">

Modified: websites/production/camel/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/camel/content/component-list.html
==============================================================================
--- websites/production/camel/content/component-list.html (original)
+++ websites/production/camel/content/component-list.html Mon Sep 23 15:19:39 2013
@@ -134,17 +134,17 @@ aws-ses://from[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For working with <a shape="rect" class="external-link" href="http://aws.amazon.com/ses/" rel="nofollow">Amazon's Simple Email Service (SES)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="aws-sns.html" title="AWS-SNS">AWS-SNS</a> / <a shape="rect" href="aws.html" title="AWS">camel-aws</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-aws-sns://topicname[?&lt;options&gt;]
+aws-sns://topicName[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For Messaging with <a shape="rect" class="external-link" href="http://aws.amazon.com/sns/" rel="nofollow">Amazon's Simple Notification Service (SNS)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="aws-sqs.html" title="AWS-SQS">AWS-SQS</a> / <a shape="rect" href="aws.html" title="AWS">camel-aws</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-aws-sqs://queuename[?&lt;options&gt;]
+aws-sqs://queueName[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For Messaging with <a shape="rect" class="external-link" href="http://aws.amazon.com/sqs/" rel="nofollow">Amazon's Simple Queue Service (SQS)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="aws-s3.html" title="AWS-S3">AWS-S3</a> / <a shape="rect" href="aws.html" title="AWS">camel-aws</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-aws-s3://bucketname[?&lt;options&gt;]
+aws-s3://bucketName[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For working with <a shape="rect" class="external-link" href="http://aws.amazon.com/s3/" rel="nofollow">Amazon's Simple Storage Service (S3)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="bean.html" title="Bean">Bean</a> / camel-core
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -244,10 +244,14 @@ dns:operation[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To lookup domain information and run DNS queries using <a shape="rect" class="external-link" href="http://www.xbill.org/dnsjava/" rel="nofollow">DNSJava</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="disruptor.html" title="Disruptor">Disruptor</a> / camel-disruptor
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-disruptor:someName[?&lt;option&gt;]
 disruptor-vm:someName[?&lt;option&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To provide the implementation of <a shape="rect" href="seda.html" title="SEDA">SEDA</a> which is based on <a shape="rect" class="external-link" href="https://github.com/LMAX-Exchange/disruptor" rel="nofollow">disruptor</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="ejb.html" title="EJB">EJB</a> / camel-ejb
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To provide the implementation of <a shape="rect" href="seda.html" title="SEDA">SEDA</a> which is based on <a shape="rect" class="external-link" href="https://github.com/LMAX-Exchange/disruptor" rel="nofollow">disruptor</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[Disruptor VM]</span> / camel-disruptor
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+disruptor-vm:someName[?&lt;option&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="ejb.html" title="EJB">EJB</a> / camel-ejb
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 ejb:ejbName[?&lt;options&gt;]
@@ -275,7 +279,7 @@ exec://executable[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For executing system commands </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="facebook.html" title="Facebook">Facebook</a> / camel-facebook
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-facebook://[endpoint]?[options]
+facebook://endpoint[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Providing access to all of the Facebook APIs accessible using <a shape="rect" class="external-link" href="http://facebook4j.org/en/index.html" rel="nofollow">Facebook4J</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="file2.html" title="File2">File</a> / camel-core
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -330,8 +334,7 @@ gtask://queue-name[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Supports asynchronous message processing on Google App Engine by using the <a shape="rect" class="external-link" href="http://code.google.com/appengine/docs/java/taskqueue/" rel="nofollow">task queueing service</a> as message queue. See also <a shape="rect" href="gae.html" title="GAE">Camel Components for Google App Engine</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="gmail.html" title="gmail">GMail</a> / <a shape="rect" href="gae.html" title="GAE">camel-gae</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-gmail://user@gmail.com[?&lt;options&gt;]
-gmail://user@googlemail.com[?&lt;options&gt;]
+gmail://user@g[oogle]mail.com[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Supports sending of emails via the <a shape="rect" class="external-link" href="http://code.google.com/appengine/docs/java/mail/" rel="nofollow">mail service</a> of Google App Engine. See also <a shape="rect" href="gae.html" title="GAE">Camel Components for Google App Engine</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="geocoder.html" title="Geocoder">Geocoder</a> / camel-geocoder
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -371,7 +374,7 @@ http:hostName[:port][/resourceUri][?&lt;
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For calling out to external HTTP servers using Apache HTTP Client 3.x </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="http4.html" title="HTTP4">HTTP4</a> / camel-http4
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-http4:hostName[:port][/resourceUri]
+http4:hostName[:port][/resourceUri][?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For calling out to external HTTP servers using Apache HTTP Client 4.x </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="ibatis.html" title="iBATIS">iBATIS</a> / camel-ibatis
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -382,9 +385,13 @@ ibatis://statementName[?&lt;options&gt;]
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 imap://[username@]hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Internet_Message_Access_Protocol" rel="nofollow">IMAP</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">IMAPS</a> / camel-mail
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 imaps://[username@]hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Internet_Message_Access_Protocol" rel="nofollow">IMAP</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="irc.html" title="IRC">IRC</a> / camel-irc
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="irc.html" title="IRC">IRC</a> / camel-irc
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 irc:[login@]hostName[:port]/#room[?&lt;options&gt;]
@@ -537,10 +544,14 @@ paxlogging:appender
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving Pax-Logging events in OSGi </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">POP</a> / camel-mail
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-pop3://[username@]hostName port][?&lt;options&gt;]
 pop3s://[username@]hostName port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using POP3 and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="printer.html" title="Printer">Printer</a> / camel-printer
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using POP3 and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">POP</a> / camel-mail
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+pop3s://[username@]hostName port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="printer.html" title="Printer">Printer</a> / camel-printer
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 lpr://host:port/path/to/printer[?&lt;options&gt;]
@@ -555,7 +566,7 @@ properties://key[?&lt;options&gt;]
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 quartz://groupName/timerName[?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Provides a scheduled delivery of messages using the <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/" rel="nofollow">Quartz 1.x scheduler</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="quartz2.html" title="Quartz2">Quartz2</a> / camel-quartz2<span class="error">[?options]</span>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Provides a scheduled delivery of messages using the <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/" rel="nofollow">Quartz 1.x scheduler</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="quartz2.html" title="Quartz2">Quartz2</a> / camel-quartz2
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 quartz2://groupName/timerName[?&lt;options&gt;]
@@ -563,8 +574,7 @@ quartz2://groupName/timerName[?&lt;optio
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Provides a scheduled delivery of messages using the <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/" rel="nofollow">Quartz 2.x scheduler</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="quickfix.html" title="Quickfix">Quickfix</a> / camel-quickfix
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-quickfix-server:configFile[?&lt;options&gt;]
-quickfix-client:configFile[?&lt;options&gt;]
+quickfix:configFile[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Implementation of the QuickFix for Java engine which allow to send/receive <a shape="rect" class="external-link" href="http://www.fixprotocol.org" rel="nofollow">FIX</a> messages </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="rabbitmq.html" title="RabbitMQ">RabbitMQ</a> / camel-rabbitmq
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -635,9 +645,13 @@ sftp://[username@]hostName[:port]/direct
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 sip://user@hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Publish/Subscribe communication capability using the Telecom SIP protocol. <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc3903.txt" rel="nofollow">RFC3903 - Session Initiation Protocol (SIP) Extension for Event</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[SIPS]</span> / camel-sip
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 sips://user@hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Publish/Subscribe communication capability using the Telecom SIP protocol. <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc3903.txt" rel="nofollow">RFC3903 - Session Initiation Protocol (SIP) Extension for Event</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="sjms.html" title="SJMS">SJMS</a> / camel-sjms
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="sjms.html" title="SJMS">SJMS</a> / camel-sjms
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 sjms:[queue:|topic:]destinationName[?&lt;options&gt;]
@@ -645,16 +659,24 @@ sjms:[queue:|topic:]destinationName[?&lt
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> A ground up implementation of a JMS client </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">SMTP</a> / camel-mail
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-smtp://[username@]hostName[:port][?&lt;options&gt;]
 smtps://[username@]hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sending email using SMTP and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="smpp.html" title="SMPP">SMPP</a> / camel-smpp
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sending email using SMTP and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">SMTP</a> / camel-mail
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-smpp[s]://[username@]hostName[:port][?&lt;options&gt;]
-
+smtps://[username@]hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="smpp.html" title="SMPP">SMPP</a> / camel-smpp
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+smpp://[username@]hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To send and receive SMS using Short Messaging Service Center using the <a shape="rect" class="external-link" href="http://code.google.com/p/jsmpp/" rel="nofollow">JSMPP library</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[SMPPS]</span> / camel-smpp
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+smpps://[username@]hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To send and receive SMS using Short Messaging Service Center using the <a shape="rect" class="external-link" href="http://code.google.com/p/jsmpp/" rel="nofollow">JSMPP library</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="snmp.html" title="SNMP">SNMP</a> / camel-snmp
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="snmp.html" title="SNMP">SNMP</a> / camel-snmp
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 snmp://hostName[:port][?&lt;options&gt;]
@@ -803,7 +825,7 @@ xslt:templateName[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Generates a response using an <a shape="rect" class="external-link" href="http://www.w3.org/TR/xslt" rel="nofollow">XSLT</a> template </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="yammer.html" title="Yammer">Yammer</a> / camel-yammer
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-yammer://function[?options]
+yammer://function[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Allows you to interact with the <a shape="rect" class="external-link" href="http://yammer.com" rel="nofollow">Yammer</a> enterprise social network </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="zookeeper.html" title="Zookeeper">Zookeeper</a> / camel-zookeeper
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">

Modified: websites/production/camel/content/components.html
==============================================================================
--- websites/production/camel/content/components.html (original)
+++ websites/production/camel/content/components.html Mon Sep 23 15:19:39 2013
@@ -141,17 +141,17 @@ aws-ses://from[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For working with <a shape="rect" class="external-link" href="http://aws.amazon.com/ses/" rel="nofollow">Amazon's Simple Email Service (SES)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="aws-sns.html" title="AWS-SNS">AWS-SNS</a> / <a shape="rect" href="aws.html" title="AWS">camel-aws</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-aws-sns://topicname[?&lt;options&gt;]
+aws-sns://topicName[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For Messaging with <a shape="rect" class="external-link" href="http://aws.amazon.com/sns/" rel="nofollow">Amazon's Simple Notification Service (SNS)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="aws-sqs.html" title="AWS-SQS">AWS-SQS</a> / <a shape="rect" href="aws.html" title="AWS">camel-aws</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-aws-sqs://queuename[?&lt;options&gt;]
+aws-sqs://queueName[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For Messaging with <a shape="rect" class="external-link" href="http://aws.amazon.com/sqs/" rel="nofollow">Amazon's Simple Queue Service (SQS)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="aws-s3.html" title="AWS-S3">AWS-S3</a> / <a shape="rect" href="aws.html" title="AWS">camel-aws</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-aws-s3://bucketname[?&lt;options&gt;]
+aws-s3://bucketName[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For working with <a shape="rect" class="external-link" href="http://aws.amazon.com/s3/" rel="nofollow">Amazon's Simple Storage Service (S3)</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="bean.html" title="Bean">Bean</a> / camel-core
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -251,10 +251,14 @@ dns:operation[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To lookup domain information and run DNS queries using <a shape="rect" class="external-link" href="http://www.xbill.org/dnsjava/" rel="nofollow">DNSJava</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="disruptor.html" title="Disruptor">Disruptor</a> / camel-disruptor
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-disruptor:someName[?&lt;option&gt;]
 disruptor-vm:someName[?&lt;option&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To provide the implementation of <a shape="rect" href="seda.html" title="SEDA">SEDA</a> which is based on <a shape="rect" class="external-link" href="https://github.com/LMAX-Exchange/disruptor" rel="nofollow">disruptor</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="ejb.html" title="EJB">EJB</a> / camel-ejb
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To provide the implementation of <a shape="rect" href="seda.html" title="SEDA">SEDA</a> which is based on <a shape="rect" class="external-link" href="https://github.com/LMAX-Exchange/disruptor" rel="nofollow">disruptor</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[Disruptor VM]</span> / camel-disruptor
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+disruptor-vm:someName[?&lt;option&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="ejb.html" title="EJB">EJB</a> / camel-ejb
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 ejb:ejbName[?&lt;options&gt;]
@@ -282,7 +286,7 @@ exec://executable[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For executing system commands </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="facebook.html" title="Facebook">Facebook</a> / camel-facebook
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-facebook://[endpoint]?[options]
+facebook://endpoint[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Providing access to all of the Facebook APIs accessible using <a shape="rect" class="external-link" href="http://facebook4j.org/en/index.html" rel="nofollow">Facebook4J</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="file2.html" title="File2">File</a> / camel-core
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -337,8 +341,7 @@ gtask://queue-name[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Supports asynchronous message processing on Google App Engine by using the <a shape="rect" class="external-link" href="http://code.google.com/appengine/docs/java/taskqueue/" rel="nofollow">task queueing service</a> as message queue. See also <a shape="rect" href="gae.html" title="GAE">Camel Components for Google App Engine</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="gmail.html" title="gmail">GMail</a> / <a shape="rect" href="gae.html" title="GAE">camel-gae</a>
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-gmail://user@gmail.com[?&lt;options&gt;]
-gmail://user@googlemail.com[?&lt;options&gt;]
+gmail://user@g[oogle]mail.com[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Supports sending of emails via the <a shape="rect" class="external-link" href="http://code.google.com/appengine/docs/java/mail/" rel="nofollow">mail service</a> of Google App Engine. See also <a shape="rect" href="gae.html" title="GAE">Camel Components for Google App Engine</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="geocoder.html" title="Geocoder">Geocoder</a> / camel-geocoder
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -378,7 +381,7 @@ http:hostName[:port][/resourceUri][?&lt;
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For calling out to external HTTP servers using Apache HTTP Client 3.x </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="http4.html" title="HTTP4">HTTP4</a> / camel-http4
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-http4:hostName[:port][/resourceUri]
+http4:hostName[:port][/resourceUri][?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> For calling out to external HTTP servers using Apache HTTP Client 4.x </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="ibatis.html" title="iBATIS">iBATIS</a> / camel-ibatis
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -389,9 +392,13 @@ ibatis://statementName[?&lt;options&gt;]
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 imap://[username@]hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Internet_Message_Access_Protocol" rel="nofollow">IMAP</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">IMAPS</a> / camel-mail
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 imaps://[username@]hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using <a shape="rect" class="external-link" href="http://en.wikipedia.org/wiki/Internet_Message_Access_Protocol" rel="nofollow">IMAP</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="irc.html" title="IRC">IRC</a> / camel-irc
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="irc.html" title="IRC">IRC</a> / camel-irc
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 irc:[login@]hostName[:port]/#room[?&lt;options&gt;]
@@ -544,10 +551,14 @@ paxlogging:appender
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving Pax-Logging events in OSGi </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">POP</a> / camel-mail
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-pop3://[username@]hostName port][?&lt;options&gt;]
 pop3s://[username@]hostName port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using POP3 and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="printer.html" title="Printer">Printer</a> / camel-printer
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Receiving email using POP3 and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">POP</a> / camel-mail
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+pop3s://[username@]hostName port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="printer.html" title="Printer">Printer</a> / camel-printer
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 lpr://host:port/path/to/printer[?&lt;options&gt;]
@@ -562,7 +573,7 @@ properties://key[?&lt;options&gt;]
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 quartz://groupName/timerName[?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Provides a scheduled delivery of messages using the <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/" rel="nofollow">Quartz 1.x scheduler</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="quartz2.html" title="Quartz2">Quartz2</a> / camel-quartz2<span class="error">[?options]</span>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Provides a scheduled delivery of messages using the <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/" rel="nofollow">Quartz 1.x scheduler</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="quartz2.html" title="Quartz2">Quartz2</a> / camel-quartz2
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 quartz2://groupName/timerName[?&lt;options&gt;]
@@ -570,8 +581,7 @@ quartz2://groupName/timerName[?&lt;optio
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Provides a scheduled delivery of messages using the <a shape="rect" class="external-link" href="http://www.quartz-scheduler.org/" rel="nofollow">Quartz 2.x scheduler</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="quickfix.html" title="Quickfix">Quickfix</a> / camel-quickfix
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-quickfix-server:configFile[?&lt;options&gt;]
-quickfix-client:configFile[?&lt;options&gt;]
+quickfix:configFile[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Implementation of the QuickFix for Java engine which allow to send/receive <a shape="rect" class="external-link" href="http://www.fixprotocol.org" rel="nofollow">FIX</a> messages </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="rabbitmq.html" title="RabbitMQ">RabbitMQ</a> / camel-rabbitmq
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
@@ -642,9 +652,13 @@ sftp://[username@]hostName[:port]/direct
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 sip://user@hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Publish/Subscribe communication capability using the Telecom SIP protocol. <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc3903.txt" rel="nofollow">RFC3903 - Session Initiation Protocol (SIP) Extension for Event</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[SIPS]</span> / camel-sip
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 sips://user@hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Publish/Subscribe communication capability using the Telecom SIP protocol. <a shape="rect" class="external-link" href="http://www.ietf.org/rfc/rfc3903.txt" rel="nofollow">RFC3903 - Session Initiation Protocol (SIP) Extension for Event</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="sjms.html" title="SJMS">SJMS</a> / camel-sjms
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="sjms.html" title="SJMS">SJMS</a> / camel-sjms
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 sjms:[queue:|topic:]destinationName[?&lt;options&gt;]
@@ -652,16 +666,24 @@ sjms:[queue:|topic:]destinationName[?&lt
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> A ground up implementation of a JMS client </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">SMTP</a> / camel-mail
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-smtp://[username@]hostName[:port][?&lt;options&gt;]
 smtps://[username@]hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sending email using SMTP and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="smpp.html" title="SMPP">SMPP</a> / camel-smpp
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Sending email using SMTP and JavaMail </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="mail.html" title="Mail">SMTP</a> / camel-mail
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-smpp[s]://[username@]hostName[:port][?&lt;options&gt;]
-
+smtps://[username@]hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="smpp.html" title="SMPP">SMPP</a> / camel-smpp
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+smpp://[username@]hostName[:port][?&lt;options&gt;]
+]]></script>
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To send and receive SMS using Short Messaging Service Center using the <a shape="rect" class="external-link" href="http://code.google.com/p/jsmpp/" rel="nofollow">JSMPP library</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <span class="error">[SMPPS]</span> / camel-smpp
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+smpps://[username@]hostName[:port][?&lt;options&gt;]
 ]]></script>
-</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> To send and receive SMS using Short Messaging Service Center using the <a shape="rect" class="external-link" href="http://code.google.com/p/jsmpp/" rel="nofollow">JSMPP library</a> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="snmp.html" title="SNMP">SNMP</a> / camel-snmp
+</div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> ... </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="snmp.html" title="SNMP">SNMP</a> / camel-snmp
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
 snmp://hostName[:port][?&lt;options&gt;]
@@ -810,7 +832,7 @@ xslt:templateName[?&lt;options&gt;]
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Generates a response using an <a shape="rect" class="external-link" href="http://www.w3.org/TR/xslt" rel="nofollow">XSLT</a> template </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="yammer.html" title="Yammer">Yammer</a> / camel-yammer
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-yammer://function[?options]
+yammer://function[?&lt;options&gt;]
 ]]></script>
 </div></div> </td><td colspan="1" rowspan="1" class="confluenceTd"> Allows you to interact with the <a shape="rect" class="external-link" href="http://yammer.com" rel="nofollow">Yammer</a> enterprise social network </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" href="zookeeper.html" title="Zookeeper">Zookeeper</a> / camel-zookeeper
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">