svn commit: r868288 - in /websites/production/activemq/content: amqp.html cache/main.pageCache

[bu...@apache.org]

Author: buildbot
Date: Wed Jul  3 15:21:59 2013
New Revision: 868288

Log:
Production update by buildbot for activemq

Modified:
    websites/production/activemq/content/amqp.html
    websites/production/activemq/content/cache/main.pageCache

Modified: websites/production/activemq/content/amqp.html
==============================================================================
--- websites/production/activemq/content/amqp.html (original)
+++ websites/production/activemq/content/amqp.html Wed Jul  3 15:21:59 2013
@@ -136,33 +136,27 @@ body of the AMQP message to JMS body</td
 </div>
 
 
-
 <p>Set the <b>transformer</b> transport option on the transportConnector to the desired mapping strategy. For example, to interoperate with JMS at the payload level, set the <b>transformer</b> option to <b>jms</b></p>
 
+<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
+<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
+     &lt;transportConnector name="amqp" uri="amqp://localhost:5672?transport.transformer=jms"/&gt;
+]]></script>
+</div></div>
+
 <h4><a shape="rect" name="AMQP-HowAMQPmessageheadersaremappedtoJMSHeaders%3A"></a>How AMQP message headers are mapped to JMS Headers:</h4>
 
+<p>The following headers are mapped regardless of the transformer used:</p>
+
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> AMQP Message </th><th colspan="1" rowspan="1" class="confluenceTh"> JMS Message </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.durable </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSDeliveryMode </td><td colspan="1" rowspan="1" class="confluenceTd"> javax.jms.Message.DEFAULT_DELIVERY_MODE if not set </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.priority </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSPriority </td><td colspan="1" rowspan="1" class="confluenceTd"> javax.jms.Message.DEFAULT_PRIORITY if not set </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.ttl </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSExpiration </td><td colspan="1" rowspan="1" class="confluenceTd"> javax.jms.Message.DEFAULT_TIME_TO_LIVE if not set </td></tr><
 tr><td colspan="1" rowspan="1" class="confluenceTd"> header.first-acquirer </td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_FirstAcquirer </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.deliveryCount </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSXDeliveryCount </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> delivery-annotations.$
-<div class="error"><span class="error">Unknown macro: {name}</span> <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_DA_$</td></tr></tbody></table>
-</div>
-</div>
-<p> </p></td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> message-annotations.x-opt-jms-type </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSType </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> message-annotations.x-opt-to-type </td><td colspan="1" rowspan="1" class="confluenceTd"> Type of the JMSDestination </td><td colspan="1" rowspan="1" class="confluenceTd"> Comma separated list of 'queue', 'topic', or 'temporary', defaults to queue if not set. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> message-annotations.x-opt-reply-type </td><td colspan="1" rowspan="1" class="confluenceTd"> Type of the JMSReplyTo </td><td colspan="1" rowspan="1" class="confluenceTd"> Comma separated list of 'queue', 'topic', or 'temporary', defaults to queue if not set. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"
 > message-annotations.$
-<div class="error"><span class="error">Unknown macro: {name}</span> <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_MA_$</td></tr></tbody></table>
-</div>
-</div>
-<p> </p></td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> application-properties.JMSXGroupID </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSXGroupID </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> application-properties.JMSXGroupSequence </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSXGroupSequence </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> application-properties.JMSXUserID </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSXUserID </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> application-properties.$
-<div class="error"><span class="error">Unknown macro: {name}</span> <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"> $</td></tr></tbody></table>
-</div>
-</div>
-<p> </p></td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.message-id </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSMessageID </td><td colspan="1" rowspan="1" class="confluenceTd"> Auto generated if not set </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.user-id </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSXUserID </td><td colspan="1" rowspan="1" class="confluenceTd"> properties.user-id is decoded as a UTF-8 String </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.to </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSDestination </td><td colspan="1" rowspan="1" class="confluenceTd"> The name of the JMSDestination </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.subject </td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_Subject </td><td colspan="1" rowspan="1" class="confluenceTd"
 >&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.reply-to </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSReplyTo </td><td colspan="1" rowspan="1" class="confluenceTd"> The name of the JMSReplyTo </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.correlation-id </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSCorrelationID </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.content-type </td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_ContentType </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.content-encoding </td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_ContentEncoding </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.creat
 ion-time </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSTimestamp </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.group-sequence </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSXGroupSequence </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.reply-to-group-id</td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_ReplyToGroupID </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> footer.$
-<div class="error"><span class="error">Unknown macro: {name}</span> <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_FT_$</td></tr></tbody></table>
-</div>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> AMQP Message </th><th colspan="1" rowspan="1" class="confluenceTh"> JMS Message </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_NATIVE </td><td colspan="1" rowspan="1" class="confluenceTd"> Will be set to true if the transformer is 'native' or 'raw', false otherwise. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> message-format </td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_MESSAGE_FORMAT </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr></tbody></table>
 </div>
