Author: timfox Date: 2009-08-20 14:49:59 -0400 (Thu, 20 Aug 2009) New Revision: 7846 Modified: trunk/build-hornetq.xml trunk/docs/quickstart-guide/en/installation.xml trunk/docs/user-manual/build.xml trunk/docs/user-manual/en/appserver-integration.xml trunk/docs/user-manual/en/embedding-jbm.xml trunk/docs/user-manual/en/examples.xml trunk/docs/user-manual/en/filter-expressions.xml trunk/docs/user-manual/en/project-info.xml trunk/examples/core/embedded-remote/readme.html trunk/examples/core/embedded/readme.html trunk/examples/javaee/jca-config/readme.html trunk/examples/jms/embedded/readme.html trunk/examples/jms/large-message/readme.html trunk/examples/jms/paging/readme.html trunk/examples/jms/security/readme.html trunk/examples/jms/security/server0/hornetq-users.xml trunk/examples/jms/security/src/org/hornetq/jms/example/SecurityExample.java trunk/src/main/org/hornetq/core/buffers/package.html trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java trunk/src/main/org/hornetq/core/journal/impl/Reclaimer.java trunk/src/main/org/hornetq/core/paging/Page.java trunk/src/main/org/hornetq/core/paging/PageTransactionInfo.java trunk/src/main/org/hornetq/core/paging/PagingManager.java trunk/src/main/org/hornetq/core/paging/PagingStore.java trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java trunk/src/main/org/hornetq/core/paging/impl/TestSupportPageStore.java trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java trunk/src/main/org/hornetq/utils/VariableLatch.java trunk/tests/joram-tests/src/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java Log: replaced more refs to jbm Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/build-hornetq.xml 2009-08-20 18:49:59 UTC (rev 7846) @@ -32,7 +32,7 @@ <!-- Version properties are read from hornetq-version.properties instead of duplicating them here --> <property file="src/config/common/hornetq-version.properties"/> <property name="hornetq.version.revision" value="0" /> - <property name="hornetq.version.svnurl" value="https://svn.jboss.org/repos/messaging/trunk"/> + <property name="hornetq.version.svnurl" value="https://svn.jboss.org/repos/hornetq/trunk"/> <property name="hornetq.version.string" value="${hornetq.version.majorVersion}.${hornetq.version.minorVersion}.${hornetq.version.microVersion}.${hornetq.version.versionSuffix} (${hornetq.version.versionName}, ${hornetq.version.incrementingVersion})"/> <property name="module.version" @@ -592,8 +592,8 @@ <exclude name="**/hornetq-jms.xsd"/> </fileset> <manifest> - <attribute name="JBossMessaging-Version" value="${hornetq.version.string}"/> - <attribute name="JBossMessaging-SVN-URL" value="${hornetq.version.svnurl}"/> + <attribute name="HornetQ-Version" value="${hornetq.version.string}"/> + <attribute name="HornetQ-SVN-URL" value="${hornetq.version.svnurl}"/> </manifest> </jar> Modified: trunk/docs/quickstart-guide/en/installation.xml =================================================================== --- trunk/docs/quickstart-guide/en/installation.xml 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/docs/quickstart-guide/en/installation.xml 2009-08-20 18:49:59 UTC (rev 7846) @@ -69,8 +69,7 @@ Messaging</para> </listitem> <listitem> - <para><literal>config</literal> -- configuration files needed to configure JBoss - Messaging. This contains configurations to run HornetQ either in stand-alone + <para><literal>config</literal> -- configuration files needed to configure HornetQ. This contains configurations to run HornetQ either in stand-alone or inside JBoss AS 5. Please refer to the reference guide for details on configuration. </para> </listitem> Modified: trunk/docs/user-manual/build.xml =================================================================== --- trunk/docs/user-manual/build.xml 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/docs/user-manual/build.xml 2009-08-20 18:49:59 UTC (rev 7846) @@ -1,7 +1,7 @@ <project name="hornetq.user-manual" default="all" basedir="."> <property name="build.dir" value="build"/> - <property name="pdf.name" value="JBossMessaging_UserManual.pdf"/> + <property name="pdf.name" value="HornetQ_UserManual.pdf"/> <import file="${basedir}/../../lib/docbook-support/support.xml"/> <target name="all" depends="clean"> Modified: trunk/docs/user-manual/en/appserver-integration.xml =================================================================== --- trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 18:49:59 UTC (rev 7846) @@ -1008,7 +1008,7 @@ &lt;properties depends="arjuna" name="jta"&gt; ... - &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;[connection configuration]"/&gt; &lt;/properties&gt; </programlisting> @@ -1018,8 +1018,7 @@ <itemizedlist> <listitem> <para><literal>[connector factory class name]</literal> corresponds to the name - of the <literal>ConnectorFactory</literal> used to connect to JBoss - Messaging. Values can be <literal + of the <literal>ConnectorFactory</literal> used to connect to HornetQ. Values can be <literal <literal Modified: trunk/docs/user-manual/en/embedding-jbm.xml =================================================================== --- trunk/docs/user-manual/en/embedding-jbm.xml 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/docs/user-manual/en/embedding-jbm.xml 2009-08-20 18:49:59 UTC (rev 7846) @@ -6,8 +6,7 @@ JBoss Microcontainer, Spring or Google Guice. It also means that if you have an application that could use messaging functionality internally, then it can <emphasis>directly instantiate</emphasis> HornetQ clients and servers in its own application code - to perform that functionality. We call this <emphasis>embedding</emphasis> JBoss - Messaging.</para> + to perform that functionality. We call this <emphasis>embedding</emphasis> HornetQ.</para> <para>Examples of applications that might want to do this include any application that needs very high performance, transactional, persistent messaging but doesn't want the hassle of writing it all from scratch.</para> @@ -54,7 +53,7 @@ ... -HornetQServer server = Messaging.newHornetQServer(config); +HornetQServer server = HornetQ.newHornetQServer(config); server.start();</programlisting> <para>You also have the option of instantiating <literal>HornetQServerImpl</literal> Modified: trunk/docs/user-manual/en/examples.xml =================================================================== --- trunk/docs/user-manual/en/examples.xml 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/docs/user-manual/en/examples.xml 2009-08-20 18:49:59 UTC (rev 7846) @@ -183,8 +183,7 @@ <section id="examples.interceptor"> <title>Interceptor</title> <para>HornetQ allows an application to use an interceptor to hook into the - messaging system. Interceptors allow you to handle various message events in JBoss - Messaging.</para> + messaging system. Interceptors allow you to handle various message events in HornetQ.</para> </section> <section id="examples.jaas"> <title>JAAS</title> Modified: trunk/docs/user-manual/en/filter-expressions.xml =================================================================== --- trunk/docs/user-manual/en/filter-expressions.xml 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/docs/user-manual/en/filter-expressions.xml 2009-08-20 18:49:59 UTC (rev 7846) @@ -7,7 +7,7 @@ different. For documentation on JMS selector syntax please the JMS javadoc for <ulink url="http://java.sun.com/javaee/5/docs/api/javax/jms/Message.html" - <para>Filter expressions are used in several places in JBossMessaging</para> + <para>Filter expressions are used in several places in HornetQ</para> <itemizedlist> <listitem> <para>Predefined Queues. When pre-defining a queue, either in <literal Modified: trunk/docs/user-manual/en/project-info.xml =================================================================== --- trunk/docs/user-manual/en/project-info.xml 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/docs/user-manual/en/project-info.xml 2009-08-20 18:49:59 UTC (rev 7846) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <chapter id="project-info"> <title>Project Information</title> - <para>The HornetQ project page is <ulink url="http://www.jboss.org/jbossmessaging/" + <para>The HornetQ project page is <ulink url="http://www.hornetq.org" <para>If you have any user questions please use our <ulink url="http://www.jboss.org/index.html?module=bb&amp;op=viewforum&... @@ -9,7 +9,7 @@ <para>If you have development related questions, please use our <ulink url="http://www.jboss.org/index.html?module=bb&amp;op=viewforum&... forum</ulink></para> - <para>Pop in and chat to us in our <ulink url="irc://irc.freenode.net:6667/jbossmessaging">IRC channel</ulink></para> + <para>Pop in and chat to us in our <ulink url="irc://irc.freenode.net:6667/hornetq">IRC channel</ulink></para> <para>HornetQ Subversion TRUNK is <ulink url="http://anonsvn.jboss.org/repos/messaging/trunk">here<... <para>All our release tags are <ulink url="http://anonsvn.jboss.org/repos/messaging/tags">here<... <para>Red Hat kindly employs developers to work full time on HornetQ, the motley crew are: Modified: trunk/examples/core/embedded/readme.html =================================================================== --- trunk/examples/core/embedded/readme.html 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/examples/core/embedded/readme.html 2009-08-20 18:49:59 UTC (rev 7846) @@ -27,7 +27,7 @@ <li>Create and start the server</li> <pre> - <code>HornetQServer server = Messaging.newHornetQServer(configuration);</code> + <code>HornetQServer server = HornetQ.newHornetQServer(configuration);</code> <code>server.start();</code></pre> <li>As we are not using a JNDI environment we instantiate the objects directly</li> Modified: trunk/examples/core/embedded-remote/readme.html =================================================================== --- trunk/examples/core/embedded-remote/readme.html 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/examples/core/embedded-remote/readme.html 2009-08-20 18:49:59 UTC (rev 7846) @@ -46,7 +46,7 @@ <li>On EmbeddedServer: Create and start the server</li> <pre> - <code>HornetQServer server = Messaging.newHornetQServer(configuration);</code> + <code>HornetQServer server = HornetQ.newHornetQServer(configuration);</code> <code>server.start();</code></pre> <li>As we are not using a JNDI environment we instantiate the objects directly</li> Modified: trunk/examples/javaee/jca-config/readme.html =================================================================== --- trunk/examples/javaee/jca-config/readme.html 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/examples/javaee/jca-config/readme.html 2009-08-20 18:49:59 UTC (rev 7846) @@ -11,7 +11,7 @@ <p>MDBQueueB is connected to a different HornetQ resource-adapter, and it will receive the message sent by the main Class.</p> <p>All the MDBs and JMS Connections are referring to the remote server</p> <p>A Resource Adapter is a way to connect any system provider to an application server, and is integral part of the Java Connectors Architecture specification.</p> - <p>JBossMessaging provides its own adapter and this example will provide you a quick tutorial on how to configure some of the default properties, and how to change the default values on MDB Inbound Properties, or on ConnectionFactory Outbound Properties.</p> + <p>HornetQ provides its own adapter and this example will provide you a quick tutorial on how to configure some of the default properties, and how to change the default values on MDB Inbound Properties, or on ConnectionFactory Outbound Properties.</p> <p>This ResourceAdapter is what provides integration for Message Drive Beans (MDBs) or DataSource integration on the application server.</p> <h2>MDB Properties</h2> <p>You can configure the adapter through ActivactionConfigProperties on the MDB. Example:</p> @@ -80,7 +80,7 @@ </pre> <h2>Resource Adapter Global Properties</h2> - <p>It is possible to also change global configuration at the JBossMessaging resource adapter. The default installation script will install the HornetQ resource adapter at $JBOSS_HOME/server/<i>YOUR-SERVER</i>/deploy/hornetq-ra.rar.</p> + <p>It is possible to also change global configuration at the HornetQ resource adapter. The default installation script will install the HornetQ resource adapter at $JBOSS_HOME/server/<i>YOUR-SERVER</i>/deploy/hornetq-ra.rar.</p> <p>To change these properties, open the ra.xml under jms-ra.rar/META-INF</p> <p>Example for ra.xml:</p> <pre> @@ -131,7 +131,7 @@ <p>Refer to the <i>Resource Adapter</i> Chapter on the <i>HornetQ Documentation</i> for more information about configuring the ra.xml properties. - <p>You may choose to deploy multiple JBossMessaging Resource adapters on the same application server, for example if you are connecting to different HornetQ servers and if you wish to have a higher control of properties on each server you are connecting to. You will be able to determine which rar you are using individually at each <i>MDB</i> and <i>ConnectionFactory</i> as specified before here. Just copy the directory jms-ra.rar in your application as any other name with the extension .rar and use that file name at your deployments.</p> + <p>You may choose to deploy multiple HornetQ resource adapters on the same application server, for example if you are connecting to different HornetQ servers and if you wish to have a higher control of properties on each server you are connecting to. You will be able to determine which rar you are using individually at each <i>MDB</i> and <i>ConnectionFactory</i> as specified before here. Just copy the directory jms-ra.rar in your application as any other name with the extension .rar and use that file name at your deployments.</p> <p>Please refer to HornetQ Quickstart guide to <a href="../../../docs/quickstart-guide/en/html_single/index.html#installation.jboss">install it in JBoss AS 5<a></p> Modified: trunk/examples/jms/embedded/readme.html =================================================================== --- trunk/examples/jms/embedded/readme.html 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/examples/jms/embedded/readme.html 2009-08-20 18:49:59 UTC (rev 7846) @@ -26,7 +26,7 @@ <li>Create and start the server</li> <pre> - <code>HornetQServer server = Messaging.newHornetQServer(configuration);</code> + <code>HornetQServer server = HornetQ.newHornetQServer(configuration);</code> <code>server.start();</code></pre> <li>As we are not using a JNDI environment we instantiate the objects directly</li> Modified: trunk/examples/jms/large-message/readme.html =================================================================== --- trunk/examples/jms/large-message/readme.html 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/examples/jms/large-message/readme.html 2009-08-20 18:49:59 UTC (rev 7846) @@ -11,7 +11,7 @@ on the client or server. Effectively the only limit to message size is the amount of disk space you have on the server.</p> <p>Large messages are persisted on the server so they can survive a server restart. In other words HornetQ doesn't just do a simple socket stream from the sender to the consumer.</p> - <p>In order to do this JBossMessaging provides an extension to JMS where you can use an InputStream or OutputStream as the source and destination for your messages. You can send messages as large as it would fit in your disk.</p> + <p>In order to do this HornetQ provides an extension to JMS where you can use an InputStream or OutputStream as the source and destination for your messages. You can send messages as large as it would fit in your disk.</p> <p>You may also choose to read LargeMessages using the regular ByteStream or ByteMessage methods, but using the InputStream and OutputStream will provide you a much better performance</p> <br> <h2>Example step-by-step</h2> Modified: trunk/examples/jms/paging/readme.html =================================================================== --- trunk/examples/jms/paging/readme.html 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/examples/jms/paging/readme.html 2009-08-20 18:49:59 UTC (rev 7846) @@ -8,7 +8,7 @@ <br> <p>This example shows how HornetQ would avoid running out of resources by paging messages.</p> <p>A maxSize could be specified per Destination on the destinations settings (hornetq-configuration.xml).</p> - <p>When the buffered messages are consuming too much memory, JBossMessaging starts writing messages on the file-system, and as the memory is released by message acknowledgement or transaction commits those messages are recovered from disk and placed in memory</p> + <p>When the buffered messages are consuming too much memory, HornetQ starts writing messages on the file-system, and as the memory is released by message acknowledgement or transaction commits those messages are recovered from disk and placed in memory</p> <p>Acknowledgement plays an important factor on paging as messages will stay on the file system until the memory is released</p> <p>A Queue is used to send messages point to point, from a producer to a consumer. The queue guarantees message ordering between these 2 points.</p> Modified: trunk/examples/jms/security/readme.html =================================================================== --- trunk/examples/jms/security/readme.html 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/examples/jms/security/readme.html 2009-08-20 18:49:59 UTC (rev 7846) @@ -26,22 +26,22 @@ <pre> <code> - &lt;user name=&quot;bill&quot; password=&quot;jbossmessaging&quot;&gt; + &lt;user name=&quot;bill&quot; password=&quot;hornetq&quot;&gt; &lt;role name=&quot;user&quot;/&gt; &lt;/user&gt; - &lt;user name=&quot;andrew&quot; password=&quot;jbossmessaging1&quot;&gt; + &lt;user name=&quot;andrew&quot; password=&quot;hornetq1&quot;&gt; &lt;role name=&quot;europe-user&quot;/&gt; &lt;role name=&quot;user&quot;/&gt; &lt;/user&gt; - &lt;user name=&quot;frank&quot; password=&quot;jbossmessaging2&quot;&gt; + &lt;user name=&quot;frank&quot; password=&quot;hornetq2&quot;&gt; &lt;role name=&quot;us-user&quot;/&gt; &lt;role name=&quot;news-user&quot;/&gt; &lt;role name=&quot;user&quot;/&gt; &lt;/user&gt; - &lt;user name=&quot;sam&quot; password=&quot;jbossmessaging3&quot;&gt; + &lt;user name=&quot;sam&quot; password=&quot;hornetq3&quot;&gt; &lt;role name=&quot;news-user&quot;/&gt; &lt;role name=&quot;user&quot;/&gt; &lt;/user&gt; @@ -158,7 +158,7 @@ billConnection = null; try { - billConnection = createConnection("bill", "jbossmessaging1", cf); + billConnection = createConnection("bill", "hornetq1", cf); result = false; } catch (JMSException e) @@ -171,7 +171,7 @@ <li>Bill makes a good connection.</li> <pre> <code> - billConnection = createConnection("bill", "jbossmessaging", cf); + billConnection = createConnection("bill", "hornetq", cf); billConnection.start(); </code> </pre> @@ -179,7 +179,7 @@ <li>Andrew makes a good connection</li> <pre> <code> - andrewConnection = createConnection("andrew", "jbossmessaging1", cf); + andrewConnection = createConnection("andrew", "hornetq1", cf); andrewConnection.start(); </code> </pre> @@ -187,7 +187,7 @@ <li>Frank makes a good connection</li> <pre> <code> - frankConnection = createConnection("frank", "jbossmessaging2", cf); + frankConnection = createConnection("frank", "hornetq2", cf); frankConnection.start(); </code> </pre> @@ -195,7 +195,7 @@ <li>Sam makes a good connection</li> <pre> <code> - samConnection = createConnection("sam", "jbossmessaging3", cf); + samConnection = createConnection("sam", "hornetq3", cf); samConnection.start(); </code> </pre> Modified: trunk/examples/jms/security/server0/hornetq-users.xml =================================================================== --- trunk/examples/jms/security/server0/hornetq-users.xml 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/examples/jms/security/server0/hornetq-users.xml 2009-08-20 18:49:59 UTC (rev 7846) @@ -1,22 +1,22 @@ <configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd"> - <user name="bill" password="jbossmessaging"> + <user name="bill" password="hornetq"> <role name="user"/> </user> - <user name="andrew" password="jbossmessaging1"> + <user name="andrew" password="hornetq1"> <role name="europe-user"/> <role name="user"/> </user> - <user name="frank" password="jbossmessaging2"> + <user name="frank" password="hornetq2"> <role name="us-user"/> <role name="news-user"/> <role name="user"/> </user> - <user name="sam" password="jbossmessaging3"> + <user name="sam" password="hornetq3"> <role name="news-user"/> <role name="user"/> </user> Modified: trunk/examples/jms/security/src/org/hornetq/jms/example/SecurityExample.java =================================================================== --- trunk/examples/jms/security/src/org/hornetq/jms/example/SecurityExample.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/examples/jms/security/src/org/hornetq/jms/example/SecurityExample.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -75,7 +75,7 @@ billConnection = null; try { - billConnection = createConnection("bill", "jbossmessaging1", cf); + billConnection = createConnection("bill", "hornetq1", cf); result = false; } catch (JMSException e) @@ -84,19 +84,19 @@ } //Step 6. bill makes a good connection. - billConnection = createConnection("bill", "jbossmessaging", cf); + billConnection = createConnection("bill", "hornetq", cf); billConnection.start(); //Step 7. andrew makes a good connection. - andrewConnection = createConnection("andrew", "jbossmessaging1", cf); + andrewConnection = createConnection("andrew", "hornetq1", cf); andrewConnection.start(); //Step 8. frank makes a good connection. - frankConnection = createConnection("frank", "jbossmessaging2", cf); + frankConnection = createConnection("frank", "hornetq2", cf); frankConnection.start(); //Step 9. sam makes a good connection. - samConnection = createConnection("sam", "jbossmessaging3", cf); + samConnection = createConnection("sam", "hornetq3", cf); samConnection.start(); //Step 10. Check every user can publish/subscribe genericTopics. Modified: trunk/src/main/org/hornetq/core/buffers/package.html =================================================================== --- trunk/src/main/org/hornetq/core/buffers/package.html 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/src/main/org/hornetq/core/buffers/package.html 2009-08-20 18:49:59 UTC (rev 7846) @@ -15,7 +15,7 @@ <h2>HornetQ Buffering</h2> -<p>This package is a stripped down version of org.jboss.netty.buffer, and we kept only what we needed for JBossMessaging buffers.</p> +<p>This package is a stripped down version of org.jboss.netty.buffer, and we kept only what we needed for HornetQ buffers.</p> <p>ChannelBuffer differs from java.nio.ByteBuffer in two ways:</p> 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:30:28 UTC (rev 7845) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -61,9 +61,6 @@ * * <p>A JournalImpl</p * - * <p>WIKI Page: <a href="http://wiki.jboss.org/wiki/JBossMessaging2Journal"> http://wiki.jboss.org/wiki/JBossMessaging2Journal</a></p> - * - * * <p>Look at {@link JournalImpl#load(LoaderCallback)} for the file layout * * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/journal/impl/Reclaimer.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/Reclaimer.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/src/main/org/hornetq/core/journal/impl/Reclaimer.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -32,8 +32,6 @@ * <p>2) All pos that correspond to any neg in file Fn, must all live in any file Fm where 0 <= m <= n * which are also marked for deletion in the same pass of the algorithm.</p> * - * <p>WIKI Page: <a href="http://wiki.jboss.org/wiki/JBossMessaging2Reclaiming">... - * * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> * */ Modified: trunk/src/main/org/hornetq/core/paging/Page.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/Page.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/src/main/org/hornetq/core/paging/Page.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -17,8 +17,6 @@ /** * - * <p>Look at the <a href="http://wiki.jboss.org/wiki/JBossMessaging2Paging">WIKI... for more information.</p> - * * @see PagingManager * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a> * Modified: trunk/src/main/org/hornetq/core/paging/PageTransactionInfo.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/PageTransactionInfo.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/src/main/org/hornetq/core/paging/PageTransactionInfo.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -17,8 +17,6 @@ /** * - * <p>Look at the <a href="http://wiki.jboss.org/wiki/JBossMessaging2Paging">WIKI... for more information.</p> - * * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a> * */ Modified: trunk/src/main/org/hornetq/core/paging/PagingManager.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/PagingManager.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/src/main/org/hornetq/core/paging/PagingManager.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -23,7 +23,6 @@ /** * - * <p>Look at the <a href="http://wiki.jboss.org/wiki/JBossMessaging2Paging">WIKI... for more information.</p> * <PRE> Modified: trunk/src/main/org/hornetq/core/paging/PagingStore.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/PagingStore.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/src/main/org/hornetq/core/paging/PagingStore.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -22,7 +22,6 @@ * <p>The producers will write directly to PagingStore and that will decide what * Page file should be used based on configured size</p> * - * <p>Look at the <a href="http://wiki.jboss.org/wiki/JBossMessaging2Paging">WIKI... for more information.</p> * @see PagingManager * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a> Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -33,7 +33,6 @@ import org.hornetq.utils.SimpleString; /** - * <p>Look at the <a href="http://www.jboss.org/community/wiki/JBossMessaging2Paging"... for more information.</p> * * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a> * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -777,9 +777,6 @@ { final PageTransactionInfo pageTransactionInfo = pagingManager.getTransaction(transactionIdDuringPaging); - // http://wiki.jboss.org/wiki/JBossMessaging2Paging - // This is the Step D described on the "Transactions on Paging" - // section if (pageTransactionInfo == null) { log.warn("Transaction " + pagedMessage.getTransactionID() + @@ -841,7 +838,6 @@ if (pageWithTransaction.getNumberOfMessages() == 0) { - // http://wiki.jboss.org/wiki/JBossMessaging2Paging // numberOfReads==numberOfWrites -> We delete the record storageManager.deletePageTransactional(depageTransaction.getID(), pageWithTransaction.getRecordID()); pagingManager.removeTransaction(pageWithTransaction.getTransactionID()); Modified: trunk/src/main/org/hornetq/core/paging/impl/TestSupportPageStore.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/TestSupportPageStore.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/src/main/org/hornetq/core/paging/impl/TestSupportPageStore.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -30,7 +30,7 @@ * @return * @throws Exception * - * Note: This should still be part of the interface, even though JBossMessaging only uses through the + * Note: This should still be part of the interface, even though HornetQ only uses through the */ Page depage() throws Exception; Modified: trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -1066,8 +1066,6 @@ boolean first = true; for (ServerMessage message : messagesToPage) { - // http://wiki.jboss.org/wiki/JBossMessaging2Paging - // Explained under Transaction On Paging. (This is the item B) if (pagingManager.page(message, tx.getID(), first)) { if (message.isDurable()) Modified: trunk/src/main/org/hornetq/utils/VariableLatch.java =================================================================== --- trunk/src/main/org/hornetq/utils/VariableLatch.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/src/main/org/hornetq/utils/VariableLatch.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -23,7 +23,7 @@ * * <p>The idea is, instead of providing each user specific Latch/Synchronization, java.util.concurrent provides the framework for reuses, based on an AtomicInteger (getState())</p> * - * <p>On JBossMessaging we have the requirement of increment and decrement a counter until the user fires a ready event (commit). At that point we just act as a regular countDown.</p> + * <p>On HornetQ we have the requirement of increment and decrement a counter until the user fires a ready event (commit). At that point we just act as a regular countDown.</p> * * <p>Note: This latch is reusable. Once it reaches zero, you can call up again, and reuse it on further waits.</p> * Modified: trunk/tests/joram-tests/src/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java =================================================================== --- trunk/tests/joram-tests/src/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/tests/joram-tests/src/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -48,7 +48,7 @@ receiverSession = receiverConnection.createQueueSession(false, Session.CLIENT_ACKNOWLEDGE); receiver.close(); // Before assigning a new receiver, we need to close the old one... // Not closing it could cause load balancing between receivers. - // Not having this close might be valid for JORAM or JBossMQ, but it's not valid for JBossMessaging (and still legal) + // Not having this close might be valid for JORAM or JBossMQ, but it's not valid for HornetQ (and still legal) receiver = receiverSession.createReceiver(receiverQueue); receiverConnection.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -1108,10 +1108,10 @@ server.start(); HornetQSecurityManager securityManager = server.getSecurityManager(); securityManager.addUser("all", "all"); - securityManager.addUser("bill", "jbossmessaging"); - securityManager.addUser("andrew", "jbossmessaging1"); - securityManager.addUser("frank", "jbossmessaging2"); - securityManager.addUser("sam", "jbossmessaging3"); + securityManager.addUser("bill", "hornetq"); + securityManager.addUser("andrew", "hornetq1"); + securityManager.addUser("frank", "hornetq2"); + securityManager.addUser("sam", "hornetq3"); securityManager.addRole("all", "all"); securityManager.addRole("bill", "user"); securityManager.addRole("andrew", "europe-user"); @@ -1168,7 +1168,7 @@ //Step 5. bill tries to make a connection using wrong password try { - billConnection = factory.createSession("bill", "jbossmessaging1", false, true, true, false, -1); + billConnection = factory.createSession("bill", "hornetq1", false, true, true, false, -1); fail("should throw exception"); } catch (HornetQException e) @@ -1177,16 +1177,16 @@ } //Step 6. bill makes a good connection. - billConnection = factory.createSession("bill", "jbossmessaging", false, true, true, false, -1); + billConnection = factory.createSession("bill", "hornetq", false, true, true, false, -1); //Step 7. andrew makes a good connection. - andrewConnection = factory.createSession("andrew", "jbossmessaging1", false, true, true, false, -1); + andrewConnection = factory.createSession("andrew", "hornetq1", false, true, true, false, -1); //Step 8. frank makes a good connection. - frankConnection = factory.createSession("frank", "jbossmessaging2", false, true, true, false, -1); + frankConnection = factory.createSession("frank", "hornetq2", false, true, true, false, -1); //Step 9. sam makes a good connection. - samConnection = factory.createSession("sam", "jbossmessaging3", false, true, true, false, -1); + samConnection = factory.createSession("sam", "hornetq3", false, true, true, false, -1); checkUserSendAndReceive(genericQueueName, billConnection); checkUserSendAndReceive(genericQueueName, andrewConnection); @@ -1236,10 +1236,10 @@ server.start(); HornetQSecurityManager securityManager = server.getSecurityManager(); securityManager.addUser("all", "all"); - securityManager.addUser("bill", "jbossmessaging"); - securityManager.addUser("andrew", "jbossmessaging1"); - securityManager.addUser("frank", "jbossmessaging2"); - securityManager.addUser("sam", "jbossmessaging3"); + securityManager.addUser("bill", "hornetq"); + securityManager.addUser("andrew", "hornetq1"); + securityManager.addUser("frank", "hornetq2"); + securityManager.addUser("sam", "hornetq3"); securityManager.addRole("all", "all"); securityManager.addRole("bill", "user"); securityManager.addRole("andrew", "europe-user"); @@ -1296,7 +1296,7 @@ //Step 5. bill tries to make a connection using wrong password try { - billConnection = factory.createSession("bill", "jbossmessaging1", false, true, true, false, -1); + billConnection = factory.createSession("bill", "hornetq1", false, true, true, false, -1); fail("should throw exception"); } catch (HornetQException e) @@ -1305,16 +1305,16 @@ } //Step 6. bill makes a good connection. - billConnection = factory.createSession("bill", "jbossmessaging", false, true, true, false, -1); + billConnection = factory.createSession("bill", "hornetq", false, true, true, false, -1); //Step 7. andrew makes a good connection. - andrewConnection = factory.createSession("andrew", "jbossmessaging1", false, true, true, false, -1); + andrewConnection = factory.createSession("andrew", "hornetq1", false, true, true, false, -1); //Step 8. frank makes a good connection. - frankConnection = factory.createSession("frank", "jbossmessaging2", false, true, true, false, -1); + frankConnection = factory.createSession("frank", "hornetq2", false, true, true, false, -1); //Step 9. sam makes a good connection. - samConnection = factory.createSession("sam", "jbossmessaging3", false, true, true, false, -1); + samConnection = factory.createSession("sam", "hornetq3", false, true, true, false, -1); checkUserSendAndReceive(genericQueueName, billConnection); checkUserSendAndReceive(genericQueueName, andrewConnection); Modified: trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2009-08-20 18:30:28 UTC (rev 7845) +++ trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2009-08-20 18:49:59 UTC (rev 7846) @@ -72,8 +72,8 @@ // Compare the value from ConnectionMetaData and MANIFEST.MF Attributes attrs = manifest.getMainAttributes(); - assertEquals(meta.getProviderVersion(), attrs.getValue("JBossMessaging-Version")); - assertEquals("https://svn.jboss.org/repos/messaging/trunk";, attrs.getValue("JBossMessaging-SVN-URL")); + assertEquals(meta.getProviderVersion(), attrs.getValue("HornetQ-Version")); + assertEquals("https://svn.jboss.org/repos/hornetq/trunk";, attrs.getValue("HornetQ-SVN-URL")); } finally {