Author: timfox Date: 2009-08-20 14:30:28 -0400 (Thu, 20 Aug 2009) New Revision: 7845 Modified: trunk/docs/README.html trunk/docs/user-manual/en/appserver-integration.xml trunk/docs/user-manual/en/configuration-index.xml trunk/docs/user-manual/en/configuring-transports.xml trunk/docs/user-manual/en/duplicate-detection.xml trunk/docs/user-manual/en/filter-expressions.xml trunk/docs/user-manual/en/interoperability.xml trunk/docs/user-manual/en/large-messages.xml trunk/docs/user-manual/en/last-value-queues.xml trunk/docs/user-manual/en/logging.xml trunk/docs/user-manual/en/management.xml trunk/docs/user-manual/en/message-expiry.xml trunk/docs/user-manual/en/message-grouping.xml trunk/docs/user-manual/en/scheduled-messages.xml trunk/docs/user-manual/en/thread-pooling.xml trunk/docs/user-manual/en/undelivered-messages.xml trunk/docs/user-manual/en/using-server.xml trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java Log: replaced more refs to jbm Modified: trunk/docs/README.html =================================================================== --- trunk/docs/README.html 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/README.html 2009-08-20 18:30:28 UTC (rev 7845) @@ -13,7 +13,7 @@ <h2>27th July 2009</h2> -These are the release notes for HornetQ 2.0.0 Beta 4<br><br> +These are the release notes for HornetQ 2.0.0 Beta 5<br><br> For full description of the contents please see the <a href="https://jira.jboss.org/jira/browse/JBMESSAGING/fixforversion/1... project JIRA</a>.<br><br> Modified: trunk/docs/user-manual/en/appserver-integration.xml =================================================================== --- trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -234,11 +234,11 @@ </section> <section> <title>Configuring the JCA Adaptor</title> - <para>The Java Connector Architecture (JCA) Adapter is what allows JBM to be integrated with + <para>The Java Connector Architecture (JCA) Adapter is what allows HornetQ to be integrated with JEE components such as MDB's and EJB's. It configures how components such as MDB's - consume messages from the JBM server and also how components such as EJB's or Servlet's + consume messages from the HornetQ server and also how components such as EJB's or Servlet's can send messages.</para> - <para>The JBM JCA adapter is deployed via the <literal>jms-ra.rar</literal> archive. The + <para>The HornetQ JCA adapter is deployed via the <literal>jms-ra.rar</literal> archive. The configuration of the Adapter is found in this archive under <literal <para>The configuration will look something like the following:</para> @@ -328,7 +328,7 @@ <section> <title>Adapter Global properties</title> <para>The first element you see is <literal>resourceadapter-class</literal> which should - be left unchanged. This is the JBM resource adapter class.</para> + be left unchanged. This is the HornetQ resource adapter class.</para> <para>After that there is a list of configuration properties. This will be where most of the configuration is done. The first 2 configure the transport used by the adapter and the rest configure the connection itself.</para> @@ -545,7 +545,7 @@ deployment. The connection factories defined in the config file inherit their properties from the main <literal>ra.xml</literal> configuration but can also be overridden, the following example show how to define one.</para> - <para>Please note that this configuration only applies to install the JBM resource + <para>Please note that this configuration only applies to install the HornetQ resource adapter in the JBoss Application Server. If you are using another JEE application server please refer to your application servers documentation for how to do this.</para> @@ -1054,7 +1054,7 @@ <para>the corresponding configuration in <literal <programlisting> -&lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1" +&lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/> </programlisting> <para>If it is now configured with a netty acceptor on a non-default port:</para> @@ -1067,7 +1067,7 @@ <para>the corresponding configuration in <literal <programlisting> -&lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1" +&lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, , , hornetq.remoting.netty.port=8888"/> </programlisting> <note> @@ -1077,7 +1077,7 @@ <para>If the recovery must use <literal>admin, adminpass</literal>, the configuration would have been:</para> <programlisting> - &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1" + &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, admin, adminpass, hornetq.remoting.netty.port=8888"/> </programlisting> <para>Configuring HornetQ with an invm acceptor and configuring the Recovery Manager Modified: trunk/docs/user-manual/en/configuration-index.xml =================================================================== --- trunk/docs/user-manual/en/configuration-index.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/configuration-index.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -207,7 +207,7 @@ <entry>String</entry> <entry>the name of the management address to send management messages to</entry> - <entry>jbm.management</entry> + <entry>hornetq.management</entry> </row> <row> <entry><link linkend="management.replication" @@ -215,7 +215,7 @@ <entry>String</entry> <entry>the user used to for replicating management operations between clustered nodes</entry> - <entry>JBM.MANAGEMENT.ADMIN.USER</entry> + <entry>HORNETQ.MANAGEMENT.ADMIN.USER</entry> </row> <row> <entry><link linkend="management.replication" @@ -231,7 +231,7 @@ <entry>String</entry> <entry>the name of the address that consumers bind to receive management notifications</entry> - <entry>jbm.notifications</entry> + <entry>hornetq.notifications</entry> </row> <row> <entry><link linkend="management.replication" Modified: trunk/docs/user-manual/en/configuring-transports.xml =================================================================== --- trunk/docs/user-manual/en/configuring-transports.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/configuring-transports.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -300,7 +300,7 @@ servlet running in a servlet engine which then redirects it to an in-VM HornetQ server.</para> <para>The servlet transport differs from the Netty HTTP transport in that, with the HTTP transport HornetQ effectively acts a web server listening for HTTP traffic - on, e.g. port 80 or 8080, whereas with the servlet transport JBM traffic is proxied + on, e.g. port 80 or 8080, whereas with the servlet transport HornetQ traffic is proxied through a servlet engine which may already be serving web site or other applications. This allows HornetQ to be used where corporate policies may only allow a single web server listening on an HTTP port, and this needs to serve @@ -322,14 +322,14 @@ &lt;servlet-class>org.jboss.netty.channel.socket.http.HttpTunnelingServlet&lt;/servlet-class> &lt;init-param> &lt;param-name>endpoint&lt;/param-name> - &lt;param-value>local:org.jboss.jbm&lt;/param-value> + &lt;param-value>local:org.hornetq&lt;/param-value> &lt;/init-param> &lt;load-on-startup>1&lt;/load-on-startup> &lt;/servlet> &lt;servlet-mapping> &lt;servlet-name>NettyServlet&lt;/servlet-name> - &lt;url-pattern>/JBMServlet&lt;/url-pattern> + &lt;url-pattern>/HornetQServlet&lt;/url-pattern> &lt;/servlet-mapping> &lt;/web-app> @@ -348,7 +348,7 @@ org.hornetq.integration.transports.netty.NettyAcceptorFactory &lt;/factory-class> &lt;param key="hornetq.remoting.netty.useinvm" value="true" type="Boolean"/> - &lt;param key="hornetq.remoting.netty.host" value="org.jboss.jbm" type="String"/> + &lt;param key="hornetq.remoting.netty.host" value="org.hornetq" type="String"/> &lt;/acceptor> &lt;/acceptors> @@ -367,7 +367,7 @@ &lt;param key="hornetq.remoting.netty.port" value="8080" type="Integer"/> &lt;param key="hornetq.remoting.netty.useservlet" value="true" type="Boolean"/> &lt;param key="hornetq.remoting.netty.servletpath" - value="/messaging/JBMServlet" type="String"/> + value="/messaging/HornetQServlet" type="String"/> &lt;/connector> &lt;/connectors></programlisting> @@ -392,7 +392,7 @@ &lt;param key="hornetq.remoting.netty.host" value="localhost" type="String"/> &lt;param key="hornetq.remoting.netty.port" value="8443" type="Integer"/> &lt;param key="hornetq.remoting.netty.useservlet" value="true" type="Boolean"/> - &lt;param key="hornetq.remoting.netty.servletpath" value="/messaging/JBMServlet" type="String"/> + &lt;param key="hornetq.remoting.netty.servletpath" value="/messaging/HornetQServlet" type="String"/> &lt;param key="hornetq.remoting.netty.sslenabled" value="true" type="Boolean"/> &lt;param key="hornetq.remoting.netty.keystorepath" value="path to a keystoree" type="String"/> &lt;param key="hornetq.remoting.netty.keystorepassword" value="keysore password" type="String"/> Modified: trunk/docs/user-manual/en/duplicate-detection.xml =================================================================== --- trunk/docs/user-manual/en/duplicate-detection.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/duplicate-detection.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -46,7 +46,7 @@ message in the transaction, then it will ignore the entire transaction.</para> <para>The name of the property that you set is given by the value of <literal - is <literal>_JBM_DUPL_ID</literal></para> + is <literal>_HQ_DUPL_ID</literal></para> <para>The value of the property can be of type <literal>byte[]</literal> or <literal a <literal>String</literal>, and it's valid should be unique. An easy way of generating Modified: trunk/docs/user-manual/en/filter-expressions.xml =================================================================== --- trunk/docs/user-manual/en/filter-expressions.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/filter-expressions.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -35,13 +35,13 @@ of the core message in an expression:</para> <itemizedlist> <listitem> - <para><literal>JBMPriority</literal>. To refer to the priority of a message. Message + <para><literal>HQPriority</literal>. To refer to the priority of a message. Message priorities are integers with valid values from <literal>0 - 9</literal>. <literal - E.g. <literal>JBMPriority = 3 AND animal = 'aardvark'</literal></para> + E.g. <literal>HQPriority = 3 AND animal = 'aardvark'</literal></para> </listitem> <listitem> - <para><literal>JBMExpiration</literal>. To refer to the expiration time of a message. + <para><literal>HQExpiration</literal>. To refer to the expiration time of a message. The value is a long integer.</para> </listitem> <listitem> @@ -50,11 +50,11 @@ </listitem> <listitem> - <para><literal>JBMTimestamp</literal>. The timestamp of when the message was created. + <para><literal>HQTimestamp</literal>. The timestamp of when the message was created. The value is a long integer.</para> </listitem> <listitem> - <para><literal>JBMSize</literal>. The size of a message in bytes. The value is an + <para><literal>HQSize</literal>. The size of a message in bytes. The value is an integer.</para> </listitem> </itemizedlist> Modified: trunk/docs/user-manual/en/interoperability.xml =================================================================== --- trunk/docs/user-manual/en/interoperability.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/interoperability.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -7,7 +7,7 @@ Stomp clients to communicate with Stomp Brokers. <ulink url="http://stomp.codehaus.org/StompConnect">StompConnect<... is a server that can act as a Stomp broker and proxy the Stomp protocol to the standard JMS API. - Consequently, using StompConnect it is possible to turn JBM into a Stomp Broker and use + Consequently, using StompConnect it is possible to turn HornetQ into a Stomp Broker and use any of the available stomp clients. These include clients written in C, C++, c# and .net etc.</para> <para>To run StompConnect first start the HornetQ server and make sure that it is Modified: trunk/docs/user-manual/en/large-messages.xml =================================================================== --- trunk/docs/user-manual/en/large-messages.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/large-messages.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -177,7 +177,7 @@ someProducer.send(message);</programlisting> <para>The <literal>OutputStream</literal> can be set through the JMS Object Property - JMS_JBM_SaveStream on messages being received in a blocking way.</para> + JMS_HQ_SaveStream on messages being received in a blocking way.</para> <programlisting> BytesMessage messageReceived = (BytesMessage)messageConsumer.receive(120000); @@ -188,7 +188,7 @@ BufferedOutputStream bufferedOutput = new BufferedOutputStream(fileOutputStream); // This will block until the entire content is saved on disk -messageReceived.setObjectProperty("JMS_JBM_SaveStream", bufferedOutput); +messageReceived.setObjectProperty("JMS_HQ_SaveStream", bufferedOutput); </programlisting> <para>Setting the <literal>OutputStream</literal> could also be done in a non blocking way using the property JMS_HQ_InputStream.</para> Modified: trunk/docs/user-manual/en/last-value-queues.xml =================================================================== --- trunk/docs/user-manual/en/last-value-queues.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/last-value-queues.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -20,7 +20,7 @@ </section> <section> <title>Using Last-Value Property</title> - <para>The property name used to identify the last value is <literal>"_JBM_LVQ_NAME"</literal> + <para>The property name used to identify the last value is <literal>"_HQ_LVQ_NAME"</literal> (or the constant <literal>MessageImpl.HDR_LAST_VALUE_NAME</literal> from the Core API).</para> <para>For example, if two messages with the same value for the Last-Value property are sent to @@ -29,13 +29,13 @@ // send 1st message with Last-Value property set to STOCK_NAME TextMessage message = session.createTextMessage("1st message with Last-Value property set"); -message.setStringProperty("_JBM_LVQ_NAME", "STOCK_NAME"); +message.setStringProperty("_HQ_LVQ_NAME", "STOCK_NAME"); producer.send(message); // send 2nd message with Last-Value property set to STOCK_NAME message = session.createTextMessage("2nd message with Last-Value property set"); -message.setStringProperty("_JBM_LVQ_NAME", "STOCK_NAME"); +message.setStringProperty("_HQ_LVQ_NAME", "STOCK_NAME"); producer.send(message); ... Modified: trunk/docs/user-manual/en/logging.xml =================================================================== --- trunk/docs/user-manual/en/logging.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/logging.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <chapter id="logging"> <title>Logging</title> - <para>JBM uses standard <ulink url="http://java.sun.com/j2se/1.4.2/docs/guide/util/logging/"&g... + <para>HornetQ uses standard <ulink url="http://java.sun.com/j2se/1.4.2/docs/guide/util/logging/"&g... logging</ulink>, (a.k.a Java-Util-Logging: JUL), for all its logging. This means we have no dependencies on any third party logging framework. Users can provide their own logging handler to use or alternatively use the log4j handler supplied by HornetQ.</para> @@ -9,9 +9,9 @@ default location for this file is under the <literal>lib</literal> directory found in the Java home directory but it can be overridden by setting the <literal - logging.properties file. The standalone JBM server does this and the <literal + logging.properties file. The standalone HornetQ server does this and the <literal - directory of the JBM installation. </para> + directory of the HornetQ installation. </para> <para>By default the standalone server is configured to use the standard console handler and a file handler that logs to <literal>bin/logs/hornetq.log</literal>.</para> <para>Because some of the third party components used to bootstrap HornetQ, i.e. the Modified: trunk/docs/user-manual/en/management.xml =================================================================== --- trunk/docs/user-manual/en/management.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/management.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -571,7 +571,7 @@ <programlisting> ClientSession session = ... - ClientRequestor requestor = new ClientRequestor(session, "jbm.management"); + ClientRequestor requestor = new ClientRequestor(session, "hornetq.management"); ClientMessage message = session.createClientMessage(false); ManagementHelper.putAttribute(message, "core.queue.exampleQueue", "messageCount"); ClientMessage reply = requestor.request(m); @@ -590,16 +590,16 @@ <para>The management address to send management messages is configured in <literal <programlisting> - &lt;management-address&gt;jbm.management&lt;/management-address&gt; + &lt;management-address&gt;hornetq.management&lt;/management-address&gt; </programlisting> - <para>By default, the address is <literal>jbm.management</literal>.</para> + <para>By default, the address is <literal>hornetq.management</literal>.</para> <para>The management address requires a <emphasis>special</emphasis> user permission <literal>manage</literal> to be able to receive and handle management messages. This is also configured in hornetq-configuration.xml:</para> <programlisting> &lt;!-- users with the admin role will be allowed to manage --&gt; &lt;!-- HornetQ using management messages --&gt; - &lt;security-setting match="jbm.management"&gt; + &lt;security-setting match="hornetq.management"&gt; &lt;permission type="manage" roles="admin" /&gt; &lt;/security-setting&gt; </programlisting> @@ -613,7 +613,7 @@ <para>The <emphasis>management queue</emphasis> is a special queue and needs to be instantiated directly by the client:</para> <programlisting> - Queue managementQueue = new JBossQueue("jbm.management", "jbm.management"); + Queue managementQueue = new JBossQueue("hornetq.management", "hornetq.management"); </programlisting> <para>All the other steps are the same than for the Core API but they use JMS API instead:</para> @@ -642,7 +642,7 @@ <para>For example, to know the number of messages in the JMS queue <literal <programlisting> - Queue managementQueue = new JBossQueue("jbm.management", "jbm.management"); + Queue managementQueue = new JBossQueue("hornetq.management", "hornetq.management"); QueueSession session = ... QueueRequestor requestor = new QueueRequestor(session, managementQueue); @@ -684,7 +684,7 @@ be shared by all nodes</emphasis>. To configure it, change the value in <literal <programlisting> - &lt;management-cluster-user&gt;JBM.MANAGEMENT.ADMIN.USER&lt;/management-cluster-user&gt; + &lt;management-cluster-user&gt;HORNETQ.MANAGEMENT.ADMIN.USER&lt;/management-cluster-user&gt; &lt;management-cluster-password&gt;CHANGE ME!!&lt;/management-cluster-password&gt; </programlisting> <para>It is strongly suggested to @@ -751,9 +751,9 @@ <para>the management notification address to receive management notifications is configured in <literal>hornetq-configuration.xml</literal>:</para> <programlisting> - &lt;management-notification-address&gt;jbm.notifications&lt;/management-notification-address&gt; + &lt;management-notification-address&gt;hornetq.notifications&lt;/management-notification-address&gt; </programlisting> - <para>By default, the address is <literal>jbm.notifications</literal>.</para> + <para>By default, the address is <literal>hornetq.notifications</literal>.</para> </section> </section> <section> @@ -763,12 +763,12 @@ is that JMS requires a JMS Destination to receive the messages (preferably a Topic):</para> <programlisting> - Topic notificationsTopic = new JBossTopic("jbm.notifications", "jbm.notifications"); + Topic notificationsTopic = new JBossTopic("hornetq.notifications", "hornetq.notifications"); </programlisting> <para>Once the notification topic is created, you can receive messages from it or set a <literal>MessageListener</literal>:</para> <programlisting> - Topic notificationsTopic = new JBossTopic("jbm.notifications", "jbm.notifications"); + Topic notificationsTopic = new JBossTopic("hornetq.notifications", "hornetq.notifications"); Session session = ... MessageConsumer notificationConsumer = session.createConsumer(notificationsTopic); Modified: trunk/docs/user-manual/en/message-expiry.xml =================================================================== --- trunk/docs/user-manual/en/message-expiry.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/message-expiry.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -25,12 +25,12 @@ properties:</para> <itemizedlist> <listitem> - <para><literal>_JBM_ORIG_DESTINATION</literal></para> + <para><literal>_HQ_ORIG_DESTINATION</literal></para> <para>a String property containing the <emphasis>original destination</emphasis> of the expired message </para> </listitem> <listitem> - <para><literal>_JBM_ACTUAL_EXPIRY</literal></para> + <para><literal>_HQ_ACTUAL_EXPIRY</literal></para> <para>a Long property containing the <emphasis>actual expiration time</emphasis> of the expired message</para> </listitem> Modified: trunk/docs/user-manual/en/message-grouping.xml =================================================================== --- trunk/docs/user-manual/en/message-grouping.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/message-grouping.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -6,7 +6,7 @@ <listitem> <para>Messages in a message group share the same group id, i.e. they have same group identifier property (<literal>JMSXGroupID</literal> for JMS, <literal - >_JBM_GROUP_ID</literal> for HornetQ Core API).</para> + >_HQ_GROUP_ID</literal> for HornetQ Core API).</para> </listitem> <listitem> <para>Messages in a message group are always consumed by the same consumer, even if there @@ -18,7 +18,7 @@ <section> <title>Using Core API</title> <para>The property name used to identify the message group is <literal - >"_JBM_GROUP_ID""</literal> (or the constant <literal + >"_HQ_GROUP_ID""</literal> (or the constant <literal random unique id. </para> Modified: trunk/docs/user-manual/en/scheduled-messages.xml =================================================================== --- trunk/docs/user-manual/en/scheduled-messages.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/scheduled-messages.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -7,7 +7,7 @@ <section> <title>Scheduled Delivery Property</title> <para>The property name used to identify a scheduled message is <literal - >"_JBM_SCHED_DELIVERY"</literal> (or the constant <literal + >"_HQ_SCHED_DELIVERY"</literal> (or the constant <literal <para>The specified value must be a <literal>long</literal> corresponding to the time the message must be delivered (in milliseconds). An example of sending a scheduled message @@ -16,7 +16,7 @@ TextMessage message = session.createTextMessage("This is a scheduled message message which will be delivered in 5 sec."); - message.setLongProperty("_JBM_SCHED_DELIVERY", System.currentTimeMillis() + 5000); + message.setLongProperty("_HQ_SCHED_DELIVERY", System.currentTimeMillis() + 5000); producer.send(message); ... Modified: trunk/docs/user-manual/en/thread-pooling.xml =================================================================== --- trunk/docs/user-manual/en/thread-pooling.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/thread-pooling.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -60,12 +60,12 @@ <section> <title>Asynchronous IO</title> <para>Asynchronous IO has a thread pool for receiving and dispatching events out of the - native layer. You will find it on a thread dump with the prefix JBM-AIO-poller-pool. + native layer. You will find it on a thread dump with the prefix HornetQ-AIO-poller-pool. HornetQ uses one thread per opened file on the journal (there is usually one).</para> <para>There is also a single thread used to invoke writes on libaio. We do that to avoid context switching on libaio what would cause performance issues. You will find this - thread on a thread dump with the prefix JBM-AIO-writer-pool.</para> + thread on a thread dump with the prefix HornetQ-AIO-writer-pool.</para> </section> </section> <section id="thread-pooling.client.side"> Modified: trunk/docs/user-manual/en/undelivered-messages.xml =================================================================== --- trunk/docs/user-manual/en/undelivered-messages.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/undelivered-messages.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -88,7 +88,7 @@ property:</para> <itemizedlist> <listitem> - <para><literal>_JBM_ORIG_DESTINATION</literal></para> + <para><literal>_HQ_ORIG_DESTINATION</literal></para> <para>a String property containing the <emphasis>original destination</emphasis> of the dead letter message </para> </listitem> Modified: trunk/docs/user-manual/en/using-server.xml =================================================================== --- trunk/docs/user-manual/en/using-server.xml 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/docs/user-manual/en/using-server.xml 2009-08-20 18:30:28 UTC (rev 7845) @@ -116,7 +116,7 @@ <para><literal>hornetq-queues.xml</literal>. This file contains predefined queues, queue settings and security settings. The file is optional - all this configuration can also live in <literal>hornetq-configuration.xml</literal>. In fact, the default - configuration sets do not have a <literal>jbm.queues.xml</literal> file. The + configuration sets do not have a <literal>hornetq-queues.xml</literal> file. The purpose of allowing queues to be configured in these files is to allow you to manage your queue configuration over many files instead of being forced to maintain it in a single file. There can be many <literal Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-08-20 18:06:54 UTC (rev 7844) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-08-20 18:30:28 UTC (rev 7845) @@ -2739,7 +2739,7 @@ /** * <p>This method will instantly return the opened file, and schedule opening and reclaiming.</p> * <p>In case there are no cached opened files, this method will block until the file was opened, - * what would happen only if the system is under heavy load by another system (like a backup system, or a DB sharing the same box as JBM).</p> + * what would happen only if the system is under heavy load by another system (like a backup system, or a DB sharing the same box as HornetQ).</p> * */ private JournalFile enqueueOpenFile(final boolean synchronous) throws InterruptedException {