11:56 a.m.
Author: timfox
Date: 2010-01-07 12:56:22 -0500 (Thu, 07 Jan 2010)
New Revision: 8773
Modified:
trunk/docs/user-manual/en/appserver-integration.xml
trunk/docs/user-manual/en/configuring-transports.xml
trunk/docs/user-manual/en/perf-tuning.xml
trunk/examples/core/microcontainer/server0/hornetq-configuration.xml
trunk/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml
trunk/examples/core/perf/server0/hornetq-configuration.xml
trunk/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml
trunk/examples/javaee/jca-config/readme.html
trunk/examples/javaee/jca-config/server/hornetq-configuration.xml
trunk/examples/javaee/jca-config/server2/hornetq-configuration.xml
trunk/examples/javaee/jms-bridge/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml
trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml
trunk/examples/javaee/servlet-ssl/server/hornetq-configuration.xml
trunk/examples/javaee/servlet-transport/server/hornetq-configuration.xml
trunk/examples/javaee/xarecovery/server/hornetq-configuration.xml
trunk/examples/jms/http-transport/readme.html
trunk/examples/jms/http-transport/server0/hornetq-configuration.xml
trunk/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml
trunk/examples/jms/perf/server0/hornetq-configuration.xml
trunk/examples/jms/ssl-enabled/readme.html
trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml
trunk/examples/soak/normal/server0/hornetq-configuration.xml
trunk/src/config/jboss-as/clustered/hornetq-configuration.xml
trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml
trunk/src/config/ra.xml
trunk/src/main/org/hornetq/core/remoting/impl/invm/TransportConstants.java
trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java
trunk/tests/jms-tests/config/hornetq-configuration.xml
trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/HornetQXAResourceRecoveryTest.java
Log:
made remoting constant names less ugly
Modified: trunk/docs/user-manual/en/appserver-integration.xml
===================================================================
--- trunk/docs/user-manual/en/appserver-integration.xml 2010-01-07 17:32:07 UTC (rev
8772)
+++ trunk/docs/user-manual/en/appserver-integration.xml 2010-01-07 17:56:22 UTC (rev
8773)
@@ -299,7 +299,7 @@
<description>The transport configuration. These values must be in the
form of key=val;key=val;</description>
<config-property-name>ConnectionParameters</config-property-name>
<config-property-type>java.lang.String</config-property-type>
- <config-property-value>serverid=0</config-property-value>
+ <config-property-value>server-id=0</config-property-value>
</config-property>
<outbound-resourceadapter>
Modified: trunk/docs/user-manual/en/configuring-transports.xml
===================================================================
--- trunk/docs/user-manual/en/configuring-transports.xml 2010-01-07 17:32:07 UTC (rev
8772)
+++ trunk/docs/user-manual/en/configuring-transports.xml 2010-01-07 17:56:22 UTC (rev
8773)
@@ -193,7 +193,7 @@
can be used to configure Netty for simple TCP:</para>
<itemizedlist>
<listitem>
- <para><literal>usenio</literal>. If this is
<literal>true</literal> then Java
+ <para><literal>use-nio</literal>. If this is
<literal>true</literal> then Java
non blocking NIO will be used. If set to
<literal>false</literal> than old
blocking Java IO will be used.</para>
<para>We highly recommend that you use non blocking Java NIO.
Java NIO does not
@@ -227,13 +227,13 @@
default value for this property is
<literal>5445</literal>.</para>
</listitem>
<listitem>
- <para><literal>tcpnodelay</literal>. If this is
<literal>true</literal> then
+ <para><literal>tcp-no-delay</literal>. If this is
<literal>true</literal> then
<ulink
url="http://en.wikipedia.org/wiki/Nagle's_algorithm">Nag...
algorithm</ulink> will be enabled. The default value
for this property
is <literal>true</literal>.</para>
</listitem>
<listitem>
- <para><literal>tcpsendbuffersize</literal>. This
parameter determines the size
+ <para><literal>tcp-send-buffer-size</literal>. This
parameter determines the size
of the TCP send buffer in bytes. The default value for this
property is
<literal>32768</literal> bytes
(32KiB).</para>
<para>TCP buffer sizes should be tuned according to the
bandwidth and latency of
@@ -250,7 +250,7 @@
defaults.</para>
</listitem>
<listitem>
- <para><literal>tcpreceivebuffersize</literal>. This
parameter determines the
+ <para><literal>tcp-receive-buffer-size</literal>.
This parameter determines the
size of the TCP receive buffer in bytes. The default value for
this property
is <literal>32768</literal> bytes
(32KiB).</para>
</listitem>
@@ -265,23 +265,23 @@
additional properties:</para>
<itemizedlist>
<listitem>
- <para><literal>sslenabled</literal>. Must be
<literal>true</literal> to enable
+ <para><literal>ssl-enabled</literal>. Must be
<literal>true</literal> to enable
SSL.</para>
</listitem>
<listitem>
- <para><literal>keystorepath</literal>. This is the
path to the SSL key store on
+ <para><literal>key-store-path</literal>. This is
the path to the SSL key store on
the client which holds the client certificates.</para>
</listitem>
<listitem>
- <para><literal>keystorepassword</literal>. This is
the password for the client
+ <para><literal>key-store-password</literal>. This
is the password for the client
certificate key store on the client.</para>
</listitem>
<listitem>
- <para><literal>truststorepath</literal>. This is
the path to the trusted client
+ <para><literal>trust-store-path</literal>. This is
the path to the trusted client
certificate store on the server.</para>
</listitem>
<listitem>
- <para><literal>truststorepassword</literal>. This
is the password to the trusted
+ <para><literal>trust-store-password</literal>. This
is the password to the trusted
client certificate store on the server.</para>
</listitem>
</itemizedlist>
@@ -295,27 +295,27 @@
properties:</para>
<itemizedlist>
<listitem>
- <para><literal>httpenabled</literal>. Must be
<literal>true</literal> to enable
+ <para><literal>http-enabled</literal>. Must be
<literal>true</literal> to enable
HTTP.</para>
</listitem>
<listitem>
- <para><literal>httpclientidletime</literal>. How
long a client can be idle
+ <para><literal>http-client-idle-time</literal>. How
long a client can be idle
before sending an empty http request to keep the connection
alive</para>
</listitem>
<listitem>
- <para><literal>httpclientidlescanperiod</literal>.
How often, in milliseconds,
+
<para><literal>http-client-idle-scan-period</literal>. How often, in
milliseconds,
to scan for idle clients</para>
</listitem>
<listitem>
- <para><literal>httpresponsetime</literal>. How long
the server can wait before
+ <para><literal>http-response-time</literal>. How
long the server can wait before
sending an empty http response to keep the connection
alive</para>
</listitem>
<listitem>
- <para><literal>httpserverscanperiod</literal>. How
often, in milliseconds, to
+ <para><literal>http-server-scan-period</literal>.
How often, in milliseconds, to
scan for clients needing responses</para>
</listitem>
<listitem>
- <para><literal>httprequiressessionid</literal>. If
true the client will wait
+ <para><literal>http-requires-session-id</literal>.
If true the client will wait
after the first call to receive a session id. Used the http
connector is
connecting to servlet acceptor (not recommended) </para>
</listitem>
@@ -375,7 +375,7 @@
<factory-class>
org.hornetq.integration.transports.netty.NettyAcceptorFactory
</factory-class>
- <param key="useinvm" value="true"/>
+ <param key="use-invm" value="true"/>
<param key="host" value="org.hornetq"/>
</acceptor>
@@ -393,8 +393,8 @@
</factory-class>
<param key="host" value="localhost"/>
<param key="port" value="8080"/>
- <param key="useservlet" value="true"/>
- <param key="servletpath"
value="/messaging/HornetQServlet"/>
+ <param key="use-servlet" value="true"/>
+ <param key="servlet-path"
value="/messaging/HornetQServlet"/>
</connector>
</connectors></programlisting>
@@ -409,7 +409,7 @@
</listitem>
</itemizedlist>
<para>The servlet pattern configured in the
<literal>web.xml</literal> is the path of
- the URL that is used. The connector param
<literal>servletpath</literal> on the
+ the URL that is used. The connector param
<literal>servlet-path</literal> on the
connector config must match this using the application context of the web
app if
there is one.</para>
<para>Its also possible to use the servlet transport over SSL. simply
add the following
@@ -418,11 +418,11 @@
<factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
<param key="host" value="localhost"/>
<param key="port" value="8443"/>
- <param key="useservlet" value="true"/>
- <param key="servletpath"
value="/messaging/HornetQServlet"/>
- <param key="sslenabled" value="true"/>
- <param key="keystorepath" value="path to a
keystoree"/>
- <param key="keystorepassword" value="keystore
password"/>
+ <param key="use-servlet" value="true"/>
+ <param key="servlet-path"
value="/messaging/HornetQServlet"/>
+ <param key="ssl-enabled" value="true"/>
+ <param key="key-store-path" value="path to a
keystoree"/>
+ <param key="key-store-password" value="keystore
password"/>
</connector>
</programlisting></para>
<para>You will also have to configure the Application server to use a
KeyStore. Edit the
Modified: trunk/docs/user-manual/en/perf-tuning.xml
===================================================================
--- trunk/docs/user-manual/en/perf-tuning.xml 2010-01-07 17:32:07 UTC (rev 8772)
+++ trunk/docs/user-manual/en/perf-tuning.xml 2010-01-07 17:56:22 UTC (rev 8773)
@@ -182,7 +182,7 @@
<para>Enable <ulink
url="http://en.wikipedia.org/wiki/Nagle's_algorithm">Nag...
algorithm</ulink>. If you are sending many small messages,
such that more
than one can fit in a single IP packet thus providing better
performance. This
- is done by setting <literal>tcpnodelay</literal> to false
with the Netty
+ is done by setting <literal>tcp-no-delay</literal> to
false with the Netty
transports. See <xref
linkend="configuring-transports"/> for more information on
this. </para>
<para>Enabling Nagle's algorithm can make a very big difference
in performance and
Modified: trunk/examples/core/microcontainer/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/core/microcontainer/server0/hornetq-configuration.xml 2010-01-07
17:32:07 UTC (rev 8772)
+++ trunk/examples/core/microcontainer/server0/hornetq-configuration.xml 2010-01-07
17:56:22 UTC (rev 8773)
@@ -7,9 +7,9 @@
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="tcpnodelay" value="false"/>
- <param key="tcpsendbuffersize" value="1048576"/>
- <param key="tcpreceivebuffersize" value="1048576"/>
+ <param key="tcp-no-delay" value="false"/>
+ <param key="tcp-send-buffer-size" value="1048576"/>
+ <param key="tcp-receive-buffer-size"
value="1048576"/>
</acceptor>
</acceptors>
Modified: trunk/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml
===================================================================
--- trunk/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml 2010-01-07
17:32:07 UTC (rev 8772)
+++ trunk/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml 2010-01-07
17:56:22 UTC (rev 8773)
@@ -7,9 +7,9 @@
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="tcpnodelay" value="false"/>
- <param key="tcpsendbuffersize" value="1048576"/>
- <param key="tcpreceivebuffersize" value="1048576"/>
+ <param key="tcp-no-delay" value="false"/>
+ <param key="tcp-send-buffer-size" value="1048576"/>
+ <param key="tcp-receive-buffer-size"
value="1048576"/>
<param key="host" value="172.16.8.10"/>
</acceptor>
</acceptors>
Modified: trunk/examples/core/perf/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/core/perf/server0/hornetq-configuration.xml 2010-01-07 17:32:07 UTC
(rev 8772)
+++ trunk/examples/core/perf/server0/hornetq-configuration.xml 2010-01-07 17:56:22 UTC
(rev 8773)
@@ -7,9 +7,9 @@
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="tcpnodelay" value="false"/>
- <param key="tcpsendbuffersize" value="1048576"/>
- <param key="tcpreceivebuffersize" value="1048576"/>
+ <param key="tcp-no-delay" value="false"/>
+ <param key="tcp-send-buffer-size" value="1048576"/>
+ <param key="tcp-receive-buffer-size"
value="1048576"/>
</acceptor>
</acceptors>
Modified: trunk/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml 2010-01-07
17:32:07 UTC (rev 8772)
+++ trunk/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml 2010-01-07
17:56:22 UTC (rev 8773)
@@ -27,7 +27,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified: trunk/examples/javaee/jca-config/readme.html
===================================================================
--- trunk/examples/javaee/jca-config/readme.html 2010-01-07 17:32:07 UTC (rev 8772)
+++ trunk/examples/javaee/jca-config/readme.html 2010-01-07 17:56:22 UTC (rev 8773)
@@ -105,7 +105,7 @@
<description>The transport configuration. These values must be in
the form of key=val;key=val;</description>
<config-property-name>ConnectionParameters</config-property-name>
<config-property-type>java.lang.String</config-property-type>
-
<config-property-value>serverid=0</config-property-value>
+
<config-property-value>server-id=0</config-property-value>
</config-property>
<config-property>
<description>Use XA methods to obtain
connections?</description>
Modified: trunk/examples/javaee/jca-config/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/jca-config/server/hornetq-configuration.xml 2010-01-07 17:32:07
UTC (rev 8772)
+++ trunk/examples/javaee/jca-config/server/hornetq-configuration.xml 2010-01-07 17:56:22
UTC (rev 8773)
@@ -27,7 +27,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified: trunk/examples/javaee/jca-config/server2/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/jca-config/server2/hornetq-configuration.xml 2010-01-07 17:32:07
UTC (rev 8772)
+++ trunk/examples/javaee/jca-config/server2/hornetq-configuration.xml 2010-01-07 17:56:22
UTC (rev 8773)
@@ -35,7 +35,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified: trunk/examples/javaee/jms-bridge/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/jms-bridge/server/hornetq-configuration.xml 2010-01-07 17:32:07
UTC (rev 8772)
+++ trunk/examples/javaee/jms-bridge/server/hornetq-configuration.xml 2010-01-07 17:56:22
UTC (rev 8773)
@@ -19,7 +19,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified: trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml 2010-01-07 17:32:07 UTC
(rev 8772)
+++ trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml 2010-01-07 17:56:22 UTC
(rev 8773)
@@ -29,7 +29,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified: trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml
===================================================================
---
trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml 2010-01-07
17:32:07 UTC (rev 8772)
+++
trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml 2010-01-07
17:56:22 UTC (rev 8773)
@@ -29,7 +29,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified: trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml 2010-01-07
17:32:07 UTC (rev 8772)
+++ trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml 2010-01-07
17:56:22 UTC (rev 8773)
@@ -29,7 +29,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified: trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml
===================================================================
---
trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml 2010-01-07
17:32:07 UTC (rev 8772)
+++
trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml 2010-01-07
17:56:22 UTC (rev 8773)
@@ -29,7 +29,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified: trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml 2010-01-07
17:32:07 UTC (rev 8772)
+++ trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml 2010-01-07
17:56:22 UTC (rev 8773)
@@ -29,7 +29,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified: trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml 2010-01-07
17:32:07 UTC (rev 8772)
+++ trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml 2010-01-07
17:56:22 UTC (rev 8773)
@@ -29,7 +29,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified: trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml 2010-01-07 17:32:07
UTC (rev 8772)
+++ trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml 2010-01-07 17:56:22
UTC (rev 8773)
@@ -29,7 +29,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified: trunk/examples/javaee/servlet-ssl/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/servlet-ssl/server/hornetq-configuration.xml 2010-01-07 17:32:07
UTC (rev 8772)
+++ trunk/examples/javaee/servlet-ssl/server/hornetq-configuration.xml 2010-01-07 17:56:22
UTC (rev 8773)
@@ -16,11 +16,11 @@
<factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
<param key="host" value="localhost"/>
<param key="port" value="8443"/>
- <param key="useservlet" value="true"/>
- <param key="servletpath"
value="/hornetq/HornetQServlet"/>
- <param key="sslenabled" value="true"/>
- <param key="keystorepath"
value="server/hornetq.example.keystore"/>
- <param key="keystorepassword"
value="hornetqexample"/>
+ <param key="use-servlet" value="true"/>
+ <param key="servlet-path"
value="/hornetq/HornetQServlet"/>
+ <param key="ssl-enabled" value="true"/>
+ <param key="key-store-path"
value="server/hornetq.example.keystore"/>
+ <param key="key-store-password"
value="hornetqexample"/>
</connector>
</connectors>
@@ -29,13 +29,13 @@
<acceptor name="netty-servlet">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="useinvm" value="true"/>
+ <param key="use-invm" value="true"/>
<param key="host" value="org.hornetq"/>
</acceptor>
<acceptor name="netty-invm">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="useinvm" value="true"/>
+ <param key="use-invm" value="true"/>
<param key="host" value="org.hornetq"/>
</acceptor>
Modified: trunk/examples/javaee/servlet-transport/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/servlet-transport/server/hornetq-configuration.xml 2010-01-07
17:32:07 UTC (rev 8772)
+++ trunk/examples/javaee/servlet-transport/server/hornetq-configuration.xml 2010-01-07
17:56:22 UTC (rev 8773)
@@ -16,8 +16,8 @@
<factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
<param key="host" value="localhost"/>
<param key="port" value="8080"/>
- <param key="useservlet" value="true"/>
- <param key="servletpath"
value="/messaging/HornetQServlet"/>
+ <param key="use-servlet" value="true"/>
+ <param key="servlet-path"
value="/messaging/HornetQServlet"/>
</connector>
</connectors>
@@ -26,13 +26,13 @@
<acceptor name="netty-servlet">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="useinvm" value="true"/>
+ <param key="use-invm" value="true"/>
<param key="host" value="org.hornetq"/>
</acceptor>
<acceptor name="netty-invm">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="useinvm" value="true"/>
+ <param key="use-invm" value="true"/>
<param key="host" value="org.hornetq"/>
</acceptor>
Modified: trunk/examples/javaee/xarecovery/server/hornetq-configuration.xml
===================================================================
--- trunk/examples/javaee/xarecovery/server/hornetq-configuration.xml 2010-01-07 17:32:07
UTC (rev 8772)
+++ trunk/examples/javaee/xarecovery/server/hornetq-configuration.xml 2010-01-07 17:56:22
UTC (rev 8773)
@@ -27,7 +27,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified: trunk/examples/jms/http-transport/readme.html
===================================================================
--- trunk/examples/jms/http-transport/readme.html 2010-01-07 17:32:07 UTC (rev 8772)
+++ trunk/examples/jms/http-transport/readme.html 2010-01-07 17:56:22 UTC (rev 8773)
@@ -20,7 +20,7 @@
<code>
<connector name="netty-connector">
<factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="hornetq.remoting.netty.httpenabled"
value="true" type="Boolean"/>
+ <param key="hornetq.remoting.netty.http-enabled"
value="true" type="Boolean"/>
<param key="hornetq.remoting.netty.port"
value="8080" type="Integer"/>
</connector>
@@ -28,7 +28,7 @@
<acceptor name="netty-acceptor">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="hornetq.remoting.netty.httpenabled"
value="true" type="Boolean"/>
+ <param key="hornetq.remoting.netty.http-enabled"
value="true" type="Boolean"/>
<param key="hornetq.remoting.netty.port"
value="8080" type="Integer"/>
</acceptor>
</code>
Modified: trunk/examples/jms/http-transport/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/hornetq-configuration.xml 2010-01-07
17:32:07 UTC (rev 8772)
+++ trunk/examples/jms/http-transport/server0/hornetq-configuration.xml 2010-01-07
17:56:22 UTC (rev 8773)
@@ -6,7 +6,7 @@
<connectors>
<connector name="netty-connector">
<factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="httpenabled" value="true"/>
+ <param key="http-enabled" value="true"/>
<param key="port" value="8080"/>
</connector>
</connectors>
@@ -16,7 +16,7 @@
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="httpenabled" value="true"/>
+ <param key="http-enabled" value="true"/>
<param key="port" value="8080"/>
</acceptor>
</acceptors>
Modified: trunk/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml
===================================================================
--- trunk/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml 2010-01-07
17:32:07 UTC (rev 8772)
+++ trunk/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml 2010-01-07
17:56:22 UTC (rev 8773)
@@ -7,9 +7,9 @@
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="tcpnodelay" value="false"/>
- <param key="tcpsendbuffersize" value="1048576"/>
- <param key="tcpreceivebuffersize" value="1048576"/>
+ <param key="tcp-no-delay" value="false"/>
+ <param key="tcp-send-buffer-size" value="1048576"/>
+ <param key="tcp-receive-buffer-size"
value="1048576"/>
<param key="host" value="172.16.8.10"/>
</acceptor>
</acceptors>
Modified: trunk/examples/jms/perf/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/perf/server0/hornetq-configuration.xml 2010-01-07 17:32:07 UTC (rev
8772)
+++ trunk/examples/jms/perf/server0/hornetq-configuration.xml 2010-01-07 17:56:22 UTC (rev
8773)
@@ -5,9 +5,9 @@
<connectors>
<connector name="netty-connector">
<factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="tcpnodelay" value="false"/>
- <param key="tcpsendbuffersize" value="1048576"/>
- <param key="tcpreceivebuffersize" value="1048576"/>
+ <param key="tcp-no-delay" value="false"/>
+ <param key="tcp-send-buffer-size" value="1048576"/>
+ <param key="tcp-receive-buffer-size"
value="1048576"/>
</connector>
</connectors>
@@ -15,9 +15,9 @@
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="tcpnodelay" value="false"/>
- <param key="tcpsendbuffersize" value="1048576"/>
- <param key="tcpreceivebuffersize" value="1048576"/>
+ <param key="tcp-no-delay" value="false"/>
+ <param key="tcp-send-buffer-size" value="1048576"/>
+ <param key="tcp-receive-buffer-size"
value="1048576"/>
</acceptor>
</acceptors>
Modified: trunk/examples/jms/ssl-enabled/readme.html
===================================================================
--- trunk/examples/jms/ssl-enabled/readme.html 2010-01-07 17:32:07 UTC (rev 8772)
+++ trunk/examples/jms/ssl-enabled/readme.html 2010-01-07 17:56:22 UTC (rev 8773)
@@ -22,9 +22,9 @@
<factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
<param key="hornetq.remoting.netty.host"
value="localhost" type="String"/>
<param key="hornetq.remoting.netty.port"
value="5500" type="Integer"/>
- <param key="hornetq.remoting.netty.sslenabled"
value="true" type="Boolean"/>
- <param key="hornetq.remoting.netty.keystorepath"
value="server0/hornetq.example.keystore"
type="String"/>
- <param key="hornetq.remoting.netty.keystorepassword"
value="hornetqexample" type="String"/>
+ <param key="hornetq.remoting.netty.ssl-enabled"
value="true" type="Boolean"/>
+ <param key="hornetq.remoting.netty.key-store-path"
value="server0/hornetq.example.keystore"
type="String"/>
+ <param key="hornetq.remoting.netty.key-store-password"
value="hornetqexample" type="String"/>
</connector>
<!-- Acceptor -->
@@ -33,11 +33,11 @@
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
<param key="hornetq.remoting.netty.host"
value="localhost" type="String"/>
<param key="hornetq.remoting.netty.port"
value="5500" type="Integer"/>
- <param key="hornetq.remoting.netty.sslenabled"
value="true" type="Boolean"/>
- <param key="hornetq.remoting.netty.keystorepath"
value="hornetq.example.keystore"
type="String"/>
- <param key="hornetq.remoting.netty.keystorepassword"
value="hornetqexample" type="String"/>
- <param key="hornetq.remoting.netty.truststorepath"
value="hornetq.example.truststore"
type="String"/>
- <param key="hornetq.remoting.netty.truststorepassword"
value="hornetqexample" type="String"/>
+ <param key="hornetq.remoting.netty.ssl-enabled"
value="true" type="Boolean"/>
+ <param key="hornetq.remoting.netty.key-store-path"
value="hornetq.example.keystore"
type="String"/>
+ <param key="hornetq.remoting.netty.key-store-password"
value="hornetqexample" type="String"/>
+ <param key="hornetq.remoting.netty.trust-store-path"
value="hornetq.example.truststore"
type="String"/>
+ <param
key="hornetq.remoting.netty.trust-store-password"
value="hornetqexample" type="String"/>
</acceptor>
</code>
Modified: trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml 2010-01-07 17:32:07
UTC (rev 8772)
+++ trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml 2010-01-07 17:56:22
UTC (rev 8773)
@@ -9,9 +9,9 @@
<factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
<param key="host" value="localhost"/>
<param key="port" value="5500"/>
- <param key="sslenabled" value="true"/>
- <param key="keystorepath"
value="server0/hornetq.example.keystore"/>
- <param key="keystorepassword"
value="hornetqexample"/>
+ <param key="ssl-enabled" value="true"/>
+ <param key="key-store-path"
value="server0/hornetq.example.keystore"/>
+ <param key="key-store-password"
value="hornetqexample"/>
</connector>
</connectors>
@@ -21,11 +21,11 @@
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="localhost"/>
<param key="port" value="5500"/>
- <param key="sslenabled" value="true"/>
- <param key="keystorepath"
value="hornetq.example.keystore"/>
- <param key="keystorepassword"
value="hornetqexample"/>
- <param key="truststorepath"
value="hornetq.example.truststore"/>
- <param key="truststorepassword"
value="hornetqexample"/>
+ <param key="ssl-enabled" value="true"/>
+ <param key="key-store-path"
value="hornetq.example.keystore"/>
+ <param key="key-store-password"
value="hornetqexample"/>
+ <param key="trust-store-path"
value="hornetq.example.truststore"/>
+ <param key="trust-store-password"
value="hornetqexample"/>
</acceptor>
</acceptors>
Modified: trunk/examples/soak/normal/server0/hornetq-configuration.xml
===================================================================
--- trunk/examples/soak/normal/server0/hornetq-configuration.xml 2010-01-07 17:32:07 UTC
(rev 8772)
+++ trunk/examples/soak/normal/server0/hornetq-configuration.xml 2010-01-07 17:56:22 UTC
(rev 8773)
@@ -5,9 +5,9 @@
<connectors>
<connector name="netty-connector">
<factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="tcpnodelay" value="false"/>
- <param key="tcpsendbuffersize" value="1048576"/>
- <param key="tcpreceivebuffersize" value="1048576"/>
+ <param key="tcp-no-delay" value="false"/>
+ <param key="tcp-send-buffer-size" value="1048576"/>
+ <param key="tcp-receive-buffer-size"
value="1048576"/>
<param key="host" value="localhost"/>
</connector>
</connectors>
@@ -16,9 +16,9 @@
<acceptors>
<acceptor name="netty-acceptor">
<factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="tcpnodelay" value="false"/>
- <param key="tcpsendbuffersize" value="1048576"/>
- <param key="tcpreceivebuffersize" value="1048576"/>
+ <param key="tcp-no-delay" value="false"/>
+ <param key="tcp-send-buffer-size" value="1048576"/>
+ <param key="tcp-receive-buffer-size"
value="1048576"/>
<param key="host" value="localhost"/>
</acceptor>
</acceptors>
Modified: trunk/src/config/jboss-as/clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-01-07 17:32:07 UTC
(rev 8772)
+++ trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2010-01-07 17:56:22 UTC
(rev 8773)
@@ -36,7 +36,7 @@
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
</acceptors>
Modified: trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-01-07 17:32:07
UTC (rev 8772)
+++ trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2010-01-07 17:56:22
UTC (rev 8773)
@@ -34,7 +34,7 @@
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
</acceptors>
Modified: trunk/src/config/ra.xml
===================================================================
--- trunk/src/config/ra.xml 2010-01-07 17:32:07 UTC (rev 8772)
+++ trunk/src/config/ra.xml 2010-01-07 17:56:22 UTC (rev 8773)
@@ -43,7 +43,7 @@
<description>The transport configuration. These values must be in the form
of key=val;key=val;</description>
<config-property-name>ConnectionParameters</config-property-name>
<config-property-type>java.lang.String</config-property-type>
- <config-property-value>serverid=0</config-property-value>
+ <config-property-value>server-id=0</config-property-value>
</config-property>
<config-property>
<description>Use XA?</description>
Modified: trunk/src/main/org/hornetq/core/remoting/impl/invm/TransportConstants.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/invm/TransportConstants.java 2010-01-07
17:32:07 UTC (rev 8772)
+++ trunk/src/main/org/hornetq/core/remoting/impl/invm/TransportConstants.java 2010-01-07
17:56:22 UTC (rev 8773)
@@ -24,7 +24,7 @@
*/
public class TransportConstants
{
- public static final String SERVER_ID_PROP_NAME = "serverid";
+ public static final String SERVER_ID_PROP_NAME = "server-id";
public static final Set<String> ALLOWABLE_CONNECTOR_KEYS;
Modified: trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java
===================================================================
---
trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java 2010-01-07
17:32:07 UTC (rev 8772)
+++
trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java 2010-01-07
17:56:22 UTC (rev 8773)
@@ -24,45 +24,45 @@
*/
public class TransportConstants
{
- public static final String SSL_ENABLED_PROP_NAME = "sslenabled";
+ public static final String SSL_ENABLED_PROP_NAME = "ssl-enabled";
- public static final String HTTP_ENABLED_PROP_NAME = "httpenabled";
+ public static final String HTTP_ENABLED_PROP_NAME = "http-enabled";
- public static final String HTTP_CLIENT_IDLE_PROP_NAME =
"httpclientidletime";
+ public static final String HTTP_CLIENT_IDLE_PROP_NAME =
"http-client-idle-time";
- public static final String HTTP_CLIENT_IDLE_SCAN_PERIOD =
"httpclientidlescanperiod";
+ public static final String HTTP_CLIENT_IDLE_SCAN_PERIOD =
"http-client-idle-scan-period";
- public static final String HTTP_RESPONSE_TIME_PROP_NAME =
"httpresponsetime";
+ public static final String HTTP_RESPONSE_TIME_PROP_NAME =
"http-response-time";
- public static final String HTTP_SERVER_SCAN_PERIOD_PROP_NAME =
"httpserverscanperiod";
+ public static final String HTTP_SERVER_SCAN_PERIOD_PROP_NAME =
"http-server-scan-period";
- public static final String HTTP_REQUIRES_SESSION_ID =
"httprequiressessionid";
+ public static final String HTTP_REQUIRES_SESSION_ID =
"http-requires-session-id";
- public static final String USE_SERVLET_PROP_NAME = "useservlet";
+ public static final String USE_SERVLET_PROP_NAME = "use-servlet";
- public static final String SERVLET_PATH = "servletpath";
+ public static final String SERVLET_PATH = "servlet-path";
- public static final String USE_NIO_PROP_NAME = "usenio";
+ public static final String USE_NIO_PROP_NAME = "use-nio";
- public static final String USE_INVM_PROP_NAME = "useinvm";
+ public static final String USE_INVM_PROP_NAME = "use-invm";
public static final String HOST_PROP_NAME = "host";
public static final String PORT_PROP_NAME = "port";
- public static final String KEYSTORE_PATH_PROP_NAME = "keystorepath";
+ public static final String KEYSTORE_PATH_PROP_NAME = "key-store-path";
- public static final String KEYSTORE_PASSWORD_PROP_NAME =
"keystorepassword";
+ public static final String KEYSTORE_PASSWORD_PROP_NAME =
"key-store-password";
- public static final String TRUSTSTORE_PATH_PROP_NAME = "truststorepath";
+ public static final String TRUSTSTORE_PATH_PROP_NAME = "trust-store-path";
- public static final String TRUSTSTORE_PASSWORD_PROP_NAME =
"truststorepassword";
+ public static final String TRUSTSTORE_PASSWORD_PROP_NAME =
"trust-store-password";
- public static final String TCP_NODELAY_PROPNAME = "tcpnodelay";
+ public static final String TCP_NODELAY_PROPNAME = "tcp-no-delay";
- public static final String TCP_SENDBUFFER_SIZE_PROPNAME =
"tcpsendbuffersize";
+ public static final String TCP_SENDBUFFER_SIZE_PROPNAME =
"tcp-send-buffer-size";
- public static final String TCP_RECEIVEBUFFER_SIZE_PROPNAME =
"tcpreceivebuffersize";
+ public static final String TCP_RECEIVEBUFFER_SIZE_PROPNAME =
"tcp-receive-buffer-size";
public static final boolean DEFAULT_SSL_ENABLED = false;
Modified: trunk/tests/jms-tests/config/hornetq-configuration.xml
===================================================================
--- trunk/tests/jms-tests/config/hornetq-configuration.xml 2010-01-07 17:32:07 UTC (rev
8772)
+++ trunk/tests/jms-tests/config/hornetq-configuration.xml 2010-01-07 17:56:22 UTC (rev
8773)
@@ -21,7 +21,7 @@
<!-- In VM acceptor -->
<acceptor name="in-vm">
<factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="serverid" value="0"/>
+ <param key="server-id" value="0"/>
</acceptor>
<!-- Netty TCP Acceptor -->
Modified:
trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/HornetQXAResourceRecoveryTest.java
===================================================================
---
trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/HornetQXAResourceRecoveryTest.java 2010-01-07
17:32:07 UTC (rev 8772)
+++
trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/HornetQXAResourceRecoveryTest.java 2010-01-07
17:56:22 UTC (rev 8773)
@@ -53,7 +53,7 @@
public void testConfigWithConnectorFactoryClassNameAndParamsWithoutUserCredentials()
throws Exception
{
- String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, , ,
serverid=99";
+ String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, , ,
server-id=99";
HornetQXAResourceRecovery.ConfigParser parser = new
HornetQXAResourceRecovery.ConfigParser(config);
Assert.assertEquals(InVMConnectorFactory.class.getName(),
parser.getConnectorFactoryClassName());
@@ -65,7 +65,7 @@
public void testConfigWithConnectorFactoryClassNameAndParamsAndUserCredentials()
throws Exception
{
- String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory,
foo, bar, serverid=99, key=val";
+ String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory,
foo, bar, server-id=99, key=val";
HornetQXAResourceRecovery.ConfigParser parser = new
HornetQXAResourceRecovery.ConfigParser(config);
Assert.assertEquals(InVMConnectorFactory.class.getName(),
parser.getConnectorFactoryClassName());