http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/appserver-integration.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/appserver-integration.xml b/docs/user-manual/en/appserver-integration.xml index a22d95e..897de10 100644 --- a/docs/user-manual/en/appserver-integration.xml +++ b/docs/user-manual/en/appserver-integration.xml @@ -494,38 +494,35 @@ public class MyMDB implements MessageListener </row> <row> <entry> - <link linkend="configuration.connection-factory.discovery-initial-wait-timeout"> - DiscoveryInitialWaitTimeout - </link> + DiscoveryInitialWaitTimeout </entry> <entry>Long</entry> <entry>The initial time to wait for discovery.</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.connection-load-balancing-policy-class-name"> - ConnectionLoadBalancingPolicyClassName</link> + ConnectionLoadBalancingPolicyClassName </entry> <entry>String</entry> <entry>The load balancing policy class to use.</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.connection-ttl">ConnectionTTL</link> + ConnectionTTL </entry> <entry>Long</entry> <entry>The time to live (in milliseconds) for the connection.</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.call-timeout">CallTimeout</link> + CallTimeout </entry> <entry>Long</entry> <entry>the call timeout (in milliseconds) for each packet sent.</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.dups-ok-batch-size">DupsOKBatchSize</link> + DupsOKBatchSize </entry> <entry>Integer</entry> <entry>the batch size (in bytes) between acknowledgements when using @@ -533,7 +530,7 @@ public class MyMDB implements MessageListener </row> <row> <entry> - <link linkend="configuration.connection-factory.transaction-batch-size">TransactionBatchSize</link> + TransactionBatchSize </entry> <entry>Integer</entry> <entry>the batch size (in bytes) between acknowledgements when using a @@ -541,70 +538,70 @@ public class MyMDB implements MessageListener </row> <row> <entry> - <link linkend="configuration.connection-factory.consumer-window-size">ConsumerWindowSize</link> + ConsumerWindowSize </entry> <entry>Integer</entry> <entry>the window size (in bytes) for consumer flow control</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.consumer-max-rate">ConsumerMaxRate</link> + ConsumerMaxRate </entry> <entry>Integer</entry> <entry>the fastest rate a consumer may consume messages per second</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.confirmation-window-size">ConfirmationWindowSize</link> + ConfirmationWindowSize </entry> <entry>Integer</entry> <entry>the window size (in bytes) for reattachment confirmations</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.producer-max-rate">ProducerMaxRate</link> + ProducerMaxRate </entry> <entry>Integer</entry> <entry>the maximum rate of messages per second that can be sent</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.min-large-message-size">MinLargeMessageSize</link> + MinLargeMessageSize </entry> <entry>Integer</entry> <entry>the size (in bytes) before a message is treated as large </entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.block-on-acknowledge">BlockOnAcknowledge</link> + BlockOnAcknowledge </entry> <entry>Boolean</entry> <entry>whether or not messages are acknowledged synchronously</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.block-on-non-durable-send">BlockOnNonDurableSend</link> + BlockOnNonDurableSend </entry> <entry>Boolean</entry> <entry>whether or not non-durable messages are sent synchronously</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.block-on-durable-send">BlockOnDurableSend</link> + BlockOnDurableSend </entry> <entry>Boolean</entry> <entry>whether or not durable messages are sent synchronously</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.auto-group">AutoGroup</link> + AutoGroup </entry> <entry>Boolean</entry> <entry>whether or not message grouping is automatically used</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.pre-acknowledge">PreAcknowledge</link> + PreAcknowledge </entry> <entry>Boolean</entry> <entry>whether messages are pre acknowledged by the server before @@ -612,28 +609,28 @@ public class MyMDB implements MessageListener </row> <row> <entry> - <link linkend="configuration.connection-factory.reconnect-attempts">ReconnectAttempts</link> + ReconnectAttempts </entry> <entry>Integer</entry> <entry>maximum number of retry attempts, default for the resource adapter is -1 (infinite attempts)</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.retry-interval">RetryInterval</link> + RetryInterval </entry> <entry>Long</entry> <entry>the time (in milliseconds) to retry a connection after failing</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.retry-interval-multiplier">RetryIntervalMultiplier</link> + RetryIntervalMultiplier </entry> <entry>Double</entry> <entry>multiplier to apply to successive retry intervals</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.failover-on-server-shutdown">FailoverOnServerShutdown</link> + FailoverOnServerShutdown </entry> <entry>Boolean</entry> <entry>If true client will reconnect to another server if @@ -641,14 +638,14 @@ public class MyMDB implements MessageListener </row> <row> <entry> - <link linkend="configuration.connection-factory.client-id">ClientID</link> + ClientID </entry> <entry>String</entry> <entry>the pre-configured client ID for the connection factory</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.client-failure-check-period">ClientFailureCheckPeriod</link> + ClientFailureCheckPeriod </entry> <entry>Long</entry> <entry>the period (in ms) after which the client will consider the @@ -657,21 +654,21 @@ public class MyMDB implements MessageListener </row> <row> <entry> - <link linkend="configuration.connection-factory.use-global-pools">UseGlobalPools</link> + UseGlobalPools </entry> <entry>Boolean</entry> <entry>whether or not to use a global thread pool for threads</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.scheduled-thread-pool-max-size">ScheduledThreadPoolMaxSize</link> + ScheduledThreadPoolMaxSize </entry> <entry>Integer</entry> <entry>the size of the <emphasis>scheduled thread</emphasis> pool</entry> </row> <row> <entry> - <link linkend="configuration.connection-factory.thread-pool-max-size">ThreadPoolMaxSize</link> + ThreadPoolMaxSize </entry> <entry>Integer</entry> <entry>the size of the thread pool</entry>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/client-classpath.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/client-classpath.xml b/docs/user-manual/en/client-classpath.xml index 0115770..2baafbd 100644 --- a/docs/user-manual/en/client-classpath.xml +++ b/docs/user-manual/en/client-classpath.xml @@ -47,12 +47,5 @@ needed for the <literal>javax.jms.*</literal> classes. If you already have a jar with these interface classes on your classpath, you will not need it.</para> </note> - - </section> - <section> - <title>JMS Client with JNDI</title> - <para>If you are looking up JMS resources from the JNDI server co-located with the ActiveMQ - standalone server, you will also need the jar <literal>jnp-client.jar</literal> jar on - your client classpath as well as any other jars mentioned previously.</para> </section> </chapter> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/client-reconnection.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/client-reconnection.xml b/docs/user-manual/en/client-reconnection.xml index 29a4266..96a4534 100644 --- a/docs/user-manual/en/client-reconnection.xml +++ b/docs/user-manual/en/client-reconnection.xml @@ -115,23 +115,16 @@ default value is <literal>0</literal>.</para> </listitem> </itemizedlist> - <para>If you're using JMS, and you're using the JMS Service on the server to load your JMS - connection factory instances directly into JNDI, then you can specify these parameters - in the xml configuration in <literal>activemq-jms.xml</literal>, for example:</para> + <para>If you're using JMS and you're using JNDI on the client to look up your JMS + connection factory instances then you can specify these parameters + in the JNDI context environment in, e.g. <literal>jndi.properties</literal>:</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - <entry name="XAConnectionFactory"/> - </entries> - <retry-interval>1000</retry-interval> - <retry-interval-multiplier>1.5</retry-interval-multiplier> - <max-retry-interval>60000</max-retry-interval> - <reconnect-attempts>1000</reconnect-attempts> -</connection-factory></programlisting> +java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url = tcp://localhost:5445 +connection.ConnectionFactory.retryInterval=1000 +connection.ConnectionFactory.retryIntervalMultiplier=1.5 +connection.ConnectionFactory.maxRetryInterval=60000 +connection.ConnectionFactory.reconnectAttempts=1000</programlisting> <para>If you're using JMS, but instantiating your JMS connection factory directly, you can specify the parameters using the appropriate setter methods on the <literal >ActiveMQConnectionFactory</literal> immediately after creating it.</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/clusters.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/clusters.xml b/docs/user-manual/en/clusters.xml index 6d4227e..2b4aad1 100644 --- a/docs/user-manual/en/clusters.xml +++ b/docs/user-manual/en/clusters.xml @@ -378,18 +378,15 @@ whether you're using JMS or the core API.</para> <section> <title>Configuring client discovery using JMS</title> - <para>If you're using JMS and you're also using the JMS Service on the server to - load your JMS connection factory instances into JNDI, then you can specify which - discovery group to use for your JMS connection factory in the server side xml - configuration <literal>activemq-jms.xml</literal>. Let's take a look at an + <para>If you're using JMS and you're using JNDI on the client to look up your JMS + connection factory instances then you can specify these parameters in the JNDI + context environment. e.g. in <literal>jndi.properties</literal>. Simply ensure the + host:port combination matches the group-address and group-port from the corresponding + <literal>broadcast-group</literal> on the server. Let's take a look at an example:</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <discovery-group-ref discovery-group-name="my-discovery-group"/> - <entries> - <entry name="ConnectionFactory"/> - </entries> -</connection-factory></programlisting> +java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url = udp://231.7.7.7:9876</programlisting> <para>The element <literal>discovery-group-ref</literal> specifies the name of a discovery group defined in <literal>activemq-configuration.xml</literal>.</para> <para>When this connection factory is downloaded from JNDI by a client application @@ -471,27 +468,17 @@ ClientSession session2 = factory.createSession();</programlisting> <para>A static list of possible servers can also be used by a normal client.</para> <section> <title>Configuring client discovery using JMS</title> - <para>If you're using JMS and you're also using the JMS Service on the server to - load your JMS connection factory instances into JNDI, then you can specify which - connectors to use for your JMS connection factory in the server side xml - configuration <literal>activemq-jms.xml</literal>. Let's take a look at an - example:</para> + <para>If you're using JMS and you're using JNDI on the client to look up your JMS + connection factory instances then you can specify these parameters + in the JNDI context environment in, e.g. <literal>jndi.properties</literal>:</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - <connector-ref connector-name="netty-connector2"/> - <connector-ref connector-name="netty-connector3"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> -</connection-factory></programlisting> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://myhost:5445,myhost2:5445</programlisting> <para> - The element <literal>connectors</literal> contains a list of pre defined connectors in the - <literal>activemq-configuration.xml</literal> file. When this connection factory is downloaded - from JNDI by a client application and JMS connections are created from it, those connections will - be load-balanced across the list of servers defined by these connectors. + The <literal>java.naming.provider.url</literal> contains a list of servers to use for the + connection factory. When this connection factory used client application and JMS connections + are created from it, those connections will be load-balanced across the list of servers defined + by the <literal>java.naming.provider.url</literal>. </para> <para> If you're using JMS, but you're not using JNDI to lookup a connection factory - you're instantiating @@ -830,20 +817,14 @@ ClientSession session = factory.createSession();</programlisting> <para>Specifying which load balancing policy to use differs whether you are using JMS or the core API. If you don't specify a policy then the default will be used which is <literal >org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>.</para> - <para>If you're using JMS, and you're using JNDI on the server to put your JMS connection - factories into JNDI, then you can specify the load balancing policy directly in the - <literal>activemq-jms.xml</literal> configuration file on the server as follows:</para> + <para>If you're using JMS and you're using JNDI on the client to look up your JMS connection factory instances + then you can specify these parameters in the JNDI context environment in, e.g. + <literal>jndi.properties</literal>, to specify the load balancing policy directly:</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <discovery-group-ref discovery-group-name="my-discovery-group"/> - <entries> - <entry name="ConnectionFactory"/> - </entries> - <connection-load-balancing-policy-class-name> - org.apache.activemq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy - </connection-load-balancing-policy-class-name> -</connection-factory></programlisting> - <para>The above example would deploy a JMS connection factory that uses the random connection load +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +connection.ConnectionFactory.loadBalancingPolicyClassName=org.apache.activemq.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy</programlisting> + <para>The above example would instantiate a JMS connection factory that uses the random connection load balancing policy. </para> <para>If you're using JMS but you're instantiating your connection factory directly on the client side then you can set the load balancing policy using the setter on the http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/configuration-index.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/configuration-index.xml b/docs/user-manual/en/configuration-index.xml index db63a1b..8307d99 100644 --- a/docs/user-manual/en/configuration-index.xml +++ b/docs/user-manual/en/configuration-index.xml @@ -73,364 +73,56 @@ </thead> <tbody> <row> - <entry> - <link linkend="using-jms.server.configuration">connection-factory</link> - </entry> - <entry>ConnectionFactory</entry> - <entry>a list of connection factories to create and add to JNDI</entry> - <entry/> - </row> - </tbody> - </tgroup> - </table> - <para></para> - <para></para> - <para>Continued..</para> - <informaltable frame="topbot"> - <tgroup cols="4"> - <colspec colname="c1" colnum="1"/> - <colspec colname="c2" colnum="2"/> - <colspec colname="c3" colnum="3"/> - <colspec colname="c4" colnum="4"/> - <tbody> - <row> - <entry id="configuration.connection-factory.signature"> - <link linkend="using-jms.configure.factory.types">connection-factory.signature (attribute)</link> - </entry> - <entry>String</entry> - <entry>Type of connection factory</entry> - <entry>generic</entry> - </row> - <row> - <entry id="configuration.connection-factory.signature.xa"> - <link linkend="using-jms.configure.factory.types">connection-factory.xa</link> - </entry> - <entry>Boolean</entry> - <entry>If it is a XA connection factory</entry> - <entry>false</entry> - </row> - <row> - <entry id="configuration.connection-factory.auto-group"> - <link linkend="message-grouping.jmsconfigure">connection-factory.auto-group</link> - </entry> - <entry>Boolean</entry> - <entry>whether or not message grouping is automatically used</entry> - <entry>false</entry> - </row> - <row> - <entry><link linkend="clusters">connection-factory.connectors</link> - </entry> - <entry>String</entry> - <entry>A list of connectors used by the connection factory</entry> - <entry /> - </row> - <row> - <entry><link linkend="clusters" - >connection-factory.connectors.connector-ref.connector-name (attribute)</link> - </entry> - <entry>String</entry> - <entry>Name of the connector to connect to the live server</entry> - <entry /> - </row> - <row> - <entry><link linkend="clusters" - >connection-factory.discovery-group-ref.discovery-group-name (attribute)</link> - </entry> - <entry>String</entry> - <entry>Name of discovery group used by this connection factory</entry> - <entry /> - </row> - <row> - <!-- FIXME documented but does not exist? --> - <entry id="configuration.connection-factory.discovery-initial-wait-timeout"> - <link linkend="clusters" - >connection-factory.discovery-initial-wait-timeout</link> - </entry> - <entry>Long</entry> - <entry>the initial time to wait (in ms) for discovery groups to wait for - broadcasts</entry> - <entry>10000</entry> - </row> - <row> - <entry id="configuration.connection-factory.block-on-acknowledge"> - <link linkend="send-guarantees.nontrans.acks">connection-factory.block-on-acknowledge</link> - </entry> - <entry>Boolean</entry> - <entry>whether or not messages are acknowledged synchronously</entry> - <entry>false</entry> - </row> - <row> - <entry id="configuration.connection-factory.block-on-non-durable-send"> - <link linkend="non-transactional-sends">connection-factory.block-on-non-durable-send</link> - </entry> - <entry>Boolean</entry> - <entry>whether or not non-durable messages are sent synchronously</entry> - <entry>false</entry> - </row> - <row> - <entry id="configuration.connection-factory.block-on-durable-send"> - <link linkend="non-transactional-sends">connection-factory.block-on-durable-send</link> - </entry> - <entry>Boolean</entry> - <entry>whether or not durable messages are sent synchronously</entry> - <entry>true</entry> - </row> - <row> - <entry id="configuration.connection-factory.call-timeout">connection-factory.call-timeout</entry> - <entry>Long</entry> - <entry>the timeout (in ms) for remote calls</entry> - <entry>30000</entry> - </row> - <row> - <entry id="configuration.connection-factory.client-failure-check-period"> - <link linkend="dead.connections">connection-factory.client-failure-check-period</link> - </entry> - <entry>Long</entry> - <entry>the period (in ms) after which the client will consider the - connection failed after not receiving packets from the - server</entry> - <entry>30000</entry> - </row> - <row> - <entry id="configuration.connection-factory.client-id"> - <link linkend="using-jms.clientid">connection-factory.client-id</link> - </entry> - <entry>String</entry> - <entry>the pre-configured client ID for the connection factory</entry> - <entry>null</entry> - </row> - <row> - <entry id="configuration.connection-factory.connection-load-balancing-policy-class-name"> - <link linkend="clusters"> - connection-factory.connection-load-balancing-policy-class-name</link> - </entry> - <entry>String</entry> - <entry>the name of the load balancing class</entry> - <entry>org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</entry> - </row> - <row> - <entry id="configuration.connection-factory.connection-ttl"> - <link linkend="dead.connections">connection-factory.connection-ttl</link> - </entry> - <entry>Long</entry> - <entry>the time to live (in ms) for connections</entry> - <entry>1 * 60000</entry> - </row> - <row> - <entry id="configuration.connection-factory.consumer-max-rate"> - <link linkend="flow-control.rate.core.api">connection-factory.consumer-max-rate</link></entry> - <entry>Integer</entry> - <entry>the fastest rate a consumer may consume messages per - second</entry> - <entry>-1</entry> - </row> - <row> - <entry id="configuration.connection-factory.consumer-window-size"> - <link linkend="flow-control.core.api">connection-factory.consumer-window-size</link></entry> - <entry>Integer</entry> - <entry>the window size (in bytes) for consumer flow control</entry> - <entry>1024 * 1024</entry> - </row> - <row> - <entry id="configuration.connection-factory.dups-ok-batch-size"> - <link linkend="using-jms.dupsokbatchsize">connection-factory.dups-ok-batch-size</link></entry> - <entry>Integer</entry> - <entry>the batch size (in bytes) between acknowledgements when using - DUPS_OK_ACKNOWLEDGE mode</entry> - <entry>1024 * 1024</entry> - </row> - <row> - <entry><link linkend="ha.automatic.failover" - >connection-factory.failover-on-initial-connection</link></entry> - <entry>Boolean</entry> - <entry>whether or not to failover to backup on event that initial connection to live server fails</entry> - <entry>false</entry> - </row> - <row> - <entry id="configuration.connection-factory.failover-on-server-shutdown"> - <link linkend="ha.automatic.failover">connection-factory.failover-on-server-shutdown</link></entry> - <entry>Boolean</entry> - <entry>whether or not to failover on server shutdown</entry> - <entry>false</entry> - </row> - <row> - <entry id="configuration.connection-factory.min-large-message-size"> - <link linkend="large-messages.core.config">connection-factory.min-large-message-size</link></entry> - <entry>Integer</entry> - <entry>the size (in bytes) before a message is treated as large</entry> - <entry>100 * 1024</entry> - </row> - <row> - <entry id="configuration.connection-factory.avoid-large-messages"> - <link linkend="large.message.configuring">connection-factory.avoid-large-messages</link></entry> - <entry>Boolean</entry> - <entry>If compress large messages and send them as regular messages if possible</entry> - <entry>false</entry> - </row> - <row> - <entry><link linkend="clusters" - >connection-factory.cache-large-message-client</link></entry> - <entry>Boolean</entry> - <entry>If true clients using this connection factory will hold the large - message body on temporary files.</entry> - <entry>false</entry> - </row> - <row> - <entry id="configuration.connection-factory.pre-acknowledge"> - <link linkend="pre-acknowledge.configure">connection-factory.pre-acknowledge</link></entry> - <entry>Boolean</entry> - <entry>whether messages are pre acknowledged by the server before - sending</entry> - <entry>false</entry> - </row> - <row> - <entry id="configuration.connection-factory.producer-max-rate"> - <link linkend="flow-control.producer.rate.core.api">connection-factory.producer-max-rate</link></entry> - <entry>Integer</entry> - <entry>the maximum rate of messages per second that can be sent</entry> - <entry>-1</entry> - </row> - <row> - <entry><link linkend="client-reconnection" - >connection-factory.producer-window-size</link></entry> - <entry>Integer</entry> - <entry>the window size in bytes for producers sending messages</entry> - <entry>1024 * 1024</entry> - </row> - <row> - <entry id="configuration.connection-factory.confirmation-window-size"> - <link linkend="client-reconnection">connection-factory.confirmation-window-size</link> - </entry> - <entry>Integer</entry> - <entry>the window size (in bytes) for reattachment confirmations</entry> - <entry>1024 * 1024</entry> - </row> - <row> - <entry id="configuration.connection-factory.reconnect-attempts"> - <link linkend="client-reconnection">connection-factory.reconnect-attempts</link> - </entry> - <entry>Integer</entry> - <entry>maximum number of retry attempts, -1 signifies infinite</entry> - <entry>0</entry> - </row> - <row> - <entry id="configuration.connection-factory.retry-interval"> - <link linkend="client-reconnection">connection-factory.retry-interval</link> - </entry> - <entry>Long</entry> - <entry>the time (in ms) to retry a connection after failing</entry> - <entry>2000</entry> - </row> - <row> - <entry id="configuration.connection-factory.retry-interval-multiplier"> - <link linkend="client-reconnection">connection-factory.retry-interval-multiplier</link> - </entry> - <entry>Double</entry> - <entry>multiplier to apply to successive retry intervals</entry> - <entry>1.0</entry> - </row> - <row> - <entry><link linkend="client-reconnection" - >connection-factory.max-retry-interval</link></entry> - <entry>Integer</entry> - <entry>The maximum retry interval in the case a retry-interval-multiplier has been specified</entry> - <entry>2000</entry> - </row> - <row> - <entry id="configuration.connection-factory.scheduled-thread-pool-max-size"> - <link linkend="thread-pooling.client.side">connection-factory.scheduled-thread-pool-max-size</link> - </entry> - <entry>Integer</entry> - <entry>the size of the <emphasis>scheduled thread</emphasis> pool</entry> - <entry>5</entry> - </row> - <row> - <entry id="configuration.connection-factory.thread-pool-max-size"> - <link linkend="thread-pooling.client.side">connection-factory.thread-pool-max-size</link> - </entry> - <entry>Integer</entry> - <entry>the size of the thread pool</entry> - <entry>-1</entry> - </row> - <row> - <entry id="configuration.connection-factory.transaction-batch-size"> - <link linkend="using-jms.txbatchsize"> - connection-factory.transaction-batch-size</link> - </entry> - <entry>Integer</entry> - <entry>the batch size (in bytes) between acknowledgements when using a - transactional session</entry> - <entry>1024 * 1024</entry> - </row> - <row> - <entry id="configuration.connection-factory.use-global-pools"> - <link linkend="thread-pooling.client.side">connection-factory.use-global-pools</link> - </entry> - <entry>Boolean</entry> - <entry>whether or not to use a global thread pool for threads</entry> - <entry>true</entry> - </row> - <row> - <entry><link linkend="using-jms.server.configuration" - >queue</link></entry> + <entry><link linkend="using-jms.server.configuration">queue</link></entry> <entry>Queue</entry> <entry>a queue to create and add to JNDI</entry> <entry/> </row> <row> - <entry><link linkend="using-jms.server.configuration">queue.name - (attribute)</link></entry> + <entry><link linkend="using-jms.server.configuration">queue.name (attribute)</link></entry> <entry>String</entry> <entry>unique name of the queue</entry> <entry/> </row> <row> - <entry><link linkend="using-jms.server.configuration" - >queue.entry</link></entry> + <entry><link linkend="using-jms.server.configuration">queue.entry</link></entry> <entry>String</entry> - <entry>context where the queue will be bound in JNDI (there can be - many)</entry> + <entry>context where the queue will be bound in JNDI (there can be many)</entry> <entry/> </row> <row> - <entry><link linkend="using-jms.server.configuration" - >queue.durable</link></entry> + <entry><link linkend="using-jms.server.configuration">queue.durable</link></entry> <entry>Boolean</entry> <entry>is the queue durable?</entry> <entry>true</entry> </row> <row> - <entry><link linkend="using-jms.server.configuration" - >queue.filter</link></entry> + <entry><link linkend="using-jms.server.configuration">queue.filter</link></entry> <entry>String</entry> <entry>optional filter expression for the queue</entry> <entry/> </row> <row> - <entry><link linkend="using-jms.server.configuration" - >topic</link></entry> + <entry><link linkend="using-jms.server.configuration">topic</link></entry> <entry>Topic</entry> <entry>a topic to create and add to JNDI</entry> <entry/> </row> <row> - <entry><link linkend="using-jms.server.configuration">topic.name - (attribute)</link></entry> + <entry><link linkend="using-jms.server.configuration">topic.name (attribute)</link></entry> <entry>String</entry> <entry>unique name of the topic</entry> <entry/> </row> <row> - <entry><link linkend="using-jms.server.configuration" - >topic.entry</link></entry> + <entry><link linkend="using-jms.server.configuration">topic.entry</link></entry> <entry>String</entry> - <entry>context where the topic will be bound in JNDI (there can be - many)</entry> + <entry>context where the topic will be bound in JNDI (there can be many)</entry> <entry/> </row> </tbody> </tgroup> - </informaltable> + </table> </section> <section id="configuration.masked-password"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/configuring-transports.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/configuring-transports.xml b/docs/user-manual/en/configuring-transports.xml index 7ee6c00..7e61d50 100644 --- a/docs/user-manual/en/configuring-transports.xml +++ b/docs/user-manual/en/configuring-transports.xml @@ -96,25 +96,16 @@ to other servers. That's defined by <emphasis>connectors</emphasis>.</para> </listitem> <listitem> - <para>If you're using JMS and the server side JMS service to instantiate JMS - ConnectionFactory instances and bind them in JNDI, then when creating the - <literal>ActiveMQConnectionFactory</literal> it needs to know what server - that connection factory will create connections to.</para> - <para>That's defined by the <literal>connector-ref</literal> element in the <literal - >activemq-jms.xml</literal> file on the server side. Let's take a look at a - snipped from a <literal>activemq-jms.xml</literal> file that shows a JMS - connection factory that references our netty connector defined in our <literal - >activemq-configuration.xml</literal> file:</para> + <para>If you're using JMS and you're using JNDI on the client to look up your JMS connection factory + instances then when creating the <literal>ActiveMQConnectionFactory</literal> it needs to know what + server that connection factory will create connections to.</para> + <para>That's defined by the <literal>java.naming.provider.url</literal> element in the JNDI context + environment, e.g. <literal>jndi.properties</literal>. Behind the scenes, the + <literal>org.apache.activemq.jndi.ActiveMQInitialContextFactory</literal> uses the + <literal>java.naming.provider.url</literal> to construct the transport. Here's a simple example:</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - <entry name="XAConnectionFactory"/> - </entries> -</connection-factory></programlisting> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://myhost:5445</programlisting> </listitem> </itemizedlist> </section> @@ -168,7 +159,7 @@ Connection jmsConnection = connectionFactory.createConnection(); etc</programlisting> </section> - <section> + <section id="configuring-transports.netty"> <title>Configuring the Netty transport</title> <para>Out of the box, ActiveMQ currently uses <ulink url="http://www.jboss.org/netty/"; >Netty</ulink>, a high performance low level network library.</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/flow-control.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/flow-control.xml b/docs/user-manual/en/flow-control.xml index 5853f9c..70ab4e2 100644 --- a/docs/user-manual/en/flow-control.xml +++ b/docs/user-manual/en/flow-control.xml @@ -111,20 +111,14 @@ </section> <section> <title>Using JMS</title> - <para>if JNDI is used to look up the connection factory, the consumer window size is - configured in <literal>activemq-jms.xml</literal>:</para> + <para>If JNDI is used on the client to instantiate and look up the connection factory the consumer window + size is configured in the JNDI context environment, e.g. <literal>jndi.properties</literal>. Here's a + simple example using the "ConnectionFactory" connection factory which is available in the context by + default:</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - - <!-- Set the consumer window size to 0 to have *no* buffer on the client side --> - <consumer-window-size>0</consumer-window-size> -</connection-factory></programlisting> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +connection.ConnectionFactory.consumerWindowSize=0</programlisting> <para>If the connection factory is directly instantiated, the consumer window size is specified by <literal>ActiveMQConnectionFactory.setConsumerWindowSize()</literal> method.</para> @@ -153,20 +147,13 @@ </section> <section> <title>Using JMS</title> - <para>If JNDI is used to look up the connection factory, the max rate can be configured - in <literal>activemq-jms.xml</literal>:</para> + <para>If JNDI is used to instantiate and look up the connection factory, the max rate can be configured in + the JNDI context environment, e.g. <literal>jndi.properties</literal>. Here's a simple example using the + "ConnectionFactory" connection factory which is available in the context by default:</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - <!-- We limit consumers created on this connection factory to consume messages at a maximum rate - of 10 messages per sec --> - <consumer-max-rate>10</consumer-max-rate> -</connection-factory></programlisting> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +connection.ConnectionFactory.consumerMaxRate=10</programlisting> <para>If the connection factory is directly instantiated, the max rate size can be set via the <literal>ActiveMQConnectionFactory.setConsumerMaxRate(int consumerMaxRate)</literal> method.</para> @@ -208,18 +195,13 @@ </section> <section> <title>Using JMS</title> - <para>If JNDI is used to look up the connection factory, the producer window size can be - configured in <literal>activemq-jms.xml</literal>:</para> + <para>If JNDI is used to instantiate and look up the connection factory, the producer window size can be + configured in the JNDI context environment, e.g. <literal>jndi.properties</literal>. Here's a simple + example using the "ConnectionFactory" connection factory which is available in the context by default:</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - <producer-window-size>10</producer-window-size> -</connection-factory></programlisting> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +connection.ConnectionFactory.producerWindowSize=10</programlisting> <para>If the connection factory is directly instantiated, the producer window size can be set via the <literal>ActiveMQConnectionFactory.setProducerWindowSize(int producerWindowSize)</literal> method.</para> @@ -286,29 +268,22 @@ <section id="flow-control.producer.rate.core.api"> <title>Using Core API</title> <para>If the ActiveMQ core API is being used the rate can be set via the <literal - >ServerLocator.setProducerMaxRate(int consumerMaxRate)</literal> method or + >ServerLocator.setProducerMaxRate(int producerMaxRate)</literal> method or alternatively via some of the <literal>ClientSession.createProducer()</literal> methods. </para> </section> <section> <title>Using JMS</title> - <para>If JNDI is used to look up the connection factory, the max rate can be configured - in <literal>activemq-jms.xml</literal>:</para> + <para>If JNDI is used to instantiate and look up the connection factory, the max rate size can be + configured in the JNDI context environment, e.g. <literal>jndi.properties</literal>. Here's a simple + example using the "ConnectionFactory" connection factory which is available in the context by default:</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - <!-- We limit producers created on this connection factory to produce messages at a maximum rate - of 10 messages per sec --> - <producer-max-rate>10</producer-max-rate> -</connection-factory></programlisting> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +connection.ConnectionFactory.producerMaxRate=10</programlisting> <para>If the connection factory is directly instantiated, the max rate size can be set via the <literal>ActiveMQConnectionFactory.setProducerMaxRate(int - consumerMaxRate)</literal> method.</para> + producerMaxRate)</literal> method.</para> </section> </section> </section> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/interoperability.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/interoperability.xml b/docs/user-manual/en/interoperability.xml index 3c9ceec..f3f3bdd 100644 --- a/docs/user-manual/en/interoperability.xml +++ b/docs/user-manual/en/interoperability.xml @@ -229,9 +229,8 @@ hq-message-id : STOMP12345</programlisting> <para>Stomp requires the file <literal>jndi.properties</literal> to be available on the classpath. This should look something like:</para> <programlisting> -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.provider.url=jnp://localhost:1099 -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces</programlisting> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory</programlisting> + <para>Configure any required JNDI resources in this file according to the documentation.</para> <para>Make sure this file is in the classpath along with the StompConnect jar and the ActiveMQ jars and simply run <literal>java org.codehaus.stomp.jms.Main</literal>.</para> </section> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/large-messages.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/large-messages.xml b/docs/user-manual/en/large-messages.xml index 42b18d2..43bc2a8 100644 --- a/docs/user-manual/en/large-messages.xml +++ b/docs/user-manual/en/large-messages.xml @@ -83,21 +83,14 @@ ClientSessionFactory factory = ActiveMQClient.createClientSessionFactory();</pro </section> <section> <title>Using JMS</title> - <para>If JNDI is used to look up the connection factory, the minimum large message size - is specified in <literal>activemq-jms.xml</literal></para> - <programlisting>... -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - <entry name="XAConnectionFactory"/> - </entries> - - <min-large-message-size>250000</min-large-message-size> -</connection-factory> -...</programlisting> + <para>If JNDI is used to instantiate and look up the connection factory, the minimum large message size + is configured in the JNDI context environment, e.g. <literal>jndi.properties</literal>. Here's a simple + example using the "ConnectionFactory" connection factory which is available in the context by default:</para> + <programlisting> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +connection.ConnectionFactory.minLargeMessageSize=250000 + </programlisting> <para>If the connection factory is being instantiated directly, the minimum large message size is specified by <literal >ActiveMQConnectionFactory.setMinLargeMessageSize</literal>.</para> @@ -121,17 +114,13 @@ ClientSessionFactory factory = ActiveMQClient.createClientSessionFactory();</pro data directory, thus reducing the disk I/O.</para> </section> <section> - <para>If you use JMS, you can achieve large messages compression by configuring your - connection factories. For example,</para> - <programlisting>... -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> -... - <compress-large-messages>true</compress-large-messages> -</connection-factory> -...</programlisting> + <para>If JNDI is used to instantiate and look up the connection factory, large message compression can be + configured in the JNDI context environment, e.g. <literal>jndi.properties</literal>. Here's a simple + example using the "ConnectionFactory" connection factory which is available in the context by default:</para> + <programlisting> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +connection.ConnectionFactory.compressLargeMessages=true</programlisting> </section> </section> </section> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/logging.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/logging.xml b/docs/user-manual/en/logging.xml index 27b4bfa..8277b55 100644 --- a/docs/user-manual/en/logging.xml +++ b/docs/user-manual/en/logging.xml @@ -69,22 +69,10 @@ <section> <title>Logging in a client or with an Embedded server</title> <para> - Firstly, if you want to enable logging on the client side you need to include the jboss logging jars in your library. - If you are using the distribution make sure the jnp-client.jar is included or if you are using maven add the following - dependencies. + Firstly, if you want to enable logging on the client side you need to include the JBoss logging jars in your library. + If you are using maven add the following dependencies. <programlisting> <dependency> -<groupId>org.jboss.naming</groupId> -<artifactId>jnp-client</artifactId> -<version>5.0.5.Final</version> - <exclusions> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </exclusion> - </exclusions> -</dependency> -<dependency> <groupId>org.jboss.logmanager</groupId> <artifactId>jboss-logmanager</artifactId> <version>1.3.1.Final</version> @@ -94,8 +82,6 @@ <artifactId>activemq-core-client</artifactId> <version>2.3.0.Final</version> </dependency></programlisting> - The first dependency <literal>jnp-client</literal> is not actually needed for logging, however this is needed for - using JNDI and imports a previous version JBoss logging which needs to be excluded </para> <para> There are 2 properties you need to set when starting your java program, the first is to set the Log Manager to use http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/message-grouping.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/message-grouping.xml b/docs/user-manual/en/message-grouping.xml index b371897..6ed962b 100644 --- a/docs/user-manual/en/message-grouping.xml +++ b/docs/user-manual/en/message-grouping.xml @@ -77,34 +77,23 @@ message = ... message.setStringProperty("JMSXGroupID", "Group-0"); producer.send(message);</programlisting> - <para>Alternatively, you can set <literal>autogroup</literal> to true on the <literal - >ActiveMQConnectonFactory</literal> which will pick a random unique id. This can also be - set in the <literal>activemq-jms.xml</literal> file like this:</para> + <para>Alternatively, you can set <literal>autogroup</literal> to true on the + <literal>ActiveMQConnectonFactory</literal> which will pick a random unique id. This can also be set in the + JNDI context environment, e.g. <literal>jndi.properties</literal>. Here's a simple example using the + "ConnectionFactory" connection factory which is available in the context by default</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - <autogroup>true</autogroup> -</connection-factory></programlisting> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +connection.ConnectionFactory.autoGroup=true</programlisting> <para>Alternatively you can set the group id via the connection factory. All messages sent with producers created via this connection factory will set the <literal - >JMSXGroupID</literal> to the specified value on all messages sent. To configure the - group id set it on the connection factory in the <literal>activemq-jms.xml</literal> config - file as follows + >JMSXGroupID</literal> to the specified value on all messages sent. This can also be set in the + JNDI context environment, e.g. <literal>jndi.properties</literal>. Here's a simple example using the + "ConnectionFactory" connection factory which is available in the context by default:</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - <group-id>Group-0</group-id> -</connection-factory></programlisting></para> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +connection.ConnectionFactory.groupID=Group-0</programlisting> </section> <section> <title>Example</title> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/pre-acknowledge.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/pre-acknowledge.xml b/docs/user-manual/en/pre-acknowledge.xml index 77e2128..d8eec48 100644 --- a/docs/user-manual/en/pre-acknowledge.xml +++ b/docs/user-manual/en/pre-acknowledge.xml @@ -57,18 +57,12 @@ </note> <section id="pre-acknowledge.configure"> <title>Using PRE_ACKNOWLEDGE</title> - <para>This can be configured in the <literal>activemq-jms.xml</literal> file on the <literal - >connection factory</literal> like this:</para> + <para>This can be configured in a client's JNDI context environment, e.g. <literal>jndi.properties</literal>, + like this:</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty-connector"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - <pre-acknowledge>true</pre-acknowledge> -</connection-factory></programlisting> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +connection.ConnectionFactory.preAcknowledge=true</programlisting> <para>Alternatively, to use pre-acknowledgement mode using the JMS API, create a JMS Session with the <literal>ActiveMQSession.PRE_ACKNOWLEDGE</literal> constant.</para> <programlisting> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/spring-integration.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/spring-integration.xml b/docs/user-manual/en/spring-integration.xml index a929a67..b516871 100644 --- a/docs/user-manual/en/spring-integration.xml +++ b/docs/user-manual/en/spring-integration.xml @@ -40,20 +40,9 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd"> - <!--the connection factory used by the example--> - <connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="in-vm"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> - </connection-factory> <!--the queue used by the example--> - <queue name="exampleQueue"> - <entry name="/queue/exampleQueue"/> - </queue> + <queue name="exampleQueue"/> </configuration></programlisting> <para>Here we've specified a <literal>javax.jms.ConnectionFactory</literal> we want bound to a http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e6a3d3a0/docs/user-manual/en/thread-pooling.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/thread-pooling.xml b/docs/user-manual/en/thread-pooling.xml index 074fa22..85a3189 100644 --- a/docs/user-manual/en/thread-pooling.xml +++ b/docs/user-manual/en/thread-pooling.xml @@ -137,20 +137,14 @@ myFactory.setThreadPoolMaxSize(-1); </programlisting> <programlisting> ConnectionFactory myConnectionFactory = ActiveMQJMSClient.createConnectionFactory(myFactory);</programlisting> <para>If you're using JNDI to instantiate <literal>ActiveMQConnectionFactory</literal> - instances, you can also set these parameters in the <literal>activemq-jms.xml</literal> - file where you describe your connection factory, for example:</para> + instances, you can also set these parameters in the JNDI context environment, e.g. + <literal>jndi.properties</literal>. Here's a simple example using the "ConnectionFactory" connection + factory which is available in the context by default:</para> <programlisting> -<connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="netty"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - <entry name="XAConnectionFactory"/> - </entries> - <use-global-pools>false</use-global-pools> - <scheduled-thread-pool-max-size>10</scheduled-thread-pool-max-size> - <thread-pool-max-size>-1</thread-pool-max-size> -</connection-factory></programlisting> +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory +java.naming.provider.url=tcp://localhost:5445 +connection.ConnectionFactory.useGlobalPools=false +connection.ConnectionFactory.scheduledThreadPoolMaxSize=10 +connection.ConnectionFactory.threadPoolMaxSize=-1</programlisting> </section> </chapter>
