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/07/08 21:20:54 UTC

svn commit: r868838 [5/6] - in /websites/production/camel/content: ./ 2013/07/ 2013/07/07/ twitter-websocket-blueprint-example.data/

Modified: websites/production/camel/content/jpa.html
==============================================================================
--- websites/production/camel/content/jpa.html (original)
+++ websites/production/camel/content/jpa.html Mon Jul  8 19:20:54 2013
@@ -131,7 +131,7 @@ jpa:[entityClassName][?options]
 
 <h3><a shape="rect" name="JPA-Options"></a>Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>entityType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>entityClassName</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> Overrides the <em>entityClassName</em> from the URI. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>persistenceUnit</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>camel</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The JPA persistence unit used by default. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumeDelete</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b>
  If <tt>true</tt>, the entity is deleted after it is consumed; if <tt>false</tt>, the entity is not deleted. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumeLockEntity</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Specifies whether or not to set an exclusive lock on each entity bean while processing the results from polling. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>flushOnSend</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA producer only:</b> Flushes the <a shape="rect" class="external-link" href="http://java.sun.com/javaee/5/docs/api/javax/persistence/EntityManager.html" rel="nofollow">EntityManager</a> after the entity bean has been persisted. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maximumResults</tt> </td
 ><td colspan="1" rowspan="1" class="confluenceTd"> <tt>-1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">  <b>JPA consumer only:</b> Set the maximum number of results to retrieve on the <a shape="rect" class="external-link" href="http://java.sun.com/javaee/5/docs/api/javax/persistence/Query.html" rel="nofollow">Query</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transactionManager</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> This option is <a shape="rect" href="registry.html" title="Registry">Registry</a> based which requires the <tt>#</tt> notation so that the given <tt>transactionManager</tt> being specified can be looked up properly, e.g. <tt>transactionManager=#myTransactionManager</tt>. It specifies the transaction manager to use. If none provided, Camel will use a <tt>JpaTransactionManager</tt> by default. Can be used to set a JTA transaction manager (for 
 integration with an EJB container). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.delay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>500</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Delay in milliseconds between each poll. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.initialDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Milliseconds before polling starts. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.useFixedDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Set to <tt>true</tt> to use fixed delay between polls, otherwise fixed rate is used. See <a shape="rect" class="external-link" href="http://java.sun.com/j2
 se/1.5.0/docs/api/java/util/concurrent/ScheduledExecutorService.html" rel="nofollow">ScheduledExecutorService</a> in JDK for details. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxMessagesPerPoll</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> An integer value to define the maximum number of messages to gather per poll. By default, no maximum is set. Can be used to avoid polling many thousands of messages when starting up the server. Set a value of 0 or negative to disable. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.query</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.namedQuery</tt> </td><td colspan="1" row
 span="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a named query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.nativeQuery</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom native query when consuming data. You may want to use the option <tt>consumer.resultClass</tt> also when using native queries. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.resultClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.7: JPA consumer only:</b> Defines the type of the returned payload (we will call <tt>entityManager.createNativeQuery(nativeQuery, resultClass)</tt> instead of <tt>entityManager.createNativeQuery(nativeQuery)</tt>). Without this option, we w
 ill return an object array. Only has an affect when using in conjunction with native query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.transacted</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.7.5/2.8.3/2.9: JPA consumer only:</b> Whether to run the consumer in transacted mode, by which all messages will either commit or rollback, when the entire batch has been processed. The default behavior (false) is to commit all the previously successfully processed messages, and only rollback the last failed message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>usePersist</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5: JPA producer only:</b> Indicates to use <tt>entityManager.persist(entity)</tt> instead of <tt>entityManager.merge(
 entity)</tt>. Note: <tt>entityManager.persist(entity)</tt> doesn't work for detached entities (where the EntityManager has to execute an UPDATE instead of an INSERT query)! </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>entityType</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <em>entityClassName</em> </td><td colspan="1" rowspan="1" class="confluenceTd"> Overrides the <em>entityClassName</em> from the URI. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>persistenceUnit</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>camel</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The JPA persistence unit used by default. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumeDelete</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b>
  If <tt>true</tt>, the entity is deleted after it is consumed; if <tt>false</tt>, the entity is not deleted. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumeLockEntity</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Specifies whether or not to set an exclusive lock on each entity bean while processing the results from polling. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>flushOnSend</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA producer only:</b> Flushes the <a shape="rect" class="external-link" href="http://java.sun.com/javaee/5/docs/api/javax/persistence/EntityManager.html" rel="nofollow">EntityManager</a> after the entity bean has been persisted. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maximumResults</tt> </td
 ><td colspan="1" rowspan="1" class="confluenceTd"> <tt>-1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">  <b>JPA consumer only:</b> Set the maximum number of results to retrieve on the <a shape="rect" class="external-link" href="http://java.sun.com/javaee/5/docs/api/javax/persistence/Query.html" rel="nofollow">Query</a>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>transactionManager</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> This option is <a shape="rect" href="registry.html" title="Registry">Registry</a> based which requires the <tt>#</tt> notation so that the given <tt>transactionManager</tt> being specified can be looked up properly, e.g. <tt>transactionManager=#myTransactionManager</tt>. It specifies the transaction manager to use. If none provided, Camel will use a <tt>JpaTransactionManager</tt> by default. Can be used to set a JTA transaction manager (for 
 integration with an EJB container). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.delay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>500</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Delay in milliseconds between each poll. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.initialDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>1000</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Milliseconds before polling starts. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.useFixedDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> Set to <tt>true</tt> to use fixed delay between polls, otherwise fixed rate is used. See <a shape="rect" class="external-link" href="http://java.sun.com/j2
 se/1.5.0/docs/api/java/util/concurrent/ScheduledExecutorService.html" rel="nofollow">ScheduledExecutorService</a> in JDK for details. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>maxMessagesPerPoll</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>0</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> An integer value to define the maximum number of messages to gather per poll. By default, no maximum is set. Can be used to avoid polling many thousands of messages when starting up the server. Set a value of 0 or negative to disable. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.query</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.namedQuery</tt> </td><td colspan="1" row
 span="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a named query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.nativeQuery</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>JPA consumer only:</b> To use a custom native query when consuming data. You may want to use the option <tt>consumer.resultClass</tt> also when using native queries. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.parameters</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.12: JPA consumer only:</b> the parameters map which will be used for building the query. The parameters is an instance of Map which key is String and value is Object. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consum
 er.resultClass</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.7: JPA consumer only:</b> Defines the type of the returned payload (we will call <tt>entityManager.createNativeQuery(nativeQuery, resultClass)</tt> instead of <tt>entityManager.createNativeQuery(nativeQuery)</tt>). Without this option, we will return an object array. Only has an affect when using in conjunction with native query when consuming data. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>consumer.transacted</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.7.5/2.8.3/2.9: JPA consumer only:</b> Whether to run the consumer in transacted mode, by which all messages will either commit or rollback, when the entire batch has been processed. The default behavior (false) is to commit all the previously successfully processed mess
 ages, and only rollback the last failed message. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>usePersist</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Camel 2.5: JPA producer only:</b> Indicates to use <tt>entityManager.persist(entity)</tt> instead of <tt>entityManager.merge(entity)</tt>. Note: <tt>entityManager.persist(entity)</tt> doesn't work for detached entities (where the EntityManager has to execute an UPDATE instead of an INSERT query)! </td></tr></tbody></table>
 </div>
 </div>
 

