JBoss hornetq SVN: r7853 - trunk/examples/jms/ssl-enabled/server0.
by do-not-reply＠jboss.org
Author: timfox
Date: 2009-08-21 04:38:45 -0400 (Fri, 21 Aug 2009)
New Revision: 7853
Added:
trunk/examples/jms/ssl-enabled/server0/hornetq.example.keystore
trunk/examples/jms/ssl-enabled/server0/hornetq.example.truststore
Removed:
trunk/examples/jms/ssl-enabled/server0/jbm.example.keystore
trunk/examples/jms/ssl-enabled/server0/jbm.example.truststore
Log:
rename remaining keystores
Copied: trunk/examples/jms/ssl-enabled/server0/hornetq.example.keystore (from rev 7852, trunk/examples/jms/ssl-enabled/server0/jbm.example.keystore)
===================================================================
(Binary files differ)
Copied: trunk/examples/jms/ssl-enabled/server0/hornetq.example.truststore (from rev 7852, trunk/examples/jms/ssl-enabled/server0/jbm.example.truststore)
===================================================================
(Binary files differ)
Deleted: trunk/examples/jms/ssl-enabled/server0/jbm.example.keystore
===================================================================
(Binary files differ)
Deleted: trunk/examples/jms/ssl-enabled/server0/jbm.example.truststore
===================================================================
(Binary files differ)
15 years, 4 months
- 1
- 0
JBoss hornetq SVN: r7852 - in trunk: examples/jms/perf and 1 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-08-20 17:57:35 -0400 (Thu, 20 Aug 2009)
New Revision: 7852
Added:
trunk/examples/jms/perf/extra-libs/
Modified:
trunk/build-hornetq.xml
trunk/examples/jms/perf/
trunk/examples/jms/perf/jndi.properties
trunk/examples/jms/perf/server0/hornetq-configuration.xml
Log:
Fixing examples
Modified: trunk/build-hornetq.xml
===================================================================
--- trunk/build-hornetq.xml 2009-08-20 19:58:23 UTC (rev 7851)
+++ trunk/build-hornetq.xml 2009-08-20 21:57:35 UTC (rev 7852)
@@ -672,7 +672,7 @@
<include name="org/hornetq/core/version/**/*.class"/>
<include name="org/hornetq/core/management/**/*.class"/>
<!-- FIXME - why are these classes in the client jar ??? -->
- <include name="org/hornetq/core/server/MessagingComponent.class"/>
+ <include name="org/hornetq/core/server/HornetQComponent.class"/>
<include name="org/hornetq/core/server/JournalType.class"/>
<include name="org/hornetq/core/journal/EncodingSupport.class"/>
<include name="org/hornetq/core/server/ServerMessage.class"/>
Property changes on: trunk/examples/jms/perf
___________________________________________________________________
Name: svn:ignore
- build
+ build
data
Modified: trunk/examples/jms/perf/jndi.properties
===================================================================
--- trunk/examples/jms/perf/jndi.properties 2009-08-20 19:58:23 UTC (rev 7851)
+++ trunk/examples/jms/perf/jndi.properties 2009-08-20 21:57:35 UTC (rev 7852)
@@ -1,3 +1,3 @@
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1199
+java.naming.provider.url=jnp://localhost:1099
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
Modified: trunk/examples/jms/perf/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/perf/server0/hornetq-configuration.xml 2009-08-20 19:58:23 UTC (rev 7851)
+++ trunk/examples/jms/perf/server0/hornetq-configuration.xml 2009-08-20 21:57:35 UTC (rev 7852)
@@ -21,7 +21,7 @@
</acceptor>
</acceptors>
- <backup>true</backup>
+ <backup>false</backup>
<security-enabled>false</security-enabled>
15 years, 4 months
- 1
- 0
JBoss hornetq SVN: r7851 - in trunk/docs/user-manual/en: images and 1 other directory.
by do-not-reply＠jboss.org
Author: timfox
Date: 2009-08-20 15:58:23 -0400 (Thu, 20 Aug 2009)
New Revision: 7851
Added:
trunk/docs/user-manual/en/images/hornetQ-banner_final.png
Modified:
trunk/docs/user-manual/en/embedding-hornetq.xml
trunk/docs/user-manual/en/master.xml
Log:
a few tweaks to docs
Modified: trunk/docs/user-manual/en/embedding-hornetq.xml
===================================================================
--- trunk/docs/user-manual/en/embedding-hornetq.xml 2009-08-20 19:33:19 UTC (rev 7850)
+++ trunk/docs/user-manual/en/embedding-hornetq.xml 2009-08-20 19:58:23 UTC (rev 7851)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="embedding-jbm">
+<chapter id="embedding-hornetq">
<title>Embedding HornetQ</title>
<para>HornetQ is designed as set of simple Plain Old Java Objects (POJOs). This means
HornetQ can be instantiated and run in any dependency injection framework such as
Added: trunk/docs/user-manual/en/images/hornetQ-banner_final.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/user-manual/en/images/hornetQ-banner_final.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/docs/user-manual/en/master.xml
===================================================================
--- trunk/docs/user-manual/en/master.xml 2009-08-20 19:33:19 UTC (rev 7850)
+++ trunk/docs/user-manual/en/master.xml 2009-08-20 19:58:23 UTC (rev 7851)
@@ -50,57 +50,8 @@
]>
<book lang="en">
<bookinfo>
- <title>HornetQ 2.0 User Manual</title>
- <subtitle>Setting the Standard for High Performance Messaging</subtitle>
+ <graphic fileref="images/hornetQ-banner_final.png" align="center"/>
+ <title>HornetQ 2.0 User Manual </title>
</bookinfo>
-
- <toc></toc>
-
- &preface;
- &messaging-concepts;
- &architecture;
- &using-server;
- &using-jms;
- &using-core;
- &jms-core-mapping;
- &client-classpath;
- &examples;
- &wildcard-routing;
- &wildcard-syntax;
- &filter-expressions;
- &persistence;
- &configuring-transports;
- &connection-ttl;
- &transaction-config;
- &flow-control;
- &command-buffering;
- &send-guarantees;
- &undelivered-messages;
- &message-expiry;
- &large-messages;
- &paging;
- &queue-attributes;
- &scheduled-messages;
- &last-value-queues;
- &message-grouping;
- &pre-acknowledge;
- &management;
- &security;
- &appserver-integration;
- &client-reconnection;
- &diverts;
- &core-bridges;
- &duplicate-detection;
- &clusters;
- &ha;
- &libaio;
- &thread-pooling;
- &logging;
- &embedding-hornetq;
- &intercepting-operations;
- &interoperability;
- &perf-tuning;
- &configuration-index;
- &project-info;
-
+ <toc/>&preface;&messaging-concepts;&architecture;&using-server;&using-jms;&using-core;&jms-core-mapping;&client-classpath;&examples;&wildcard-routing;&wildcard-syntax;&filter-expressions;&persistence;&configuring-transports;&connection-ttl;&transaction-config;&flow-control;&command-buffering;&send-guarantees;&undelivered-messages;&message-expiry;&large-messages;&paging;&queue-attributes;&scheduled-messages;&last-value-queues;&message-grouping;&pre-acknowledge;&management;&security;&appserver-integration;&client-reconnection;&diverts;&core-bridges;&duplicate-detection;&clusters;&ha;&libaio;&thread-pooling;&logging;&embedding-hornetq;&intercepting-operations;&interoperability;&perf-tuning;&configuration-index;&project-info;
</book>
15 years, 4 months
- 1
- 0
JBoss hornetq SVN: r7849 - trunk/native/bin.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-08-20 15:24:17 -0400 (Thu, 20 Aug 2009)
New Revision: 7849
Modified:
trunk/native/bin/libHornetQAIO_ia64.so
Log:
ia64 compilation on dev15
Modified: trunk/native/bin/libHornetQAIO_ia64.so
===================================================================
(Binary files differ)
15 years, 4 months
- 1
- 0
JBoss hornetq SVN: r7848 - trunk/native/bin.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-08-20 15:17:34 -0400 (Thu, 20 Aug 2009)
New Revision: 7848
Modified:
trunk/native/bin/libHornetQAIO32.so
Log:
Compilation after exception name change
Modified: trunk/native/bin/libHornetQAIO32.so
===================================================================
(Binary files differ)
15 years, 4 months
- 1
- 0
JBoss hornetq SVN: r7847 - in trunk: native/src and 1 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2009-08-20 15:10:19 -0400 (Thu, 20 Aug 2009)
New Revision: 7847
Modified:
trunk/native/bin/libHornetQAIO64.so
trunk/native/src/Version.h
trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java
Log:
recompilation after renaming Exception class
Modified: trunk/native/bin/libHornetQAIO64.so
===================================================================
(Binary files differ)
Modified: trunk/native/src/Version.h
===================================================================
--- trunk/native/src/Version.h 2009-08-20 18:49:59 UTC (rev 7846)
+++ trunk/native/src/Version.h 2009-08-20 19:10:19 UTC (rev 7847)
@@ -1,5 +1,5 @@
#ifndef _VERSION_NATIVE_AIO
-#define _VERSION_NATIVE_AIO 23
+#define _VERSION_NATIVE_AIO 24
#endif
Modified: trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java 2009-08-20 18:49:59 UTC (rev 7846)
+++ trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java 2009-08-20 19:10:19 UTC (rev 7847)
@@ -46,7 +46,7 @@
private static boolean loaded = false;
- private static int EXPECTED_NATIVE_VERSION = 23;
+ private static int EXPECTED_NATIVE_VERSION = 24;
public static void addMax(final int io)
{
15 years, 4 months
- 1
- 0
JBoss hornetq SVN: r7846 - in trunk: docs/quickstart-guide/en and 20 other directories.
by do-not-reply＠jboss.org
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 @@
<properties depends="arjuna" name="jta">
...
- <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1"
+ <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;[connection configuration]"/>
</properties>
</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
>org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</literal> or
<literal
>org.hornetq.integration.transports.netty.NettyConnectorFactory</literal></para>
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"
>javax.jms.Message</ulink>.</para>
- <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"
>here</ulink>. You can download any releases from there.</para>
<para>If you have any user questions please use our <ulink
url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=238">user
@@ -9,7 +9,7 @@
<para>If you have development related questions, please use our <ulink
url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=153">development
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</ulink></para>
<para>All our release tags are <ulink url="http://anonsvn.jboss.org/repos/messaging/tags">here</ulink></para>
<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>
- <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>
@@ -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">http://wiki.jboss.org/wiki/JBossMessaging2Reclaiming</a></p>
- *
* @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</a> 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</a> 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</a> 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</a> 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">WIKI</a> 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
{
15 years, 4 months
- 1
- 0
JBoss hornetq SVN: r7845 - in trunk: docs/user-manual/en and 1 other directories.
by do-not-reply＠jboss.org
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/12313229">HornetQ 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
>META-INF/ra.xml</literal>.</para>
<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
>conf/jbossts-properties.xml</literal> is:</para>
<programlisting>
-<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1"
+<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
>conf/jbossts-properties.xml</literal> is:</para>
<programlisting>
-<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1"
+<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>
- <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1"
+ <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 @@
<servlet-class>org.jboss.netty.channel.socket.http.HttpTunnelingServlet</servlet-class>
<init-param>
<param-name>endpoint</param-name>
- <param-value>local:org.jboss.jbm</param-value>
+ <param-value>local:org.hornetq</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>NettyServlet</servlet-name>
- <url-pattern>/JBMServlet</url-pattern>
+ <url-pattern>/HornetQServlet</url-pattern>
</servlet-mapping>
</web-app>
@@ -348,7 +348,7 @@
org.hornetq.integration.transports.netty.NettyAcceptorFactory
</factory-class>
<param key="hornetq.remoting.netty.useinvm" value="true" type="Boolean"/>
- <param key="hornetq.remoting.netty.host" value="org.jboss.jbm" type="String"/>
+ <param key="hornetq.remoting.netty.host" value="org.hornetq" type="String"/>
</acceptor>
</acceptors>
@@ -367,7 +367,7 @@
<param key="hornetq.remoting.netty.port" value="8080" type="Integer"/>
<param key="hornetq.remoting.netty.useservlet" value="true" type="Boolean"/>
<param key="hornetq.remoting.netty.servletpath"
- value="/messaging/JBMServlet" type="String"/>
+ value="/messaging/HornetQServlet" type="String"/>
</connector>
</connectors></programlisting>
@@ -392,7 +392,7 @@
<param key="hornetq.remoting.netty.host" value="localhost" type="String"/>
<param key="hornetq.remoting.netty.port" value="8443" type="Integer"/>
<param key="hornetq.remoting.netty.useservlet" value="true" type="Boolean"/>
- <param key="hornetq.remoting.netty.servletpath" value="/messaging/JBMServlet" type="String"/>
+ <param key="hornetq.remoting.netty.servletpath" value="/messaging/HornetQServlet" type="String"/>
<param key="hornetq.remoting.netty.sslenabled" value="true" type="Boolean"/>
<param key="hornetq.remoting.netty.keystorepath" value="path to a keystoree" type="String"/>
<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
>org.hornetq.core.message.impl.HDR_DUPLICATE_DETECTION_ID</literal>, which
- 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
>SimpleString</literal> if you're using the core API. If you're using JMS it must be
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
>0</literal> is the lowest priority and <literal>9</literal> is the highest.
- 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 @@
>NON_DURABLE</literal>.</para>
</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</ulink> 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/">JDK
+ <para>HornetQ uses standard <ulink url="http://java.sun.com/j2se/1.4.2/docs/guide/util/logging/">JDK
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
>java.util.logging.config.file</literal> system property to point to the appropriate
- logging.properties file. The standalone JBM server does this and the <literal
+ logging.properties file. The standalone HornetQ server does this and the <literal
>logging.properties</literal> file can be found under the <literal>config</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 @@
>exampleQueue</literal>:</para>
<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
>hornetq-configuration.xml</literal>:</para>
<programlisting>
- <management-address>jbm.management</management-address>
+ <management-address>hornetq.management</management-address>
</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>
<!-- users with the admin role will be allowed to manage -->
<!-- HornetQ using management messages -->
- <security-setting match="jbm.management">
+ <security-setting match="hornetq.management">
<permission type="manage" roles="admin" />
</security-setting>
</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
>exampleQueue</literal>:</para>
<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
>hornetq-configuration.xml</literal>:</para>
<programlisting>
- <management-cluster-user>JBM.MANAGEMENT.ADMIN.USER</management-cluster-user>
+ <management-cluster-user>HORNETQ.MANAGEMENT.ADMIN.USER</management-cluster-user>
<management-cluster-password>CHANGE ME!!</management-cluster-password>
</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>
- <management-notification-address>jbm.notifications</management-notification-address>
+ <management-notification-address>hornetq.notifications</management-notification-address>
</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
>MessageImpl.HDR_GROUP_ID</literal>). Alternatively, you can set <literal
>autogroup</literal> to true on the <literal>SessionFactory</literal> which will pick a
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
>MessageImpl.HDR_SCHEDULED_DELIVERY_TIME</literal>).</para>
<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
{
15 years, 4 months
- 1
- 0
JBoss hornetq SVN: r7844 - in trunk: docs/quickstart-guide/en and 14 other directories.
by do-not-reply＠jboss.org
Author: timfox
Date: 2009-08-20 14:06:54 -0400 (Thu, 20 Aug 2009)
New Revision: 7844
Added:
trunk/tests/config/hornetq.keystore
trunk/tests/config/hornetq.truststore
Removed:
trunk/tests/config/messaging.keystore
trunk/tests/config/messaging.truststore
Modified:
trunk/docs/quickstart-guide/en/examples.xml
trunk/docs/user-manual/build.xml
trunk/docs/user-manual/en/appserver-integration.xml
trunk/docs/user-manual/en/clusters.xml
trunk/docs/user-manual/en/configuring-transports.xml
trunk/docs/user-manual/en/diverts.xml
trunk/docs/user-manual/en/embedding-jbm.xml
trunk/docs/user-manual/en/logging.xml
trunk/docs/user-manual/en/management.xml
trunk/examples/common/config/logging.properties
trunk/examples/javaee/common/build.xml
trunk/examples/javaee/hajndi/build.xml
trunk/examples/javaee/jca-config/build.xml
trunk/examples/javaee/jca-config/readme.html
trunk/examples/jms/jaas/src/org/hornetq/jms/example/JAASExample.java
trunk/hornetq.ipr
trunk/src/config/jboss-as/build.xml
trunk/src/main/org/hornetq/core/server/HornetQServer.java
trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java
trunk/tests/smoke/build.xml
trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
Log:
remove more messaging refs
Modified: trunk/docs/quickstart-guide/en/examples.xml
===================================================================
--- trunk/docs/quickstart-guide/en/examples.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/quickstart-guide/en/examples.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -146,9 +146,9 @@
deploy-resources:
[copy] Copying 1 file to /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA
- /server/default-with-hornetq/deploy/messaging.sar
+ /server/default-with-hornetq/deploy/hornetq.sar
[copy] Copying 1 file to /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA
- /server/default-with-hornetq/deploy/messaging.sar
+ /server/default-with-hornetq/deploy/hornetq.sar
init:
@@ -220,9 +220,9 @@
[delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA
/server/default-with-hornetq/deploy/mdb-example.ear
[delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA
- /server/default-with-hornetq/deploy/messaging.sar/hornetq-queues.xml
+ /server/default-with-hornetq/deploy/hornetq.sar/hornetq-queues.xml
[delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA
- /server/default-with-hornetq/deploy/messaging.sar/hornetq-jms.xml
+ /server/default-with-hornetq/deploy/hornetq.sar/hornetq-jms.xml
BUILD SUCCESSFUL
Total time: 1 second
Modified: trunk/docs/user-manual/build.xml
===================================================================
--- trunk/docs/user-manual/build.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/build.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -1,4 +1,4 @@
-<project name="jbmessaging.user-manual" default="all" basedir=".">
+<project name="hornetq.user-manual" default="all" basedir=".">
<property name="build.dir" value="build"/>
<property name="pdf.name" value="JBossMessaging_UserManual.pdf"/>
Modified: trunk/docs/user-manual/en/appserver-integration.xml
===================================================================
--- trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -541,7 +541,7 @@
factories that are used by Java EE components. These Connection Factories can be
defined inside a configuration file that matches the name <literal
>*-ds.xml</literal>. You'll find a default <literal>jms-ds.xml</literal>
- configuration under the <literal>messaging.sar</literal> directory in the Jboss AS
+ configuration under the <literal>hornetq.sar</literal> directory in the Jboss AS
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>
Modified: trunk/docs/user-manual/en/clusters.xml
===================================================================
--- trunk/docs/user-manual/en/clusters.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/clusters.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -60,8 +60,7 @@
connection settings for a live and (optional) backup server and broadcasts them on
the network. It also defines the UDP address and port settings. </para>
<para>Broadcast groups are defined in the server configuration file <literal
- >hornetq-configuration.xml</literal>. There can be many broadcast groups per JBoss
- Messaging server. All broadcast groups must be defined in a <literal
+ >hornetq-configuration.xml</literal>. There can be many broadcast groups per HornetQ server. All broadcast groups must be defined in a <literal
>broadcast-groups</literal> element.</para>
<para>Let's take a look at an example broadcast group from <literal
>hornetq-configuration.xml</literal>:</para>
Modified: trunk/docs/user-manual/en/configuring-transports.xml
===================================================================
--- trunk/docs/user-manual/en/configuring-transports.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/configuring-transports.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -297,8 +297,7 @@
<title>Configuring Netty Servlet</title>
<para>We also provide a Netty servlet transport for use with HornetQ. The
servlet transport allows HornetQ traffic to be tunneled over HTTP to a
- servlet running in a servlet engine which then redirects it to an in-VM JBoss
- Messaging server.</para>
+ 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
Modified: trunk/docs/user-manual/en/diverts.xml
===================================================================
--- trunk/docs/user-manual/en/diverts.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/diverts.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -63,8 +63,7 @@
change the messages body or properties before it is diverted. In this example the
transformer simply adds a header that records the time the divert happened.</para>
<para>This example is actually diverting messages to a local store and forward queue, which
- is configured with a bridge which forwards the message to an address on another JBoss
- Messaging server. Please see the example for more details.</para>
+ is configured with a bridge which forwards the message to an address on another HornetQ server. Please see the example for more details.</para>
</section>
<section>
<title>Non-exclusive Divert</title>
Modified: trunk/docs/user-manual/en/embedding-jbm.xml
===================================================================
--- trunk/docs/user-manual/en/embedding-jbm.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/embedding-jbm.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -17,8 +17,7 @@
<section>
<title>POJO instantiation</title>
<para>You can follow this step-by-step guide:</para>
- <para>Create the configuration object - this contains configuration information for a JBoss
- Messaging server. If you want to configure it from a file on the classpath, use <literal
+ <para>Create the configuration object - this contains configuration information for a HornetQ server. If you want to configure it from a file on the classpath, use <literal
>FileConfigurationImpl</literal></para>
<programlisting>import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.impl.FileConfiguration;
Modified: trunk/docs/user-manual/en/logging.xml
===================================================================
--- trunk/docs/user-manual/en/logging.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/logging.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -13,7 +13,7 @@
>logging.properties</literal> file can be found under the <literal>config</literal>
directory of the JBM 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/messaging.log</literal>.</para>
+ 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
Microcontainer, use the JBoss Logging framework we have supplied a plugin class that
redirects this to the JUL logger. This is set via a system property, <literal
Modified: trunk/docs/user-manual/en/management.xml
===================================================================
--- trunk/docs/user-manual/en/management.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/management.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -799,8 +799,7 @@
<title>Example</title>
<para>See <xref linkend="examples.management-notifications" /> for an example which
shows how to use a
- JMS <literal>MessageListener</literal> to receive management notifications from JBoss
- Messaging server.</para>
+ JMS <literal>MessageListener</literal> to receive management notifications from HornetQ server.</para>
</section>
</section>
<section id="management.message-counters">
Modified: trunk/examples/common/config/logging.properties
===================================================================
--- trunk/examples/common/config/logging.properties 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/examples/common/config/logging.properties 2009-08-20 18:06:54 UTC (rev 7844)
@@ -20,7 +20,7 @@
java.util.logging.ConsoleHandler.formatter=org.hornetq.integration.logging.HornetQLoggerFormatter
java.util.logging.FileHandler.level=INFO
java.util.logging.FileHandler.formatter=org.hornetq.integration.logging.HornetQLoggerFormatter
-java.util.logging.FileHandler.pattern=logs/messaging.log
+java.util.logging.FileHandler.pattern=logs/hornetq.log
# Default global logging level.
# This specifies which kinds of events are logged across
# all loggers. For any given facility this global level
Modified: trunk/examples/javaee/common/build.xml
===================================================================
--- trunk/examples/javaee/common/build.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/examples/javaee/common/build.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -112,7 +112,7 @@
<target name="deploy" depends="validate-jboss, copy-profile, copy-resources, ear">
<property name="example-profile" value="${jboss.home}/server/${example.name}-example-profile"/>
- <copy todir="${example-profile}/deploy/messaging.sar">
+ <copy todir="${example-profile}/deploy/hornetq.sar">
<fileset dir="${example.server.dir}"/>
</copy>
<copy todir="${example-profile}/deploy/">
Modified: trunk/examples/javaee/hajndi/build.xml
===================================================================
--- trunk/examples/javaee/hajndi/build.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/examples/javaee/hajndi/build.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -20,12 +20,12 @@
<property name="deploy.dir2" value="${jboss.home}/server/all-with-hornetq_2/deploy/" />
<!-- copy 1st server resources configuration -->
- <copy file="${example.config.dir}/hornetq-queues.xml" todir="${deploy.dir}/messaging.sar/" overwrite="yes"/>
- <copy file="${example.config.dir}/hornetq-jms.xml" todir="${deploy.dir}/messaging.sar/" overwrite="yes"/>
+ <copy file="${example.config.dir}/hornetq-queues.xml" todir="${deploy.dir}/hornetq.sar/" overwrite="yes"/>
+ <copy file="${example.config.dir}/hornetq-jms.xml" todir="${deploy.dir}/hornetq.sar/" overwrite="yes"/>
<!-- copy 2nd server resources configuration -->
- <copy file="${example.config.dir}/hornetq-queues.xml" todir="${deploy.dir2}/messaging.sar/" overwrite="yes"/>
- <copy file="${example.config.dir}/hornetq-jms.xml" todir="${deploy.dir2}/messaging.sar/" overwrite="yes"/>
+ <copy file="${example.config.dir}/hornetq-queues.xml" todir="${deploy.dir2}/hornetq.sar/" overwrite="yes"/>
+ <copy file="${example.config.dir}/hornetq-jms.xml" todir="${deploy.dir2}/hornetq.sar/" overwrite="yes"/>
</target>
<target name="undeploy">
@@ -33,12 +33,12 @@
<property name="deploy.dir2" value="${jboss.home}/server/all-with-hornetq_2/deploy/" />
<!-- delete 1st server resources configuration -->
- <delete file="${deploy.dir}/messaging.sar/hornetq-queues.xml" failonerror="false"/>
- <delete file="${deploy.dir}/messaging.sar/hornetq-jms.xml" failonerror="false"/>
+ <delete file="${deploy.dir}/hornetq.sar/hornetq-queues.xml" failonerror="false"/>
+ <delete file="${deploy.dir}/hornetq.sar/hornetq-jms.xml" failonerror="false"/>
<!-- delete 2nd server resources configuration -->
- <delete file="${deploy.dir2}/messaging.sar/hornetq-queues.xml" failonerror="false"/>
- <delete file="${deploy.dir2}/messaging.sar/hornetq-jms.xml" failonerror="false"/>
+ <delete file="${deploy.dir2}/hornetq.sar/hornetq-queues.xml" failonerror="false"/>
+ <delete file="${deploy.dir2}/hornetq.sar/hornetq-jms.xml" failonerror="false"/>
</target>
<target name="run">
Modified: trunk/examples/javaee/jca-config/build.xml
===================================================================
--- trunk/examples/javaee/jca-config/build.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/examples/javaee/jca-config/build.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -42,7 +42,7 @@
<exclude name="**/tmp/**"/>
</fileset>
</copy>
- <copy todir="${deploy.dir2}/deploy/messaging.sar">
+ <copy todir="${deploy.dir2}/deploy/hornetq.sar">
<fileset dir="server2">
<include name="jms-remote-ds.xml"/>
</fileset>
Modified: trunk/examples/javaee/jca-config/readme.html
===================================================================
--- trunk/examples/javaee/jca-config/readme.html 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/examples/javaee/jca-config/readme.html 2009-08-20 18:06:54 UTC (rev 7844)
@@ -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 jboss-messaging resource adapter at $JBOSS_HOME/server/<i>YOUR-SERVER</i>/deploy/jms-ra.rar.</p>
+ <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>To change these properties, open the ra.xml under jms-ra.rar/META-INF</p>
<p>Example for ra.xml:</p>
<pre>
Modified: trunk/examples/jms/jaas/src/org/hornetq/jms/example/JAASExample.java
===================================================================
--- trunk/examples/jms/jaas/src/org/hornetq/jms/example/JAASExample.java 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/examples/jms/jaas/src/org/hornetq/jms/example/JAASExample.java 2009-08-20 18:06:54 UTC (rev 7844)
@@ -25,7 +25,7 @@
/**
* A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message.
- * The messaging server is configured to use JAAS.
+ * The HornetQ server is configured to use JAAS.
*
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
*/
Modified: trunk/hornetq.ipr
===================================================================
--- trunk/hornetq.ipr 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/hornetq.ipr 2009-08-20 18:06:54 UTC (rev 7844)
@@ -2,7 +2,7 @@
<project relativePaths="false" version="4">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
- <buildFile url="file://$PROJECT_DIR$/build-messaging.xml">
+ <buildFile url="file://$PROJECT_DIR$/build-hornetq.xml">
<additionalClassPath />
<antReference projectDefault="true" />
<customJdkName value="" />
Modified: trunk/src/config/jboss-as/build.xml
===================================================================
--- trunk/src/config/jboss-as/build.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/src/config/jboss-as/build.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -23,17 +23,17 @@
<!-- created from JBoss AS 5 default profile -->
<param name="jbossas.profile.source" value="default"/>
<!-- based on HornetQ jbossas/non-clustered config -->
- <param name="messaging.config.dir" value="./non-clustered"/>
+ <param name="hornetq.config.dir" value="./non-clustered"/>
<!-- new profile is named default-with-hornetq -->
- <param name="messaging.profile.target" value="default-with-hornetq"/>
+ <param name="hornetq.profile.target" value="default-with-hornetq"/>
</antcall>
<antcall target="create-profile">
<!-- created from JBoss AS 5 all profile -->
<param name="jbossas.profile.source" value="all"/>
<!-- based on HornetQ jbossas/clustered config -->
- <param name="messaging.config.dir" value="clustered"/>
+ <param name="hornetq.config.dir" value="clustered"/>
<!-- new profile is named all-with-hornetq -->
- <param name="messaging.profile.target" value="all-with-hornetq"/>
+ <param name="hornetq.profile.target" value="all-with-hornetq"/>
</antcall>
<mkdir dir="${dest.bin.dir}/META-INF/lib/linux2/x86"/>
<mkdir dir="${dest.bin.dir}/META-INF/lib/linux2/x64"/>
@@ -46,7 +46,7 @@
<target name="create-profile">
<antcall target="validate-jboss"/>
<property name="src.dir" value="${jboss.home}/server/${jbossas.profile.source}"/>
- <property name="dest.dir" value="${jboss.home}/server/${messaging.profile.target}"/>
+ <property name="dest.dir" value="${jboss.home}/server/${hornetq.profile.target}"/>
<mkdir dir="${dest.dir}"/>
<copy todir="${dest.dir}">
@@ -57,12 +57,12 @@
</fileset>
</copy>
<copy todir="${dest.dir}/conf">
- <fileset dir="${messaging.config.dir}">
+ <fileset dir="${hornetq.config.dir}">
<include name="login-config.xml"/>
</fileset>
</copy>
<copy todir="${dest.dir}/conf/props">
- <fileset dir="${messaging.config.dir}">
+ <fileset dir="${hornetq.config.dir}">
<include name="hornetq-users.properties"/>
<include name="hornetq-roles.properties"/>
</fileset>
@@ -73,10 +73,10 @@
<include name="netty*.jar"/>
</fileset>
</copy>
- <property name="messaging.sar.dir" value="${dest.dir}/deploy/messaging.sar"/>
- <mkdir dir="${messaging.sar.dir}"/>
- <copy todir="${messaging.sar.dir}">
- <fileset dir="${messaging.config.dir}" includes="*"/>
+ <property name="hornetq.sar.dir" value="${dest.dir}/deploy/hornetq.sar"/>
+ <mkdir dir="${hornetq.sar.dir}"/>
+ <copy todir="${hornetq.sar.dir}">
+ <fileset dir="${hornetq.config.dir}" includes="*"/>
</copy>
<unzip src="${lib.dir}/hornetq-ra.rar" dest="${dest.dir}/deploy/jms-ra.rar"/>
</target>
@@ -87,9 +87,9 @@
<fail unless="ENV.JBOSS_HOME" message="JBOSS_HOME environment variable not set! Set it and try again."/>
<available property="source-profile" type="dir" file="${jboss.home}/server/${jbossas.profile.source}"/>
<fail unless="source-profile" message="${jboss.home}/server/${jbossas.profile.source} profile not found!"/>
- <available property="target-profile" type="dir" file="${jboss.home}/server/${messaging.profile.target}"/>
+ <available property="target-profile" type="dir" file="${jboss.home}/server/${hornetq.profile.target}"/>
<fail if="target-profile"
- message="'${messaging.profile.target}' profile already exists! Delete it manually and try again."/>
+ message="'${hornetq.profile.target}' profile already exists! Delete it manually and try again."/>
</target>
</project>
Modified: trunk/src/main/org/hornetq/core/server/HornetQServer.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/HornetQServer.java 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/src/main/org/hornetq/core/server/HornetQServer.java 2009-08-20 18:06:54 UTC (rev 7844)
@@ -42,7 +42,7 @@
/**
* This interface defines the internal interface of the HornetQ Server exposed to other components of the server. The
* external management interface of the HornetQ Server is defined by the HornetQServerManagement interface This
- * interface is never exposed outside the messaging server, e.g. by JMX or other means
+ * interface is never exposed outside the HornetQ server, e.g. by JMX or other means
*
* @author <a href="tim.fox(a)jboss.com">Tim Fox</a>
* @author <a href="ataylor(a)redhat.com">Andy Taylor</a>
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-08-20 18:06:54 UTC (rev 7844)
@@ -111,7 +111,7 @@
import org.hornetq.utils.VersionLoader;
/**
- * The messaging server implementation
+ * The HornetQ server implementation
*
* @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
* @author <a href="mailto:ataylor@redhat.com>Andy Taylor</a>
Modified: trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java 2009-08-20 18:06:54 UTC (rev 7844)
@@ -72,11 +72,11 @@
public static final int DEFAULT_PORT = 5445;
- public static final String DEFAULT_KEYSTORE_PATH = "messaging.keystore";
+ public static final String DEFAULT_KEYSTORE_PATH = "hornetq.keystore";
public static final String DEFAULT_KEYSTORE_PASSWORD = "secureexample";
- public static final String DEFAULT_TRUSTSTORE_PATH = "messaging.truststore";
+ public static final String DEFAULT_TRUSTSTORE_PATH = "hornetq.truststore";
public static final String DEFAULT_TRUSTSTORE_PASSWORD = "secureexample";
Copied: trunk/tests/config/hornetq.keystore (from rev 7838, trunk/tests/config/messaging.keystore)
===================================================================
(Binary files differ)
Copied: trunk/tests/config/hornetq.truststore (from rev 7838, trunk/tests/config/messaging.truststore)
===================================================================
(Binary files differ)
Deleted: trunk/tests/config/messaging.keystore
===================================================================
(Binary files differ)
Deleted: trunk/tests/config/messaging.truststore
===================================================================
(Binary files differ)
Modified: trunk/tests/smoke/build.xml
===================================================================
--- trunk/tests/smoke/build.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/tests/smoke/build.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -44,13 +44,13 @@
<property file="./smoke.properties"/>
<property name="sleep.interval" value="60"/>
<property name="jnpPort" value="1099"/>
- <property name="messaging.server.artifact.name" value="jboss-messaging.sar"/>
- <property name="messaging.server.artifact.path" value="../../output/lib"/>
+ <property name="hornetq.server.artifact.name" value="hornetq.sar"/>
+ <property name="hornetq.server.artifact.path" value="../../output/lib"/>
<property name="relative.client.jar.location" value="../../util"/>
- <property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
+ <property name="hornetq.client.jar.name" value="hornetq-client.jar"/>
<property name="release.admin.target" value="default"/>
<property name="jboss.configuration" value="messaging"/>
- <property name="messaging.client.jar.path" value="${basedir}/../../output/lib"/>
+ <property name="hornetq.client.jar.path" value="${basedir}/../../output/lib"/>
<property name="smoke.test.type" value="installation"/>
<property name="clustered" value="false"/>
@@ -523,31 +523,31 @@
<target name="old-server-compatibility-test" depends="check-jboss-availability">
<echo message="Checking current client's compatibility with a ${jboss.hornetq.version} server"/>
- <unzip src="${jboss.compatibility.home}/../jboss-messaging-${jboss.hornetq.version}.zip" dest="./output">
+ <unzip src="${jboss.compatibility.home}/../hornetq-${jboss.hornetq.version}.zip" dest="./output">
<patternset>
- <include name="jboss-messaging-${jboss.hornetq.version}/jboss-messaging.sar"/>
+ <include name="hornetq-${jboss.hornetq.version}/jboss-hornetq.sar"/>
</patternset>
</unzip>
<antcall target="run-all-examples">
<param name="jboss.configuration" value="messaging-${jboss.hornetq.version}"/>
</antcall>
- <delete dir="./output/jboss-messaging-${jboss.hornetq.version}"/>
+ <delete dir="./output/hornetq-${jboss.hornetq.version}"/>
</target>
<target name="old-client-compatibility-test" depends="check-jboss-availability">
<echo message="Checking current server's compatibility with a ${jboss.hornetq.version} client"/>
- <unzip src="${jboss.compatibility.home}/../jboss-messaging-${jboss.hornetq.version}.zip" dest="./output">
+ <unzip src="${jboss.compatibility.home}/../hornetq-${jboss.hornetq.version}.zip" dest="./output">
<patternset>
- <include name="jboss-messaging-${jboss.hornetq.version}/jboss-messaging-client.jar"/>
+ <include name="hornetq-${jboss.hornetq.version}/hornetq-client.jar"/>
</patternset>
</unzip>
<antcall target="run-all-examples">
- <param name="messaging.client.jar.path" value="${basedir}/output/jboss-messaging-${jboss.hornetq.version}"/>
+ <param name="hornetq.client.jar.path" value="${basedir}/output/hornetq-${jboss.hornetq.version}"/>
</antcall>
- <delete dir="./output/jboss-messaging-${jboss.hornetq.version}"/>
+ <delete dir="./output/hornetq-${jboss.hornetq.version}"/>
</target>
@@ -560,7 +560,7 @@
<antcall target="fail-on-serialization-debug-output"/>
<!-- record successful run -->
- <echo message="TEST_TYPE=${smoke.test.type} JBOSS_HOME=${jboss.home} JBOSS_CONFIGURATION=${jboss.configuration} CLIENT_VERSION=${jboss.hornetq.version} INSTALLATION_TYPE=${release.admin.target} SERVER_ARTIFACT_NAME=${messaging.server.artifact.name} EXAMPLE_NAME=${example.name} CLUSTERED=${clustered}${line.separator}"
+ <echo message="TEST_TYPE=${smoke.test.type} JBOSS_HOME=${jboss.home} JBOSS_CONFIGURATION=${jboss.configuration} CLIENT_VERSION=${jboss.hornetq.version} INSTALLATION_TYPE=${release.admin.target} SERVER_ARTIFACT_NAME=${hornetq.server.artifact.name} EXAMPLE_NAME=${example.name} CLUSTERED=${clustered}${line.separator}"
file="./output/smoke.log" append="yes"/>
</target>
@@ -587,7 +587,7 @@
</antcall>
<!-- record successful run -->
- <echo message="TEST_TYPE=${smoke.test.type} JBOSS_HOME=${jboss.home} JBOSS_CONFIGURATION=${jboss.configuration}-node0 CLIENT_VERSION=${jboss.hornetq.version} INSTALLATION_TYPE=${release.admin.target} SERVER_ARTIFACT_NAME=${messaging.server.artifact.name} EXAMPLE_NAME=${example.name} CLUSTERED=true${line.separator}"
+ <echo message="TEST_TYPE=${smoke.test.type} JBOSS_HOME=${jboss.home} JBOSS_CONFIGURATION=${jboss.configuration}-node0 CLIENT_VERSION=${jboss.hornetq.version} INSTALLATION_TYPE=${release.admin.target} SERVER_ARTIFACT_NAME=${hornetq.server.artifact.name} EXAMPLE_NAME=${example.name} CLUSTERED=true${line.separator}"
file="./output/smoke.log" append="yes"/>
</target>
Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java 2009-08-20 18:06:54 UTC (rev 7844)
@@ -47,9 +47,9 @@
{
super.setUp();
- keyStorePath = "messaging.keystore";
+ keyStorePath = "hornetq.keystore";
keyStorePassword = "secureexample";
- trustStorePath = "messaging.truststore";
+ trustStorePath = "hornetq.truststore";
trustStorePassword = keyStorePassword;
}
@@ -97,7 +97,7 @@
return;
}
- SSLSupport.createServerContext("config/messaging.keystore",
+ SSLSupport.createServerContext("config/hornetq.keystore",
keyStorePassword, trustStorePath, trustStorePassword);
}
15 years, 4 months
- 1
- 0
JBoss hornetq SVN: r7843 - trunk.
by do-not-reply＠jboss.org
Author: timfox
Date: 2009-08-20 13:49:04 -0400 (Thu, 20 Aug 2009)
New Revision: 7843
Modified:
trunk/build-hornetq.xml
Log:
correct build-hornetq.xml
Modified: trunk/build-hornetq.xml
===================================================================
--- trunk/build-hornetq.xml 2009-08-20 17:45:57 UTC (rev 7842)
+++ trunk/build-hornetq.xml 2009-08-20 17:49:04 UTC (rev 7843)
@@ -16,7 +16,7 @@
~ permissions and limitations under the License.
-->
-<project default="jar" name="The HornetQ Project">
+<project default="unit-tests" name="The HornetQ Project">
<!-- ======================================================================================== -->
<!-- javac + junit properties -->
15 years, 4 months
- 1
- 0