-<p> </p></td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr></tbody></table>
+
+
+<p>The following headers are mapped if the transformer is 'native' or 'jms':</p>
+
+<div class="table-wrap">
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> AMQP Message </th><th colspan="1" rowspan="1" class="confluenceTh"> JMS Message </th><th colspan="1" rowspan="1" class="confluenceTh"> Notes </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.durable </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSDeliveryMode </td><td colspan="1" rowspan="1" class="confluenceTd"> javax.jms.Message.DEFAULT_DELIVERY_MODE if not set </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.priority </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSPriority </td><td colspan="1" rowspan="1" class="confluenceTd"> javax.jms.Message.DEFAULT_PRIORITY if not set </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.ttl </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSExpiration </td><td colspan="1" rowspan="1" class="confluenceTd"> javax.jms.Message.DEFAULT_TIME_TO_LIVE if not set </td></tr><
 tr><td colspan="1" rowspan="1" class="confluenceTd"> header.first-acquirer </td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_FirstAcquirer </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> header.deliveryCount </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSXDeliveryCount </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> delivery-annotations.<b><ins>name</ins></b> </td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_DA_<b><ins>name</ins></b> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> message-annotations.x-opt-jms-type </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSType </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> message-annotations.x-opt-to-type </td><td colspan="1" rowspan="1" class="confluen
 ceTd"> Type of the JMSDestination </td><td colspan="1" rowspan="1" class="confluenceTd"> Comma separated list of 'queue', 'topic', or 'temporary', defaults to queue if not set. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> message-annotations.x-opt-reply-type </td><td colspan="1" rowspan="1" class="confluenceTd"> Type of the JMSReplyTo </td><td colspan="1" rowspan="1" class="confluenceTd"> Comma separated list of 'queue', 'topic', or 'temporary', defaults to queue if not set. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> message-annotations.<b><ins>name</ins></b> </td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_MA_<b><ins>name</ins></b> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> application-properties.JMSXGroupID </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSXGroupID </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><
 td colspan="1" rowspan="1" class="confluenceTd"> application-properties.JMSXGroupSequence </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSXGroupSequence </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> application-properties.JMSXUserID </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSXUserID </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> application-properties.<b><ins>name</ins></b> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b><ins>name</ins></b> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.message-id </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSMessageID </td><td colspan="1" rowspan="1" class="confluenceTd"> Auto generated if not set </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> pro
 perties.user-id </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSXUserID </td><td colspan="1" rowspan="1" class="confluenceTd"> properties.user-id is decoded as a UTF-8 String </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.to </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSDestination </td><td colspan="1" rowspan="1" class="confluenceTd"> The name of the JMSDestination </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.subject </td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_Subject </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.reply-to </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSReplyTo </td><td colspan="1" rowspan="1" class="confluenceTd"> The name of the JMSReplyTo </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.correlation-id </td><td colspan="1" rowspan="1" class="c
 onfluenceTd"> JMSCorrelationID </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.content-type </td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_ContentType </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.content-encoding </td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_ContentEncoding </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.creation-time </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSTimestamp </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.group-sequence </td><td colspan="1" rowspan="1" class="confluenceTd"> JMSXGroupSequence </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr>
 <tr><td colspan="1" rowspan="1" class="confluenceTd"> properties.reply-to-group-id</td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_ReplyToGroupID </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> footer.<b><ins>name</ins></b> </td><td colspan="1" rowspan="1" class="confluenceTd"> JMS_AMQP_FT_<b><ins>name</ins></b> </td><td colspan="1" rowspan="1" class="confluenceTd">&#160;</td></tr></tbody></table>
 </div>
 
 
@@ -173,19 +167,16 @@ body of the AMQP message to JMS body</td
 </div>
 
 
-<p>&lt;!-- TODO:</p>
-<div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><td colspan="1" rowspan="1" class="confluenceTd"> char </td><td colspan="1" rowspan="1" class="confluenceTd"> String </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> timestamp </td><td colspan="1" rowspan="1" class="confluenceTd"> Long </td></tr></tbody></table>
-</div>
+<p></p>
 
-<p>--&gt;</p>
+<h4><a shape="rect" name="AMQP-HowAMQPmessagesbodiesaremappedtoJMSMessages%3A"></a>How AMQP messages bodies are mapped to JMS Messages:</h4>
 
+<p>If the transformer is set to 'jms', the they type of JMS message will depend on the body type of the AMQP message.</p>
+
+<div class="table-wrap">
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Body Type </th><th colspan="1" rowspan="1" class="confluenceTh"> JMS Message Type </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> null </td><td colspan="1" rowspan="1" class="confluenceTd"> Message </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> Data </td><td colspan="1" rowspan="1" class="confluenceTd"> BytesMessage </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> AmqpSequence </td><td colspan="1" rowspan="1" class="confluenceTd"> StreamMessage </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> AmqpValue holding a null </td><td colspan="1" rowspan="1" class="confluenceTd"> Message </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> AmqpValue holding a String </td><td colspan="1" rowspan="1" class="confluenceTd"> TextMessage </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> AmqpValue holding a binary </td><t
 d colspan="1" rowspan="1" class="confluenceTd"> BytesMessage </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> AmqpValue holding a list </td><td colspan="1" rowspan="1" class="confluenceTd"> StreamMessage </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> AmqpValue </td><td colspan="1" rowspan="1" class="confluenceTd"> ObjectMessage </td></tr></tbody></table>
+</div>
 
-<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<script class="theme: Default; brush: xml; gutter: false" type="syntaxhighlighter"><![CDATA[
-     &lt;transportConnector name="amqp" uri="amqp://localhost:5672?transport.transformer=jms"/&gt;
-]]></script>
-</div></div>
 
 <h3><a shape="rect" name="AMQP-AMQP1.0clientlibrary"></a>AMQP 1.0 client library</h3>
 

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