Modified: websites/production/camel/content/mongodb.html
==============================================================================
--- websites/production/camel/content/mongodb.html (original)
+++ websites/production/camel/content/mongodb.html Mon Jul  8 19:20:54 2013
@@ -125,7 +125,7 @@ mongodb:connectionBean?database=database
 <div class="confluenceTableSmall"></div>
 <div class="table-wrap">
 <table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Default Value </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th><th colspan="1" rowspan="1" class="confluenceTh"> Producer </th><th colspan="1" rowspan="1" class="confluenceTh"> Tailable Cursor Consumer </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>database</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Required.</b> The name of the database to which this endpoint will be bound. All operations will be executed against this database unless dynamicity is enabled and the&#160;<tt>CamelMongoDbDatabase</tt> header is set. </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" borde
 r="0"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>collection</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Required.</b> The name of the collection (within the specified database) to which this endpoint will be bound.&#160;All operations will be executed against this database unless dynamicity is enabled and the&#160;<tt>CamelMongoDbDatabase</tt> header is set. </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.ap
 ache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>operation</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Required for producers.</b> The id of the operation this endpoint will execute. Pick from the following:
-<ul><li>Query operations: <tt>findById</tt>, <tt>findOneByQuery</tt>, <tt>findAll</tt>, <tt>count</tt></li><li>Write operations: <tt>insert</tt>, <tt>save</tt>, <tt>update</tt></li><li>Delete operations: <tt>remove</tt></li><li>Other operations: <tt>getDbStats</tt>, <tt>getColStats</tt></li></ul>
+<ul><li>Query operations: <tt>findById</tt>, <tt>findOneByQuery</tt>, <tt>findAll</tt>, <tt>count</tt></li><li>Write operations: <tt>insert</tt>, <tt>save</tt>, <tt>update</tt></li><li>Delete operations: <tt>remove</tt></li><li>Other operations: <tt>getDbStats</tt>, <tt>getColStats</tt>, <tt>aggregate</tt></li></ul>
 </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>createCollection</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> true </td><td colspan="1" rowspan="1" class="confluenceTd"> Determines whether the collection will be automatically created in the MongoDB database during endpoint initialisation if it doesn't exist already. If this option is <tt>false</tt> and the collection doesn't exist, an initialisation exception will be thrown. </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td><td colspan="1" rowspan="1" class="confluenceTd">&
 #160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>invokeGetLastError</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> false (behaviour may be inherited from connections WriteConcern) </td><td colspan="1" rowspan="1" class="confluenceTd"> Instructs the MongoDB Java driver to invoke <tt>getLastError()</tt> after every call. Default behaviour in version 2.7.2 of the MongoDB Java driver is that only network errors will cause the operation to fail, because the actual operation is executed asynchronously in the MongoDB server without holding up the client - to increase performance. The client can obtain the real result of the operation by explicitly invoking <tt>getLastError()</tt> on the <tt>WriteResult</tt> object returned or by setting the appropriate <tt>WriteConcern</tt>. If the backend operation has not finished yet, the client will block until the result is available. Setting this option to <tt>true</tt> will make the endpoint behave synchronously 
 and return an Exception if the underlying operation failed. </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>writeConcern</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> none (driver's default) </td><td colspan="1" rowspan="1" class="confluenceTd"> Set a <tt>WriteConcern</tt> on the operation out of MongoDB's parameterised values. See <a shape="rect" class="external-link" href="http://api.mongodb.org/java/current/com/mongodb/WriteConcern.html#valueOf(java.lang.String)" rel="nofollow">WriteConcern.valueOf(String)</a>. </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height=
 "16" width="16" alt="" border="0"> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>writeConcernRef</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> Sets a custom <tt>WriteConcern</tt> that exists in the Registry. Specify the bean name. </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>readPreference</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> Sets a <tt>ReadPreference</tt> on the connection. Accepted values: the name of any inner subclass of <a shape="rect" class="external-link"
  href="http://api.mongodb.org/java/current/com/mongodb/ReadPreference.html" rel="nofollow">ReadPreference</a>. For example: <tt>PrimaryReadPreference</tt>, <tt>SecondaryReadPreference</tt>, <tt>TaggedReadPreference</tt>. </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>dynamicity</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> false </td><td colspan="1" rowspan="1" class="confluenceTd"> If set to true, the endpoint will inspect the <tt>CamelMongoDbDatabase</tt> and <tt>CamelMongoDbCollection</tt> headers of the incoming message, and if any of them exists, the target collection and/or database will be overridden for that particular operation. Set to false by default to avoid triggering the
  lookup on every Exchange if the feature is not desired. </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>writeResultAsHeader</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> false </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Available as of Camel 2.10.3 and 2.11:</b> In write operations (save, update, insert, etc.), instead of replacing the body with the WriteResult object returned by MongoDB, keep the input body untouched and place the WriteResult in the <tt>CamelMongoWriteResult</tt> header (constant <tt>MongoDbConstants.WRITERESULT</tt>). </td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/ima
 ges/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>persistentTailTracking</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> false </td><td colspan="1" rowspan="1" class="confluenceTd"> Enables or disables persistent tail tracking for Tailable Cursor consumers. See below for more information. </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>persistentId</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Required if persistent tail tracking is enabled.</b> The id of this per
 sistent tail tracker, to separate its records from the rest on the tail-tracking collection. </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>tailTrackingIncreasingField</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> none </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Required if persistent tail tracking is enabled.</b> Correlation field in the incoming record which is of increasing nature and will be used to position the tailing cursor every time it is generated. The cursor will be (re)created with a query of type: tailTrackIncreasingField &gt; lastValue (where lastValue is possibly recovered from persistent tail tracking). Can be of type Integer, Date, String, etc. NOTE: No 
 support for dot notation at the current time, so the field should be at the top level of the document. </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>cursorRegenerationDelay</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> 1000ms </td><td colspan="1" rowspan="1" class="confluenceTd"> Establishes how long the endpoint will wait to regenerate the cursor after it has been killed by the MongoDB server (normal behaviour). </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td><
 /tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>tailTrackDb</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> same as endpoint's </td><td colspan="1" rowspan="1" class="confluenceTd"> Database on which the persistent tail tracker will store its runtime information. </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>tailTrackCollection</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> camelTailTracking </td><td colspan="1" rowspan="1" class="confluenceTd"> Collection on which the persistent tail tracker will store its runtime information. </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle
 " class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>tailTrackField</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> lastTrackingValue </td><td colspan="1" rowspan="1" class="confluenceTd"> Field in which the persistent tail tracker will store the last tracked value. </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> <img align="middle" class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" alt="" border="0"> </td></tr></tbody></table>
 </div>
 

Modified: websites/production/camel/content/news.html
==============================================================================
--- websites/production/camel/content/news.html (original)
+++ websites/production/camel/content/news.html Mon Jul  8 19:20:54 2013
@@ -88,6 +88,32 @@
                <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: muellerc" title="muellerc">
            </a>            </span>
             <span class="blogHeading">
+                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~muellerc">Christian Mueller</a> posted on Jul 07, 2013</div>
+                <a shape="rect" class="blogHeading" href="2013/07/07/apache-camel-2106-released.html">Apache Camel 2.10.6 Released</a>
+            
+        </div>
+    
+    <div class="wiki-content">
+        <p>The Camel community announces the immediate availability of the new patch release Camel 2.10.6. This bug fix release mainly address <a shape="rect" href="https://cxf.apache.org/security-advisories.data/CVE-2013-2160.txt.asc">CVE-2013-2160</a> and resolves <a shape="rect" class="external-link" href="https://issues.apache.org/jira/issues/?jql=project%20%3D%20CAMEL%20AND%20fixVersion%20%3D%20%222.10.6%22">8 issues</a> in total.</p>
+
+<p>The artifacts are published and ready for you to download either from the Apache mirrors or from the Central Maven repository. For more details please take a look at the <a shape="rect" class="external-link" href="https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.10.6+Release">release page</a> and the <a shape="rect" class="external-link" href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311211&amp;version=12324640">release notes</a>.</p>
+
+<p>Many thanks to all who made this release possible.</p>
+
+<p>Christian</p>
+    </div>
+    
+        
+    </div>
+    
+        
+<div class="blog-post-listing">
+            <div class="logo-heading-block">
+            <span class="logoBlock">
+                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~muellerc">
+               <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: muellerc" title="muellerc">
+           </a>            </span>
+            <span class="blogHeading">
                 </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~muellerc">Christian Mueller</a> posted on Jun 26, 2013</div>
                 <a shape="rect" class="blogHeading" href="2013/06/26/apache-camel-2105-released.html">Apache Camel 2.10.5 Released</a>
             
@@ -611,35 +637,6 @@ Christian</p>
         
     </div>
     
-        
-<div class="blog-post-listing">
-            <div class="logo-heading-block">
-            <span class="logoBlock">
-                <a shape="rect" class="userLogoLink" href="https://cwiki.apache.org/confluence/display/~hadrian@apache.org">
-               <img class="userLogo logo" src="https://cwiki.apache.org/confluence/images/icons/profilepics/default.gif" alt="User icon: hadrian@apache.org" title="hadrian@apache.org">
-           </a>            </span>
-            <span class="blogHeading">
-                </span><div class="page-metadata not-personal"><a shape="rect" class="url fn confluence-userlink" href="https://cwiki.apache.org/confluence/display/~hadrian@apache.org">Hadrian Zbarcea</a> posted on Jan 30, 2012</div>
-                <a shape="rect" class="blogHeading" href="2012/01/30/apache-camel-284-released.html">Apache Camel 2.8.4 Released</a>
-            
-        </div>
-    
-    <div class="wiki-content">
-        <p>The Camel PMC just issued a new patch release: Apache Camel 2.8.4. <br clear="none">
-This release includes almost 90 bug fixes and comes about eight weeks after the previous patch release on the camel-2.8.x branch.</p>
-
-<p>The artifacts are now published and are ready for you to <a shape="rect" href="download.html" title="Download">download</a> them from the Apache mirrors or from the Central Maven repository. <br clear="none">
-For more details please take a look at the <a shape="rect" href="camel-284-release.html" title="Camel 2.8.4 Release">release notes</a>.</p>
-
-<p>Many thanks to the Camel community and all contributors who's time and efforts made this release possible.</p>
-    </div>
-    
-        
-        <div class="endsection">
-        
-                             Labels:           <a shape="rect" class="label" rel="nofollow" href="/confluence/label/release">release</a>                </div>
-    </div>
-    
 </div>
         </td>
         <td valign="top">

Modified: websites/production/camel/content/release-guide.html
==============================================================================
--- websites/production/camel/content/release-guide.html (original)
+++ websites/production/camel/content/release-guide.html Mon Jul  8 19:20:54 2013
@@ -170,10 +170,10 @@ umask 002
 
 <p>The release plugin will prompt for a release version, tag and next release version. Use a three digit release version of the form: 2.x.x and for the tag use a string of the form: camel-2.x.x. The next version string should use the two digit from: 2.x-SNAPSHOT as this can be consistent for future SNAPSHOT releases.</p>
 
-<ol><li>Grab the latest source from SVN
+<ol><li>Grab the latest source from Git
 <div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
 <script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
-svn co https://svn.apache.org/repos/asf/camel/trunk camel
+git clone https://git-wip-us.apache.org/repos/asf/camel.git
 cd camel
 ]]></script>
 </div></div></li><li>Verify headers with <a shape="rect" class="external-link" href="http://incubator.apache.org/rat/apache-rat-plugin/usage.html">rat</a>

Added: websites/production/camel/content/twitter-websocket-blueprint-example.data/gaga.png
==============================================================================
Binary file - no diff available.

Propchange: websites/production/camel/content/twitter-websocket-blueprint-example.data/gaga.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/production/camel/content/twitter-websocket-blueprint-example.data/twitter-apps.png
==============================================================================
Binary file - no diff available.

Propchange: websites/production/camel/content/twitter-websocket-blueprint-example.data/twitter-apps.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/production/camel/content/twitter-websocket-blueprint-example.html
==============================================================================
--- websites/production/camel/content/twitter-websocket-blueprint-example.html (added)
+++ websites/production/camel/content/twitter-websocket-blueprint-example.html Mon Jul  8 19:20:54 2013
@@ -0,0 +1,243 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+<html>
+<head>
+    <link href="http://camel.apache.org/styles/site.css" rel="stylesheet" type="text/css">
+    <link href="http://camel.apache.org/styles/type-settings.css" rel="stylesheet" type="text/css">
+    <script src="http://camel.apache.org/styles/prototype.js" type="text/javascript"></script>
+    <script src="http://camel.apache.org/styles/rico.js" type="text/javascript"></script>    
+    <script src="http://camel.apache.org/styles/site.js" type="text/javascript"></script>
+
+    <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+
+    <style type="text/css">
+      .maincontent { overflow:hidden; }
+    </style>
+    <!--[if IE]>
+    <style type="text/css">
+      .maincontent { width:100%; }
+    </style>
+    <![endif]-->
+
+
+  <link href='http://camel.apache.org/styles/highlighter/styles/shCoreCamel.css' rel='stylesheet' type='text/css' />
+  <link href='http://camel.apache.org/styles/highlighter/styles/shThemeCamel.css' rel='stylesheet' type='text/css' />
+  <script src='http://camel.apache.org/styles/highlighter/scripts/shCore.js' type='text/javascript'></script>
+  <script src='http://camel.apache.org/styles/highlighter/scripts/shBrushJava.js' type='text/javascript'></script>
+  
+  <script type="text/javascript">
+  SyntaxHighlighter.defaults['toolbar'] = false;
+  SyntaxHighlighter.all();
+  </script>
+
+    <title>
+    Apache Camel: Twitter Websocket Blueprint Example
+    </title>
+</head>
+<body>
+<div class="white_box">
+<div class="header">
+  <div class="header_l">
+    <div class="header_r">
+    </div>
+  </div>
+</div>
+<div class="content">
+  <div class="content_l">
+    <div class="content_r">
+      <div>
+          <!-- Banner -->
+<div id="banner-content"><div id="asf_logo">
+	<div id="activemq_logo" style="height:108px; background:transparent url(banner.data/apache-camel-7.png) no-repeat scroll left top;">
+            <a shape="rect" style="float:left; width:310px;display:block;text-indent:-5000px;text-decoration:none;line-height:140px; margin-top:20px; margin-left:18px;" href="http://camel.apache.org/">Camel</a>
+            <a shape="rect" style="float:right; width:180px;display:block;text-indent:-5000px;text-decoration:none;line-height:80px; margin-top:45px; margin-right:10px;" href="http://www.apache.org">Apache</a>
+	</div>
+        </div></div>
+          <!-- Banner -->
+        <div class="top_red_bar">
+          <div id="site-breadcrumbs">
+                <!-- Breadcrumbs -->
+<a href="index.html">Apache Camel</a>&nbsp;&gt;&nbsp;<a href="documentation.html">Documentation</a>&nbsp;&gt;&nbsp;<a href="user-guide.html">User Guide</a>&nbsp;&gt;&nbsp;<a href="examples.html">Examples</a>&nbsp;&gt;&nbsp;<a href="twitter-websocket-blueprint-example.html">Twitter Websocket Blueprint Example</a>
+          </div>
+          <!-- Quicklinks -->
+<div id="site-quicklinks"><p><a shape="rect" href="download.html" title="Download">Download</a> | <a shape="rect" href="javadoc.html" title="JavaDoc">JavaDoc</a> | <a shape="rect" href="source.html" title="Source">Source</a> | <a shape="rect" href="discussion-forums.html" title="Discussion Forums">Forums</a> | <a shape="rect" href="support.html" title="Support">Support</a></p></div>
+          <!-- Quicklinks -->
+        </div>
+
+	<table border="0">
+	<tbody>
+        <tr>
+        <td valign="top" width="100%">
+<div class="wiki-content maincontent"><h2><a shape="rect" name="TwitterWebsocketBlueprintExample-TwitterWebsocketBlueprintExample"></a>Twitter Websocket Blueprint Example</h2>
+<p><b>Available as of Camel 2.12</b></p>
+
+<p>This example is located in the Camel <a shape="rect" href="download.html" title="Download">distribution</a> at <tt>examples/camel-example-twitter-websocket-blueprint</tt>.</p>
+
+<p>The example is demonstrating how to poll a constant feed of twitter searches and publish results in real time using web socket to a web page. This example is already configured using a testing purpose twitter account named 'cameltweet'. And therefore the example is ready to run out of the box. This account is only for testing purpose, and should <b>not</b> be used in your custom applications. For that you need to setup and use your own twitter account.</p>
+
+<p>See more details at <a shape="rect" href="twitter-websocket-example.html" title="Twitter Websocket Example">Twitter Websocket Example</a> about how to configure twitter to use your own account.</p>
+
+<h3><a shape="rect" name="TwitterWebsocketBlueprintExample-Runningthisexample"></a>Running this example</h3>
+
+<p>This example requires running in Apache Karaf / ServiceMix</p>
+
+<p>You will need to install this example first to your local maven repository with:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  mvn install
+]]></script>
+</div></div>
+
+<p>To install Apache Camel in Karaf you type in the shell (we use version 2.12.0):</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  features:chooseurl camel 2.12.0
+  features:install camel
+]]></script>
+</div></div>
+
+<p>First you need to install the following features in Karaf/ServiceMix with:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  features:install camel-twitter
+  features:install camel-websocket
+]]></script>
+</div></div>
+
+<p>Then you can install the Camel example:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  osgi:install -s mvn:org.apache.camel/camel-example-twitter-websocket-blueprint/2.12.0
+]]></script>
+</div></div>
+
+<p>Then open a browser to see live twitter updates in the web page</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: java; gutter: false" type="syntaxhighlighter"><![CDATA[
+  http://localhost:9090
+]]></script>
+</div></div>
+
+<p>When the application runs, the webpage should automatic update with new tweets. </p>
+
+<h3><a shape="rect" name="TwitterWebsocketBlueprintExample-BlueprintXMLfile"></a>Blueprint XML file</h3>
+
+<p>The 'meat' of this example is defined in the OSGi Blueprint XML file in the <tt>src/main/resources/OSGI-INF/blueprint/camel-twitter.xml</tt> file, which would be a good idea to take a look at, to better understand this example.</p>
+
+<h3><a shape="rect" name="TwitterWebsocketBlueprintExample-Seealso"></a>See also</h3>
+<ul class="alternate" type="square"><li><a shape="rect" href="twitter-websocket-example.html" title="Twitter Websocket Example">Twitter Websocket Example</a></li><li><a shape="rect" href="twitter.html" title="Twitter">Twitter</a></li><li><a shape="rect" href="websocket.html" title="Websocket">Websocket</a></li><li><a shape="rect" href="examples.html" title="Examples">Examples</a></li><li><a shape="rect" href="tutorials.html" title="Tutorials">Tutorials</a></li><li><a shape="rect" href="user-guide.html" title="User Guide">User Guide</a></li></ul>
+</div>
+        </td>
+        <td valign="top">
+          <div class="navigation">
+            <div class="navigation_top">
+                <!-- NavigationBar -->
+<div class="navigation_bottom" id="navigation_bottom"><h3><a shape="rect" name="Navigation-Overview"></a><a shape="rect" href="overview.html" title="Overview">Overview</a></h3>
+
+<ul class="alternate" type="square"><li><a shape="rect" href="index.html" title="Index">Home</a></li><li><a shape="rect" href="download.html" title="Download">Download</a></li><li><a shape="rect" href="getting-started.html" title="Getting Started">Getting Started</a></li><li><a shape="rect" href="faq.html" title="FAQ">FAQ</a></li></ul>
+
+
+<h3><a shape="rect" name="Navigation-Documentation"></a><a shape="rect" href="documentation.html" title="Documentation">Documentation</a></h3>
+
+<ul class="alternate" type="square"><li><a shape="rect" href="user-guide.html" title="User Guide">User Guide</a></li><li><a shape="rect" href="manual.html" title="Manual">Manual</a></li><li><a shape="rect" href="books.html" title="Books">Books</a></li><li><a shape="rect" href="tutorials.html" title="Tutorials">Tutorials</a></li><li><a shape="rect" href="examples.html" title="Examples">Examples</a></li><li><a shape="rect" href="cookbook.html" title="Cookbook">Cookbook</a></li><li><a shape="rect" href="architecture.html" title="Architecture">Architecture</a></li><li><a shape="rect" href="enterprise-integration-patterns.html" title="Enterprise Integration Patterns">Enterprise Integration Patterns</a></li><li><a shape="rect" href="dsl.html" title="DSL">DSL</a></li><li><a shape="rect" href="components.html" title="Components">Components</a></li><li><a shape="rect" href="data-format.html" title="Data Format">Data Format</a></li><li><a shape="rect" href="languages.html" title="Languages">L
 anguages</a></li><li><a shape="rect" href="security.html" title="Security">Security</a></li></ul>
+
+
+<h3><a shape="rect" name="Navigation-Search"></a>Search</h3>
+
+<p>
+</p><form enctype="application/x-www-form-urlencoded" method="get" id="cse-search-box" action="http://www.google.com/cse">
+  <div>
+    <input type="hidden" name="cx" value="007878419884033443453:m5nhvy4hmyq">
+    <input type="hidden" name="ie" value="UTF-8">
+    <input type="text" name="q" size="21">
+    <input type="submit" name="sa" value="Search">
+  </div>
+</form>
+<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&amp;lang=en"></script>
+
+
+<h3><a shape="rect" name="Navigation-Community"></a><a shape="rect" href="community.html" title="Community">Community</a></h3>
+
+<ul class="alternate" type="square"><li><a shape="rect" href="support.html" title="Support">Support</a></li><li><a shape="rect" href="contributing.html" title="Contributing">Contributing</a></li><li><a shape="rect" href="discussion-forums.html" title="Discussion Forums">Discussion Forums</a></li><li><a shape="rect" href="mailing-lists.html" title="Mailing Lists">Mailing Lists</a></li><li><a shape="rect" href="user-stories.html" title="User Stories">User Stories</a></li><li><a shape="rect" href="news.html" title="News">News</a></li><li><a shape="rect" href="articles.html" title="Articles">Articles</a></li><li><a shape="rect" href="site.html" title="Site">Site</a></li><li><a shape="rect" href="team.html" title="Team">Team</a></li><li><a shape="rect" class="external-link" href="http://camel-extra.googlecode.com/" rel="nofollow">Camel Extra</a></li></ul>
+
+
+<h3><a shape="rect" name="Navigation-Developers"></a><a shape="rect" href="developers.html" title="Developers">Developers</a></h3>
+
+<ul class="alternate" type="square"><li><a shape="rect" href="developers.html" title="Developers">Developer Guide</a></li><li><a shape="rect" href="source.html" title="Source">Source</a></li><li><a shape="rect" href="building.html" title="Building">Building</a></li><li><a shape="rect" href="javadoc.html" title="JavaDoc">JavaDoc</a></li><li><a shape="rect" href="irc-room.html" title="IRC Room">IRC Room</a></li></ul>
+
+
+<h3><a shape="rect" name="Navigation-ApacheSoftwareFoundation"></a>Apache Software Foundation</h3>
+
+<ul class="alternate" type="square"><li><a shape="rect" class="external-link" href="http://www.apache.org/licenses/">License</a></li><li><a shape="rect" class="external-link" href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li><li><a shape="rect" class="external-link" href="http://www.apache.org/foundation/thanks.html">Thanks</a></li><li><a shape="rect" class="external-link" href="http://www.apache.org/security/">Security</a></li></ul>
+</div>
+                <!-- NavigationBar -->
+            </div>
+          </div>
+        </td>
+        </tr>
+	</tbody>
+        </table>
+
+
+        <div class="bottom_red_bar"></div>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="black_box">
+<div class="footer">
+  <div class="footer_l">
+    <div class="footer_r">
+      <div>
+        <a href="$base/privacy-policy.html">Privacy Policy</a> -
+        (<a href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=33293112">edit page</a>)
+   	 (<a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=33293112&amp;showComments=true&amp;showCommentArea=true#addcomment">add comment</a>)
+      </div>
+    </div>
+  </div>
+</div>
+</div>
+</div>
+<div class="design_attribution">
+&copy; 2004-2011 The Apache Software Foundation.
+<br>          
+Apache Camel, Camel, Apache, the Apache feather logo, and the Apache Camel project logo are trademarks of The Apache Software Foundation.  All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+<br>
+<a href="http://hiramchirino.com">Graphic Design By Hiram</a>
+</div>
+
+<!-- Camel committers that would like access to the Analytics, send a note to private@camel.apache.org -->
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-25976253-1']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
+
+</body>
+</html>
+
+

Modified: websites/production/camel/content/twitter-websocket-example.html
==============================================================================
--- websites/production/camel/content/twitter-websocket-example.html (original)
+++ websites/production/camel/content/twitter-websocket-example.html Mon Jul  8 19:20:54 2013
@@ -89,6 +89,8 @@
 
 <p>This example is located in the Camel <a shape="rect" href="download.html" title="Download">distribution</a> at <tt>examples/camel-example-twitter-websocket</tt>.</p>
 
+<div class="panelMacro"><table class="tipMacro"><colgroup span="1"><col span="1" width="24"><col span="1"></colgroup><tr><td colspan="1" rowspan="1" valign="top"><img align="middle" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" width="16" height="16" alt="" border="0"></td><td colspan="1" rowspan="1">There is a <a shape="rect" href="twitter-websocket-blueprint-example.html" title="Twitter Websocket Blueprint Example">Twitter Websocket Blueprint Example</a> for OSGi Blueprint users.</td></tr></table></div>
+
 <p>The example is demonstrating how to poll a constant feed of twitter searches and publish results in real time using web socket to a web page.<br clear="none">
 As usual the code in Camel is very simple. All it takes is roughly</p>
 
@@ -142,7 +144,7 @@ http://localhost:9090/index.html
 <span class="image-wrap" style=""><img src="twitter-websocket-example.data/gaga.png" style="border: 0px solid black"></span></p>
 
 <h3><a shape="rect" name="TwitterWebsocketExample-Seealso"></a>See also</h3>
-<ul class="alternate" type="square"><li><a shape="rect" href="twitter.html" title="Twitter">Twitter</a></li><li><a shape="rect" href="websocket.html" title="Websocket">Websocket</a></li><li><a shape="rect" href="examples.html" title="Examples">Examples</a></li><li><a shape="rect" href="tutorials.html" title="Tutorials">Tutorials</a></li><li><a shape="rect" href="user-guide.html" title="User Guide">User Guide</a></li></ul>
+<ul class="alternate" type="square"><li><a shape="rect" href="twitter-websocket-blueprint-example.html" title="Twitter Websocket Blueprint Example">Twitter Websocket Blueprint Example</a></li><li><a shape="rect" href="twitter.html" title="Twitter">Twitter</a></li><li><a shape="rect" href="websocket.html" title="Websocket">Websocket</a></li><li><a shape="rect" href="examples.html" title="Examples">Examples</a></li><li><a shape="rect" href="tutorials.html" title="Tutorials">Tutorials</a></li><li><a shape="rect" href="user-guide.html" title="User Guide">User Guide</a></li></ul>
 </div>
         </td>
         <td valign="top">