Author: jmesnil Date: 2009-11-02 10:04:10 -0500 (Mon, 02 Nov 2009) New Revision: 8181 Removed: trunk/examples/jms/symmetric-cluster/server0/KILL_ME trunk/examples/jms/symmetric-cluster/server2/KILL_ME Modified: trunk/docs/user-manual/en/appserver-integration.xml trunk/docs/user-manual/en/configuring-transports.xml trunk/docs/user-manual/en/ha.xml trunk/docs/user-manual/en/perf-tuning.xml trunk/docs/user-manual/en/using-server.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/server/hornetq-configuration.xml trunk/examples/javaee/jca-config/server2/hornetq-configuration.xml trunk/examples/javaee/jca-config/server2/jms-remote-ds.xml trunk/examples/javaee/jca-config/server2/ra.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/application-layer-failover/server0/hornetq-configuration.xml trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml trunk/examples/jms/automatic-failover/server0/hornetq-configuration.xml trunk/examples/jms/automatic-failover/server1/hornetq-configuration.xml trunk/examples/jms/bridge/server0/hornetq-configuration.xml trunk/examples/jms/bridge/server1/hornetq-configuration.xml trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml trunk/examples/jms/divert/server0/hornetq-configuration.xml trunk/examples/jms/divert/server1/hornetq-configuration.xml trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml trunk/examples/jms/http-transport/server0/hornetq-configuration.xml trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml trunk/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml trunk/examples/jms/perf/server0/hornetq-configuration.xml trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml trunk/examples/jms/reconnect-same-node/server0/hornetq-configuration.xml trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml trunk/examples/soak/normal/server0/hornetq-configuration.xml trunk/src/config/common/schema/hornetq-configuration.xsd trunk/src/config/jboss-as/clustered/hornetq-configuration.xml trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml trunk/src/config/ra.xml trunk/src/config/stand-alone/clustered/hornetq-configuration.xml trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml trunk/src/config/trunk/clustered/hornetq-configuration.xml trunk/src/config/trunk/non-clustered/hornetq-configuration.xml trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java trunk/src/main/org/hornetq/core/remoting/impl/invm/TransportConstants.java trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java trunk/src/main/org/hornetq/utils/XMLUtil.java trunk/tests/config/ConfigurationTest-full-config.xml trunk/tests/config/server-start-stop-backup-config1.xml trunk/tests/config/server-start-stop-live-config1.xml trunk/tests/jms-tests/config/hornetq-configuration.xml trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/HornetQXAResourceRecoveryTest.java Log: https://jira.jboss.org/jira/browse/HORNETQ-42: Simplify TransportConfiguration parameters * removed type attributes from transport configuration's <param> schema * simplified keys for netty & invm transport constants Modified: trunk/docs/user-manual/en/appserver-integration.xml =================================================================== --- trunk/docs/user-manual/en/appserver-integration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/docs/user-manual/en/appserver-integration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -299,7 +299,7 @@ &lt;description>The transport configuration. These values must be in the form of key=val;key=val;&lt;/description> &lt;config-property-name>ConnectionParameters&lt;/config-property-name> &lt;config-property-type>java.lang.String&lt;/config-property-type> - &lt;config-property-value>hornetq.remoting.invm.serverid=0&lt;/config-property-value> + &lt;config-property-value>serverid=0&lt;/config-property-value> &lt;/config-property> &lt;outbound-resourceadapter> @@ -600,7 +600,7 @@ org.hornetq.integration.transports.netty.NettyConnectorFactory &lt;/config-property> &lt;config-property name="ConnectionParameters" type="String"> - hornetq.remoting.netty.port=5445&lt;/config-property> + port=5445&lt;/config-property> &lt;max-pool-size>20&lt;/max-pool-size> &lt;/tx-connection-factory></programlisting> <para>In this example the connection factory will be bound to JNDI with the name @@ -1099,14 +1099,14 @@ <programlisting> &lt;acceptor name="netty"> &lt;factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory&lt;/factory-class> - &lt;param key="hornetq.remoting.netty.port" value="8888" type="Integer"/> + &lt;param key="port" value="8888"/> &lt;/acceptor> </programlisting> <para>the corresponding configuration in <literal <programlisting> &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" - value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, , , hornetq.remoting.netty.port=8888"/> + value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, , , port=8888"/> </programlisting> <note> <para>Note the additional commas to skip the user and password before connector @@ -1116,7 +1116,7 @@ configuration would have been:</para> <programlisting> &lt;property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" - value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, admin, adminpass, hornetq.remoting.netty.port=8888"/> + value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, admin, adminpass, port=8888"/> </programlisting> <para>Configuring HornetQ with an invm acceptor and configuring the Recovery Manager with an invm connector is the recommended way to enable XA Recovery.</para> Modified: trunk/docs/user-manual/en/configuring-transports.xml =================================================================== --- trunk/docs/user-manual/en/configuring-transports.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/docs/user-manual/en/configuring-transports.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -35,7 +35,7 @@ &lt;factory-class&gt; org.hornetq.integration.transports.netty.NettyAcceptorFactory &lt;/factory-class&gt; - &lt;param key="hornetq.remoting.netty.port" value="5446" type="Integer"/&gt; + &lt;param key="port" value="5446"/&gt; &lt;/acceptor&gt; &lt;/acceptors&gt; </programlisting> @@ -60,8 +60,6 @@ passed straight through to the underlying transport.</para> <para>Examples of key-value pairs for a particular transport would be, say, to configure the IP address to bind to, or the port to listen at.</para> - <para>Keys are always strings and values can be of type Long, Integer, String or - Boolean.</para> </section> <section id="understanding.connectors"> <title>Understanding Connectors</title> @@ -75,7 +73,7 @@ &lt;factory-class&gt; org.hornetq.integration.transports.netty.NettyConnectorFactory &lt;/factory-class&gt; - &lt;param key="hornetq.remoting.netty.port" value="5446" type="Integer"/&gt; + &lt;param key="port" value="5446"/&gt; &lt;/connector&gt; &lt;/connectors&gt; </programlisting> @@ -190,7 +188,7 @@ can be used to configure Netty for simple TCP:</para> <itemizedlist> <listitem> - <para><literal>hornetq.remoting.netty.usenio</literal>. If this is <literal + <para><literal>usenio</literal>. If this is <literal <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 @@ -200,7 +198,7 @@ <literal>true</literal>.</para> </listitem> <listitem> - <para><literal>hornetq.remoting.netty.host</literal>. This specified the host + <para><literal>host</literal>. This specified the host name or IP address to connect to (when configuring a connector) or to listen on (when configuring an acceptor). The default value for this property is <literal>localhost</literal>. When configuring acceptors, multiple hosts @@ -218,20 +216,20 @@ </note> </listitem> <listitem> - <para><literal>hornetq.remoting.netty.port</literal>. This specified the port to + <para><literal>port</literal>. This specified the port to connect to (when configuring a connector) or to listen on (when configuring an acceptor). The default value for this property is <literal </listitem> <listitem> - <para><literal>hornetq.remoting.netty.tcpnodelay</literal>. If this is <literal + <para><literal>tcpnodelay</literal>. If this is <literal 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>hornetq.remoting.netty.tcpsendbuffersize</literal>. This + <para><literal>tcpsendbuffersize</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 @@ -248,7 +246,7 @@ defaults.</para> </listitem> <listitem> - <para><literal>hornetq.remoting.netty.tcpreceivebuffersize</literal>. This + <para><literal>tcpreceivebuffersize</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> @@ -264,24 +262,24 @@ additional properties:</para> <itemizedlist> <listitem> - <para><literal>hornetq.remoting.netty.sslenabled</literal>. Must be <literal + <para><literal>sslenabled</literal>. Must be <literal </listitem> <listitem> - <para><literal>hornetq.remoting.netty.keystorepath</literal>. This is the path + <para><literal>keystorepath</literal>. This is the path to the SSL key store on the client which holds the client certificates.</para> </listitem> <listitem> - <para><literal>hornetq.remoting.netty.keystorepassword</literal>. This is the + <para><literal>keystorepassword</literal>. This is the password for the client certificate key store on the client.</para> </listitem> <listitem> - <para><literal>hornetq.remoting.netty.truststorepath</literal>. This is the path + <para><literal>truststorepath</literal>. This is the path to the trusted client certificate store on the server.</para> </listitem> <listitem> - <para><literal>hornetq.remoting.netty.truststorepassword</literal>. This is the + <para><literal>truststorepassword</literal>. This is the password to the trusted client certificate store on the server.</para> </listitem> </itemizedlist> @@ -295,29 +293,29 @@ properties:</para> <itemizedlist> <listitem> - <para><literal>hornetq.remoting.netty.httpenabled</literal>. Must be <literal + <para><literal>httpenabled</literal>. Must be <literal </listitem> <listitem> - <para><literal>hornetq.remoting.netty.httpclientidletime</literal>. How long a + <para><literal>httpclientidletime</literal>. How long a client can be idle before sending an empty http request to keep the connection alive</para> </listitem> <listitem> - <para><literal>hornetq.remoting.netty.httpclientidlescanperiod</literal>. How + <para><literal>httpclientidlescanperiod</literal>. How often, in milliseconds, to scan for idle clients</para> </listitem> <listitem> - <para><literal>hornetq.remoting.netty.httpresponsetime</literal>. How long the + <para><literal>httpresponsetime</literal>. How long the server can wait before sending an empty http response to keep the connection alive</para> </listitem> <listitem> - <para><literal>hornetq.remoting.netty.httpserverscanperiod</literal>. How often, + <para><literal>httpserverscanperiod</literal>. How often, in milliseconds, to scan for clients needing responses</para> </listitem> <listitem> - <para><literal>hornetq.remoting.netty.httprequiressessionid</literal>. If true + <para><literal>httprequiressessionid</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> @@ -377,8 +375,8 @@ &lt;factory-class> org.hornetq.integration.transports.netty.NettyAcceptorFactory &lt;/factory-class> - &lt;param key="hornetq.remoting.netty.useinvm" value="true" type="Boolean"/> - &lt;param key="hornetq.remoting.netty.host" value="org.hornetq" type="String"/> + &lt;param key="useinvm" value="true"/> + &lt;param key="host" value="org.hornetq"/> &lt;/acceptor> &lt;/acceptors> @@ -393,11 +391,10 @@ &lt;factory-class> org.hornetq.integration.transports.netty.NettyConnectorFactory &lt;/factory-class> - &lt;param key="hornetq.remoting.netty.host" value="localhost" type="String"/> - &lt;param key="hornetq.remoting.netty.port" value="8080" type="Integer"/> - &lt;param key="hornetq.remoting.netty.useservlet" value="true" type="Boolean"/> - &lt;param key="hornetq.remoting.netty.servletpath" - value="/messaging/HornetQServlet" type="String"/> + &lt;param key="host" value="localhost"/> + &lt;param key="port" value="8080"/> + &lt;param key="useservlet" value="true"/> + &lt;param key="servletpath" value="/messaging/HornetQServlet"/> &lt;/connector> &lt;/connectors></programlisting> @@ -408,24 +405,24 @@ <listitem> <para>endpoint - This is the name of the netty acceptor that the servlet will forward its packets too. You can see it matches the name of the <literal - >hornetq.remoting.netty.host</literal> param.</para> + >host</literal> param.</para> </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 - >hornetq.remoting.netty.servletpath</literal> on the connector config must match + >servletpath</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 configuration to the connector:<programlisting> &lt;connector name="netty-servlet"> &lt;factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory&lt;/factory-class> - &lt;param key="hornetq.remoting.netty.host" value="localhost" type="String"/> - &lt;param key="hornetq.remoting.netty.port" value="8443" type="Integer"/> - &lt;param key="hornetq.remoting.netty.useservlet" value="true" type="Boolean"/> - &lt;param key="hornetq.remoting.netty.servletpath" value="/messaging/HornetQServlet" type="String"/> - &lt;param key="hornetq.remoting.netty.sslenabled" value="true" type="Boolean"/> - &lt;param key="hornetq.remoting.netty.keystorepath" value="path to a keystoree" type="String"/> - &lt;param key="hornetq.remoting.netty.keystorepassword" value="keystore password" type="String"/> + &lt;param key="host" value="localhost"/> + &lt;param key="port" value="8443"/> + &lt;param key="useservlet" value="true"/> + &lt;param key="servletpath" value="/messaging/HornetQServlet"/> + &lt;param key="sslenabled" value="true"/> + &lt;param key="keystorepath" value="path to a keystoree"/> + &lt;param key="keystorepassword" value="keystore password"/> &lt;/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/ha.xml =================================================================== --- trunk/docs/user-manual/en/ha.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/docs/user-manual/en/ha.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -66,8 +66,8 @@ &lt;!-- backup server is located on host "192.168.0.11" and port "5445" --> &lt;connector name="backup-connector"> &lt;factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory&lt;/factory-class> - &lt;param key="hornetq.remoting.netty.host" value="192.168.0.11" type="String"/> - &lt;param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + &lt;param key="host" value="192.168.0.11"/> + &lt;param key="port" value="5445"/> &lt;/connector> &lt;/connectors></programlisting> <para>Secondly, on the backup server, we flag the server as a backup and make sure it has an acceptor that the live server can connect to:</para> @@ -77,8 +77,8 @@ &lt;acceptors> &lt;acceptor name="acceptor"> &lt;factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory&lt;/factory-class> - &lt;param key="hornetq.remoting.netty.host" value="192.168.0.11" type="String"/> - &lt;param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + &lt;param key="host" value="192.168.0.11"/> + &lt;param key="port" value="5445"/> &lt;/acceptor> &lt;/acceptors> </programlisting> Modified: trunk/docs/user-manual/en/perf-tuning.xml =================================================================== --- trunk/docs/user-manual/en/perf-tuning.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/docs/user-manual/en/perf-tuning.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -154,7 +154,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>hornetq.remoting.netty.tcpnodelay</literal> to false + is done by setting <literal>tcpnodelay</literal> to false with the Netty transports. See <xref linkend="configuring-transports"/> for more information on this. </para> </listitem> Modified: trunk/docs/user-manual/en/using-server.xml =================================================================== --- trunk/docs/user-manual/en/using-server.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/docs/user-manual/en/using-server.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -176,8 +176,8 @@ this with a connector configuration:</para> <programlisting>&lt;connector name="netty"> &lt;factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory&lt;/factory-class> - &lt;param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - &lt;param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + &lt;param key="host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> + &lt;param key="port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> &lt;/connector></programlisting> <para>here you can see we have replaced 2 values with system properties <literal Modified: trunk/examples/core/microcontainer/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/core/microcontainer/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/core/microcontainer/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,9 +7,9 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.tcpnodelay" value="false" type="Boolean"/> - <param key="hornetq.remoting.netty.tcpsendbuffersize" value="1048576" type="Integer"/> - <param key="hornetq.remoting.netty.tcpreceivebuffersize" value="1048576" type="Integer"/> + <param key="tcpnodelay" value="false"/> + <param key="tcpsendbuffersize" value="1048576"/> + <param key="tcpreceivebuffersize" 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 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/core/perf/server0/hornetq-configuration-messaging-lab.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,10 +7,10 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.tcpnodelay" value="false" type="Boolean"/> - <param key="hornetq.remoting.netty.tcpsendbuffersize" value="1048576" type="Boolean"/> - <param key="hornetq.remoting.netty.tcpreceivebuffersize" value="1048576" type="Boolean"/> - <param key="hornetq.remoting.netty.host" value="172.16.8.10" type="String"/> + <param key="tcpnodelay" value="false"/> + <param key="tcpsendbuffersize" value="1048576"/> + <param key="tcpreceivebuffersize" 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 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/core/perf/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,9 +7,9 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.tcpnodelay" value="false" type="Boolean"/> - <param key="hornetq.remoting.netty.tcpsendbuffersize" value="1048576" type="Integer"/> - <param key="hornetq.remoting.netty.tcpreceivebuffersize" value="1048576" type="Integer"/> + <param key="tcpnodelay" value="false"/> + <param key="tcpsendbuffersize" value="1048576"/> + <param key="tcpreceivebuffersize" 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 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/ejb-jms-transaction/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -27,7 +27,7 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> <!-- Netty TCP Acceptor --> Modified: trunk/examples/javaee/jca-config/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/jca-config/server/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/jca-config/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -27,13 +27,13 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> <!-- Netty TCP Acceptor --> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> Modified: trunk/examples/javaee/jca-config/server2/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/jca-config/server2/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/jca-config/server2/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -35,13 +35,13 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> <!-- Netty TCP Acceptor --> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5446}" type="Integer"/> + <param key="port" value="${hornetq.remoting.netty.port:5446}"/> </acceptor> </acceptors> Modified: trunk/examples/javaee/jca-config/server2/jms-remote-ds.xml =================================================================== --- trunk/examples/javaee/jca-config/server2/jms-remote-ds.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/jca-config/server2/jms-remote-ds.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -16,7 +16,7 @@ <connection-definition>org.hornetq.ra.HornetQRAConnectionFactory</connection-definition> <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property> <config-property name="ConnectorClassName" type="java.lang.String">org.hornetq.integration.transports.netty.NettyConnectorFactory</config-property> - <config-property name="ConnectionParameters" type="java.lang.String">hornetq.remoting.netty.port=5445</config-property> + <config-property name="ConnectionParameters" type="java.lang.String">port=5445</config-property> <max-pool-size>20</max-pool-size> </tx-connection-factory> Modified: trunk/examples/javaee/jca-config/server2/ra.xml =================================================================== --- trunk/examples/javaee/jca-config/server2/ra.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/jca-config/server2/ra.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -45,7 +45,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>hornetq.remoting.netty.port=5445</config-property-value> + <config-property-value>port=5445</config-property-value> </config-property> <config-property> <description>Use XA?</description> Modified: trunk/examples/javaee/jms-bridge/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/jms-bridge/server/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/jms-bridge/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -19,7 +19,7 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" 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 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/mdb-bmt/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -14,8 +14,8 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="in-vm"> @@ -29,14 +29,14 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> <!-- Netty TCP Acceptor --> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> Modified: trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -14,8 +14,8 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="in-vm"> @@ -29,14 +29,14 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> <!-- Netty TCP Acceptor --> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> Modified: trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -14,8 +14,8 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="in-vm"> @@ -29,14 +29,14 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> <!-- Netty TCP Acceptor --> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> 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 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -14,8 +14,8 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="in-vm"> @@ -29,14 +29,14 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> <!-- Netty TCP Acceptor --> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> Modified: trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -14,8 +14,8 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="in-vm"> @@ -29,14 +29,14 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> <!-- Netty TCP Acceptor --> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> Modified: trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/mdb-message-selector/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -14,8 +14,8 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="in-vm"> @@ -29,14 +29,14 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> <!-- Netty TCP Acceptor --> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> Modified: trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/mdb-tx-send/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -14,8 +14,8 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="in-vm"> @@ -29,14 +29,14 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> <!-- Netty TCP Acceptor --> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> Modified: trunk/examples/javaee/servlet-ssl/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/servlet-ssl/server/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/servlet-ssl/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -14,13 +14,13 @@ <connector name="netty-servlet"> <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="8443" type="Integer"/> - <param key="hornetq.remoting.netty.useservlet" value="true" type="Boolean"/> - <param key="hornetq.remoting.netty.servletpath" value="/hornetq/HornetQServlet" type="String"/> - <param key="hornetq.remoting.netty.sslenabled" value="true" type="Boolean"/> - <param key="hornetq.remoting.netty.keystorepath" value="server/hornetq.example.keystore" type="String"/> - <param key="hornetq.remoting.netty.keystorepassword" value="hornetqexample" type="String"/> + <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"/> </connector> </connectors> @@ -29,14 +29,14 @@ <acceptor name="netty-servlet"> <factory-class>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.hornetq" type="String"/> + <param key="useinvm" 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="hornetq.remoting.netty.useinvm" value="true" type="Boolean"/> - <param key="hornetq.remoting.netty.host" value="org.hornetq" type="String"/> + <param key="useinvm" value="true"/> + <param key="host" value="org.hornetq"/> </acceptor> </acceptors> Modified: trunk/examples/javaee/servlet-transport/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/servlet-transport/server/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/servlet-transport/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -14,10 +14,10 @@ <connector name="netty-servlet"> <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="8080" type="Integer"/> - <param key="hornetq.remoting.netty.useservlet" value="true" type="Boolean"/> - <param key="hornetq.remoting.netty.servletpath" value="/messaging/HornetQServlet" type="String"/> + <param key="host" value="localhost"/> + <param key="port" value="8080"/> + <param key="useservlet" value="true"/> + <param key="servletpath" value="/messaging/HornetQServlet"/> </connector> </connectors> @@ -26,14 +26,14 @@ <acceptor name="netty-servlet"> <factory-class>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.hornetq" type="String"/> + <param key="useinvm" 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="hornetq.remoting.netty.useinvm" value="true" type="Boolean"/> - <param key="hornetq.remoting.netty.host" value="org.hornetq" type="String"/> + <param key="useinvm" value="true"/> + <param key="host" value="org.hornetq"/> </acceptor> </acceptors> Modified: trunk/examples/javaee/xarecovery/server/hornetq-configuration.xml =================================================================== --- trunk/examples/javaee/xarecovery/server/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/javaee/xarecovery/server/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -27,7 +27,7 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> <!-- Netty TCP Acceptor --> Modified: trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/application-layer-failover/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -6,7 +6,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -15,7 +15,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/application-layer-failover/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,7 +7,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -15,7 +15,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/automatic-failover/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/automatic-failover/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/automatic-failover/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -10,7 +10,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -18,7 +18,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/automatic-failover/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/automatic-failover/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/automatic-failover/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -10,12 +10,12 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> <connector name="backup-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -23,7 +23,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/bridge/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/bridge/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/bridge/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,13 +7,13 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> <!-- Connector to the other node --> <connector name="remote-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -21,7 +21,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/bridge/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/bridge/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/bridge/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -9,7 +9,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -17,7 +17,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -16,7 +16,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -9,7 +9,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -17,7 +17,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5447" type="Integer"/> + <param key="port" value="5447"/> </connector> </connectors> @@ -16,7 +16,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5447" type="Integer"/> + <param key="port" value="5447"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -16,7 +16,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -16,7 +16,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/clustered-grouping/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -16,7 +16,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/clustered-grouping/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,7 +7,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -15,7 +15,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/clustered-grouping/server2/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,7 +7,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5447" type="Integer"/> + <param key="port" value="5447"/> </connector> </connectors> @@ -15,7 +15,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5447" type="Integer"/> + <param key="port" value="5447"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/clustered-queue/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -16,7 +16,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/clustered-queue/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,7 +7,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -15,7 +15,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/clustered-topic/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -16,7 +16,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/clustered-topic/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,7 +7,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -15,7 +15,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/divert/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/divert/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/divert/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -10,14 +10,14 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> <!-- This connector corresponds to the New York server --> <connector name="newyork-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -26,7 +26,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/divert/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/divert/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/divert/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -6,7 +6,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -15,7 +15,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/durable-subscription/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -14,7 +14,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/http-transport/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/http-transport/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/http-transport/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -6,8 +6,8 @@ <connectors> <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.port" value="8080" type="Integer"/> + <param key="httpenabled" value="true"/> + <param key="port" value="8080"/> </connector> </connectors> @@ -16,8 +16,8 @@ <acceptors> <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.port" value="8080" type="Integer"/> + <param key="httpenabled" value="true"/> + <param key="port" value="8080"/> </acceptor> </acceptors> Modified: trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/instantiate-connection-factory/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,7 +7,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -15,7 +15,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/jms-bridge/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,7 +8,7 @@ <!-- **************************************** --> <!-- Replace with the *source* server address --> <!-- **************************************** --> - <param key="hornetq.remoting.netty.host" value="@SOURCE_SERVER@" type="String"/> + <param key="host" value="@SOURCE_SERVER@"/> </connector> </connectors> @@ -16,7 +16,7 @@ <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> <!-- the server accepts connections on all the server addresses --> - <param key="hornetq.remoting.netty.host" value="0.0.0.0" type="String"/> + <param key="host" value="0.0.0.0"/> </acceptor> </acceptors> Modified: trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/jms-bridge/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,7 +8,7 @@ <!-- **************************************** --> <!-- Replace with the *target* server address --> <!-- **************************************** --> - <param key="hornetq.remoting.netty.host" value="@TARGET_SERVER@" type="String"/> + <param key="host" value="@TARGET_SERVER@"/> </connector> </connectors> @@ -16,7 +16,7 @@ <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> <!-- the server accepts connections on all the server addresses --> - <param key="hornetq.remoting.netty.host" value="0.0.0.0" type="String"/> + <param key="host" value="0.0.0.0"/> </acceptor> </acceptors> Modified: trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -16,7 +16,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,12 +8,12 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> <connector name="backup-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -21,7 +21,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml =================================================================== --- trunk/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/perf/server0/hornetq-configuration-messaging-lab.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,10 +7,10 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.tcpnodelay" value="false" type="Boolean"/> - <param key="hornetq.remoting.netty.tcpsendbuffersize" value="1048576" type="Boolean"/> - <param key="hornetq.remoting.netty.tcpreceivebuffersize" value="1048576" type="Boolean"/> - <param key="hornetq.remoting.netty.host" value="172.16.8.10" type="String"/> + <param key="tcpnodelay" value="false"/> + <param key="tcpsendbuffersize" value="1048576"/> + <param key="tcpreceivebuffersize" 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 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/perf/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -5,9 +5,9 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.tcpnodelay" value="false" type="Boolean"/> - <param key="hornetq.remoting.netty.tcpsendbuffersize" value="1048576" type="Integer"/> - <param key="hornetq.remoting.netty.tcpreceivebuffersize" value="1048576" type="Integer"/> + <param key="tcpnodelay" value="false"/> + <param key="tcpsendbuffersize" value="1048576"/> + <param key="tcpreceivebuffersize" 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="hornetq.remoting.netty.tcpnodelay" value="false" type="Boolean"/> - <param key="hornetq.remoting.netty.tcpsendbuffersize" value="1048576" type="Integer"/> - <param key="hornetq.remoting.netty.tcpreceivebuffersize" value="1048576" type="Integer"/> + <param key="tcpnodelay" value="false"/> + <param key="tcpsendbuffersize" value="1048576"/> + <param key="tcpreceivebuffersize" value="1048576"/> </acceptor> </acceptors> Modified: trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -16,7 +16,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -9,7 +9,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -17,7 +17,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/reconnect-same-node/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/reconnect-same-node/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/reconnect-same-node/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,14 +7,14 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> <!-- We just use this connector so we can send management operations while the other acceptor is stopped --> <connector name="netty-connector2"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -22,14 +22,14 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> <!-- We just use this acceptor so we can send management operations while the other acceptor is stopped --> <acceptor name="netty-acceptor2"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/ssl-enabled/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,11 +7,11 @@ <connectors> <connector name="netty-ssl-connector"> <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="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"/> </connector> </connectors> @@ -19,13 +19,13 @@ <acceptors> <acceptor name="netty-ssl-acceptor"> <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="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"/> </acceptor> </acceptors> Deleted: trunk/examples/jms/symmetric-cluster/server0/KILL_ME =================================================================== Modified: trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -11,12 +11,12 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> <connector name="backup-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5448" type="Integer"/> + <param key="port" value="5448"/> </connector> </connectors> @@ -24,7 +24,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -11,12 +11,12 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> <connector name="backup-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5449" type="Integer"/> + <param key="port" value="5449"/> </connector> </connectors> @@ -24,7 +24,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Deleted: trunk/examples/jms/symmetric-cluster/server2/KILL_ME =================================================================== Modified: trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -11,12 +11,12 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5447" type="Integer"/> + <param key="port" value="5447"/> </connector> <connector name="backup-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5450" type="Integer"/> + <param key="port" value="5450"/> </connector> </connectors> @@ -24,7 +24,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5447" type="Integer"/> + <param key="port" value="5447"/> </acceptor> </acceptors> Modified: trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -11,7 +11,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5448" type="Integer"/> + <param key="port" value="5448"/> </connector> </connectors> @@ -19,7 +19,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5448" type="Integer"/> + <param key="port" value="5448"/> </acceptor> </acceptors> Modified: trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -10,7 +10,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5449" type="Integer"/> + <param key="port" value="5449"/> </connector> </connectors> @@ -18,7 +18,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5449" type="Integer"/> + <param key="port" value="5449"/> </acceptor> </acceptors> Modified: trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -10,7 +10,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5450" type="Integer"/> + <param key="port" value="5450"/> </connector> </connectors> @@ -18,7 +18,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5450" type="Integer"/> + <param key="port" value="5450"/> </acceptor> </acceptors> Modified: trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/transaction-failover/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,7 +8,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -16,7 +16,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/jms/transaction-failover/server1/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -8,12 +8,12 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> <connector name="backup-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> </connectors> @@ -21,7 +21,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/examples/soak/normal/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/soak/normal/server0/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/examples/soak/normal/server0/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -5,10 +5,10 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.tcpnodelay" value="false" type="Boolean"/> - <param key="hornetq.remoting.netty.tcpsendbuffersize" value="1048576" type="Integer"/> - <param key="hornetq.remoting.netty.tcpreceivebuffersize" value="1048576" type="Integer"/> - <param key="hornetq.remoting.netty.host" value="localhost" type="String"/> + <param key="tcpnodelay" value="false"/> + <param key="tcpsendbuffersize" value="1048576"/> + <param key="tcpreceivebuffersize" value="1048576"/> + <param key="host" value="localhost"/> </connector> </connectors> @@ -16,10 +16,10 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.tcpnodelay" value="false" type="Boolean"/> - <param key="hornetq.remoting.netty.tcpsendbuffersize" value="1048576" type="Integer"/> - <param key="hornetq.remoting.netty.tcpreceivebuffersize" value="1048576" type="Integer"/> - <param key="hornetq.remoting.netty.host" value="localhost" type="String"/> + <param key="tcpnodelay" value="false"/> + <param key="tcpsendbuffersize" value="1048576"/> + <param key="tcpreceivebuffersize" value="1048576"/> + <param key="host" value="localhost"/> </acceptor> </acceptors> Modified: trunk/src/config/common/schema/hornetq-configuration.xsd =================================================================== --- trunk/src/config/common/schema/hornetq-configuration.xsd 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/config/common/schema/hornetq-configuration.xsd 2009-11-02 15:04:10 UTC (rev 8181) @@ -269,18 +269,6 @@ <xsd:complexType name="paramType"> <xsd:attribute name="key" type="xsd:string" use="required"/> <xsd:attribute name="value" type="xsd:string" use="required"/> - <xsd:attribute name="type" use="required"> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="String"/> - <xsd:enumeration value="Integer"/> - <xsd:enumeration value="Long"/> - <xsd:enumeration value="Boolean"/> - <xsd:enumeration value="Float"/> - <xsd:enumeration value="Double"/> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> </xsd:complexType> <xsd:complexType name="connectorType"> Modified: trunk/src/config/jboss-as/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/config/jboss-as/clustered/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -17,8 +17,8 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="in-vm"> @@ -30,13 +30,13 @@ <acceptors> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> </acceptors> Modified: trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml =================================================================== --- trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/config/jboss-as/clustered/jboss-as-4/ra.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -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>hornetq.remoting.netty.host=localhost;hornetq.remoting.netty.port=5445</config-property-value> +         <config-property-value>host=localhost;port=5445</config-property-value>       </config-property>       <config-property>         <description>Use XA?</description> Modified: trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/config/jboss-as/non-clustered/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -15,8 +15,8 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> <connector name="in-vm"> @@ -28,13 +28,13 @@ <acceptors> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="hornetq.remoting.invm.serverid" value="0"/> </acceptor> </acceptors> Modified: trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml =================================================================== --- trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/config/jboss-as/non-clustered/jboss-as-4/ra.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -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>hornetq.remoting.netty.host=localhost;hornetq.remoting.netty.port=5445</config-property-value> +         <config-property-value>host=localhost;port=5445</config-property-value>       </config-property>       <config-property>         <description>Use XA?</description> Modified: trunk/src/config/ra.xml =================================================================== --- trunk/src/config/ra.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/config/ra.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -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>hornetq.remoting.invm.serverid=0</config-property-value> + <config-property-value>serverid=0</config-property-value> </config-property> <config-property> <description>Use XA?</description> Modified: trunk/src/config/stand-alone/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/stand-alone/clustered/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/config/stand-alone/clustered/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,16 +7,16 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> </connectors> <acceptors> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> Modified: trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/config/stand-alone/non-clustered/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -5,16 +5,16 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> </connectors> <acceptors> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> Modified: trunk/src/config/trunk/clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/trunk/clustered/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/config/trunk/clustered/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -7,16 +7,16 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> </connectors> <acceptors> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> Modified: trunk/src/config/trunk/non-clustered/hornetq-configuration.xml =================================================================== --- trunk/src/config/trunk/non-clustered/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/config/trunk/non-clustered/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -5,16 +5,16 @@ <connectors> <connector name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </connector> </connectors> <acceptors> <acceptor name="netty"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="hornetq.remoting.netty.port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> + <param key="port" value="${hornetq.remoting.netty.port:5445}"/> </acceptor> </acceptors> Modified: trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2009-11-02 15:04:10 UTC (rev 8181) @@ -36,6 +36,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.TransportConfiguration; @@ -391,37 +392,13 @@ Node nValue = attributes.getNamedItem("value"); - Node nType = attributes.getNamedItem("type"); - - String type = nType.getTextContent(); - - if (type.equalsIgnoreCase("Integer")) - { - int iVal = org.hornetq.utils.XMLUtil.parseInt(nValue); - - params.put(key, iVal); - } - else if (type.equalsIgnoreCase("Long")) - { - long lVal = org.hornetq.utils.XMLUtil.parseLong(nValue); - - params.put(key, lVal); - } - else if (type.equalsIgnoreCase("String")) - { - params.put(key, nValue.getTextContent().trim()); - } - else if (type.equalsIgnoreCase("Boolean")) - { - boolean bVal = org.hornetq.utils.XMLUtil.parseBoolean(nValue); - - params.put(key, bVal); - } - else - { - throw new IllegalArgumentException("Invalid parameter type " + type); - } + params.put(key, nValue.getTextContent()); } + + for (Entry<String, Object> entry : params.entrySet()) + { + System.out.println(entry.getKey() + "=" + entry.getValue()); + } return new TransportConfiguration(clazz, params, name); } Modified: trunk/src/main/org/hornetq/core/remoting/impl/invm/TransportConstants.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/invm/TransportConstants.java 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/main/org/hornetq/core/remoting/impl/invm/TransportConstants.java 2009-11-02 15:04:10 UTC (rev 8181) @@ -24,7 +24,7 @@ */ public class TransportConstants { - public static final String SERVER_ID_PROP_NAME = "hornetq.remoting.invm.serverid"; + public static final String SERVER_ID_PROP_NAME = "serverid"; public static final Set<String> ALLOWABLE_CONNECTOR_KEYS; Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2009-11-02 15:04:10 UTC (rev 8181) @@ -141,6 +141,7 @@ this.sslEnabled = ConfigurationHelper.getBooleanProperty(TransportConstants.SSL_ENABLED_PROP_NAME, TransportConstants.DEFAULT_SSL_ENABLED, configuration); + this.httpEnabled = ConfigurationHelper.getBooleanProperty(TransportConstants.HTTP_ENABLED_PROP_NAME, TransportConstants.DEFAULT_HTTP_ENABLED, configuration); Modified: trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java 2009-11-02 15:04:10 UTC (rev 8181) @@ -24,45 +24,45 @@ */ public class TransportConstants { - public static final String SSL_ENABLED_PROP_NAME = "hornetq.remoting.netty.sslenabled"; + public static final String SSL_ENABLED_PROP_NAME = "sslenabled"; - public static final String HTTP_ENABLED_PROP_NAME = "hornetq.remoting.netty.httpenabled"; + public static final String HTTP_ENABLED_PROP_NAME = "httpenabled"; - public static final String HTTP_CLIENT_IDLE_PROP_NAME = "hornetq.remoting.netty.httpclientidletime"; + public static final String HTTP_CLIENT_IDLE_PROP_NAME = "httpclientidletime"; - public static final String HTTP_CLIENT_IDLE_SCAN_PERIOD = "hornetq.remoting.netty.httpclientidlescanperiod"; + public static final String HTTP_CLIENT_IDLE_SCAN_PERIOD = "httpclientidlescanperiod"; - public static final String HTTP_RESPONSE_TIME_PROP_NAME = "hornetq.remoting.netty.httpresponsetime"; + public static final String HTTP_RESPONSE_TIME_PROP_NAME = "httpresponsetime"; - public static final String HTTP_SERVER_SCAN_PERIOD_PROP_NAME = "hornetq.remoting.netty.httpserverscanperiod"; + public static final String HTTP_SERVER_SCAN_PERIOD_PROP_NAME = "httpserverscanperiod"; - public static final String HTTP_REQUIRES_SESSION_ID = "hornetq.remoting.netty.httprequiressessionid"; + public static final String HTTP_REQUIRES_SESSION_ID = "httprequiressessionid"; - public static final String USE_SERVLET_PROP_NAME = "hornetq.remoting.netty.useservlet"; + public static final String USE_SERVLET_PROP_NAME = "useservlet"; - public static final String SERVLET_PATH = "hornetq.remoting.netty.servletpath"; + public static final String SERVLET_PATH = "servletpath"; - public static final String USE_NIO_PROP_NAME = "hornetq.remoting.netty.usenio"; + public static final String USE_NIO_PROP_NAME = "usenio"; - public static final String USE_INVM_PROP_NAME = "hornetq.remoting.netty.useinvm"; + public static final String USE_INVM_PROP_NAME = "useinvm"; - public static final String HOST_PROP_NAME = "hornetq.remoting.netty.host"; + public static final String HOST_PROP_NAME = "host"; - public static final String PORT_PROP_NAME = "hornetq.remoting.netty.port"; + public static final String PORT_PROP_NAME = "port"; - public static final String KEYSTORE_PATH_PROP_NAME = "hornetq.remoting.netty.keystorepath"; + public static final String KEYSTORE_PATH_PROP_NAME = "keystorepath"; - public static final String KEYSTORE_PASSWORD_PROP_NAME = "hornetq.remoting.netty.keystorepassword"; + public static final String KEYSTORE_PASSWORD_PROP_NAME = "keystorepassword"; - public static final String TRUSTSTORE_PATH_PROP_NAME = "hornetq.remoting.netty.truststorepath"; + public static final String TRUSTSTORE_PATH_PROP_NAME = "truststorepath"; - public static final String TRUSTSTORE_PASSWORD_PROP_NAME = "hornetq.remoting.netty.truststorepassword"; + public static final String TRUSTSTORE_PASSWORD_PROP_NAME = "truststorepassword"; - public static final String TCP_NODELAY_PROPNAME = "hornetq.remoting.netty.tcpnodelay"; + public static final String TCP_NODELAY_PROPNAME = "tcpnodelay"; - public static final String TCP_SENDBUFFER_SIZE_PROPNAME = "hornetq.remoting.netty.tcpsendbuffersize"; + public static final String TCP_SENDBUFFER_SIZE_PROPNAME = "tcpsendbuffersize"; - public static final String TCP_RECEIVEBUFFER_SIZE_PROPNAME = "hornetq.remoting.netty.tcpreceivebuffersize"; + public static final String TCP_RECEIVEBUFFER_SIZE_PROPNAME = "tcpreceivebuffersize"; public static final boolean DEFAULT_SSL_ENABLED = false; @@ -127,7 +127,7 @@ allowableAcceptorKeys.add(TCP_SENDBUFFER_SIZE_PROPNAME); allowableAcceptorKeys.add(TCP_RECEIVEBUFFER_SIZE_PROPNAME); - ALLOWABLE_CONNECTOR_KEYS = Collections.unmodifiableSet(allowableAcceptorKeys); + ALLOWABLE_ACCEPTOR_KEYS = Collections.unmodifiableSet(allowableAcceptorKeys); Set<String> allowableConnectorKeys = new HashSet<String>(); allowableConnectorKeys.add(SSL_ENABLED_PROP_NAME); @@ -146,7 +146,7 @@ allowableConnectorKeys.add(TCP_SENDBUFFER_SIZE_PROPNAME); allowableConnectorKeys.add(TCP_RECEIVEBUFFER_SIZE_PROPNAME); - ALLOWABLE_ACCEPTOR_KEYS = Collections.unmodifiableSet(allowableConnectorKeys); + ALLOWABLE_CONNECTOR_KEYS = Collections.unmodifiableSet(allowableConnectorKeys); } } Modified: trunk/src/main/org/hornetq/utils/XMLUtil.java =================================================================== --- trunk/src/main/org/hornetq/utils/XMLUtil.java 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/src/main/org/hornetq/utils/XMLUtil.java 2009-11-02 15:04:10 UTC (rev 8181) @@ -529,16 +529,6 @@ return nodes; } - // Quick dirty replace - use a reg exp to use true default value - private static String doReplace(String s, String propertyName, String defaultValue) - { - String sysProp = System.getProperty(propertyName); - - s = s.replace("${" + propertyName + ":" + defaultValue + "}", sysProp == null ? defaultValue : sysProp); - - return s; - } - // Inner classes -------------------------------------------------------------------------------- } Modified: trunk/tests/config/ConfigurationTest-full-config.xml =================================================================== --- trunk/tests/config/ConfigurationTest-full-config.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/tests/config/ConfigurationTest-full-config.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -60,40 +60,32 @@ <connectors> <connector name="connector1"> <factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory1</factory-class> - <param key="a1" value="v1" type="String"/> - <param key="a2" value="123" type="Long"/> - <param key="a3" value="345" type="Integer"/> - <param key="a4" value="v4" type="String"/> + <param key="a1" value="v1"/> + <param key="a2" value="123"/> + <param key="a3" value="345"/> + <param key="a4" value="v4"/> </connector> <connector name="connector2"> <factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory2</factory-class> - <param key="b1" value="w1" type="String"/> - <param key="b2" value="234" type="Long"/> - <param key="b3" value="456" type="Integer"/> - <param key="b4" value="w4" type="String"/> + <param key="b1" value="w1"/> + <param key="b2" value="234"/> </connector> <connector name="backup-connector"> <factory-class>org.hornetq.tests.unit.core.config.impl.TestConnectorFactory3</factory-class> - <param key="c1" value="x1" type="String"/> - <param key="c2" value="345" type="Long"/> - <param key="c3" value="567" type="Integer"/> - <param key="c4" value="x4" type="String"/> + <param key="c1" value="x1"/> + <param key="c2" value="345"/> </connector> </connectors> <acceptors> <acceptor name="acceptor1"> <factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class> - <param key="d1" value="y1" type="String"/> - <param key="d2" value="456" type="Long"/> - <param key="d3" value="678" type="Integer"/> - <param key="d4" value="y4" type="String"/> + <param key="d1" value="y1"/> + <param key="d2" value="456"/> </acceptor> <acceptor name="acceptor2"> <factory-class>org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class> - <param key="e1" value="z1" type="String"/> - <param key="e2" value="567" type="Long"/> - <param key="e3" value="789" type="Integer"/> - <param key="e4" value="z4" type="String"/> + <param key="e1" value="z1"/> + <param key="e2" value="567"/> </acceptor> </acceptors> <broadcast-groups> Modified: trunk/tests/config/server-start-stop-backup-config1.xml =================================================================== --- trunk/tests/config/server-start-stop-backup-config1.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/tests/config/server-start-stop-backup-config1.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -12,7 +12,7 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -20,7 +20,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </acceptor> </acceptors> Modified: trunk/tests/config/server-start-stop-live-config1.xml =================================================================== --- trunk/tests/config/server-start-stop-live-config1.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/tests/config/server-start-stop-live-config1.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -12,12 +12,12 @@ <connectors> <connector name="netty-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </connector> <connector name="backup-connector"> <factory-class>org.hornetq.integration.transports.netty.NettyConnectorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5446" type="Integer"/> + <param key="port" value="5446"/> </connector> </connectors> @@ -25,7 +25,7 @@ <acceptors> <acceptor name="netty-acceptor"> <factory-class>org.hornetq.integration.transports.netty.NettyAcceptorFactory</factory-class> - <param key="hornetq.remoting.netty.port" value="5445" type="Integer"/> + <param key="port" value="5445"/> </acceptor> </acceptors> Modified: trunk/tests/jms-tests/config/hornetq-configuration.xml =================================================================== --- trunk/tests/jms-tests/config/hornetq-configuration.xml 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/tests/jms-tests/config/hornetq-configuration.xml 2009-11-02 15:04:10 UTC (rev 8181) @@ -21,7 +21,7 @@ <!-- In VM acceptor --> <acceptor name="in-vm"> <factory-class>org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory</factory-class> - <param key="hornetq.remoting.invm.serverid" value="0" type="Integer"/> + <param key="serverid" value="0"/> </acceptor> <!-- Netty TCP Acceptor --> Modified: trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2009-11-02 15:04:10 UTC (rev 8181) @@ -25,6 +25,7 @@ import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQ; import org.hornetq.core.server.HornetQServer; +import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.tests.util.UnitTestCase; import org.hornetq.utils.SimpleString; @@ -43,7 +44,7 @@ conf.setSecurityEnabled(false); HashMap<String, Object> params = new HashMap<String, Object>(); - params.put("hornetq.remoting.netty.httpenabled", true); + params.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true); conf.getAcceptorConfigurations().add(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params)); HornetQServer server = HornetQ.newHornetQServer(conf, false); @@ -95,7 +96,7 @@ conf.setSecurityEnabled(false); HashMap<String, Object> params = new HashMap<String, Object>(); - params.put("hornetq.remoting.netty.httpenabled", true); + params.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true); conf.getAcceptorConfigurations().add(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params)); HornetQServer server = HornetQ.newHornetQServer(conf, false); Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2009-11-02 15:04:10 UTC (rev 8181) @@ -94,50 +94,22 @@ TransportConfiguration tc = conf.getConnectorConfigurations().get("connector1"); assertNotNull(tc); assertEquals("org.hornetq.tests.unit.core.config.impl.TestConnectorFactory1", tc.getFactoryClassName()); - Object param = tc.getParams().get("a1"); - assertTrue(param instanceof String); - assertEquals("v1", param); - param = tc.getParams().get("a2"); - assertTrue(param instanceof Long); - assertEquals(123, ((Long)param).longValue()); - param = tc.getParams().get("a3"); - assertTrue(param instanceof Integer); - assertEquals(345, param); - param = tc.getParams().get("a4"); - assertTrue(param instanceof String); - assertEquals("v4", param); + assertEquals("v1", tc.getParams().get("a1")); + assertEquals("123", tc.getParams().get("a2")); + assertEquals("345", tc.getParams().get("a3")); + assertEquals("v4", tc.getParams().get("a4")); tc = conf.getConnectorConfigurations().get("connector2"); assertNotNull(tc); assertEquals("org.hornetq.tests.unit.core.config.impl.TestConnectorFactory2", tc.getFactoryClassName()); - param = tc.getParams().get("b1"); - assertTrue(param instanceof String); - assertEquals("w1", param); - param = tc.getParams().get("b2"); - assertTrue(param instanceof Long); - assertEquals(234, ((Long)param).longValue()); - param = tc.getParams().get("b3"); - assertTrue(param instanceof Integer); - assertEquals(456, param); - param = tc.getParams().get("b4"); - assertTrue(param instanceof String); - assertEquals("w4", param); + assertEquals("w1", tc.getParams().get("b1")); + assertEquals("234", tc.getParams().get("b2")); tc = conf.getConnectorConfigurations().get("backup-connector"); assertNotNull(tc); assertEquals("org.hornetq.tests.unit.core.config.impl.TestConnectorFactory3", tc.getFactoryClassName()); - param = tc.getParams().get("c1"); - assertTrue(param instanceof String); - assertEquals("x1", param); - param = tc.getParams().get("c2"); - assertTrue(param instanceof Long); - assertEquals(345, ((Long)param).longValue()); - param = tc.getParams().get("c3"); - assertTrue(param instanceof Integer); - assertEquals(567, param); - param = tc.getParams().get("c4"); - assertTrue(param instanceof String); - assertEquals("x4", param); + assertEquals("x1", tc.getParams().get("c1")); + assertEquals("345", tc.getParams().get("c2")); assertEquals(2, conf.getAcceptorConfigurations().size()); for (TransportConfiguration ac: conf.getAcceptorConfigurations()) @@ -145,34 +117,14 @@ if (ac.getFactoryClassName().equals("org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1")) { assertEquals("org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory1", ac.getFactoryClassName()); - param = ac.getParams().get("d1"); - assertTrue(param instanceof String); - assertEquals("y1", param); - param = ac.getParams().get("d2"); - assertTrue(param instanceof Long); - assertEquals(456, ((Long)param).longValue()); - param = ac.getParams().get("d3"); - assertTrue(param instanceof Integer); - assertEquals(678, param); - param = ac.getParams().get("d4"); - assertTrue(param instanceof String); - assertEquals("y4", param); + assertEquals("y1", ac.getParams().get("d1")); + assertEquals("456", ac.getParams().get("d2")); } else { assertEquals("org.hornetq.tests.unit.core.config.impl.TestAcceptorFactory2", ac.getFactoryClassName()); - param = ac.getParams().get("e1"); - assertTrue(param instanceof String); - assertEquals("z1", param); - param = ac.getParams().get("e2"); - assertTrue(param instanceof Long); - assertEquals(567, ((Long)param).longValue()); - param = ac.getParams().get("e3"); - assertTrue(param instanceof Integer); - assertEquals(789, param); - param = ac.getParams().get("e4"); - assertTrue(param instanceof String); - assertEquals("z4", param); + assertEquals("z1", ac.getParams().get("e1")); + assertEquals("567", ac.getParams().get("e2")); } } 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 2009-11-02 11:19:12 UTC (rev 8180) +++ trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/HornetQXAResourceRecoveryTest.java 2009-11-02 15:04:10 UTC (rev 8181) @@ -52,7 +52,7 @@ public void testConfigWithConnectorFactoryClassNameAndParamsWithoutUserCredentials() throws Exception { - String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, , , hornetq.remoting.invm.serverid=99"; + String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, , , serverid=99"; HornetQXAResourceRecovery.ConfigParser parser = new HornetQXAResourceRecovery.ConfigParser(config); assertEquals(InVMConnectorFactory.class.getName(), parser.getConnectorFactoryClassName()); @@ -64,7 +64,7 @@ public void testConfigWithConnectorFactoryClassNameAndParamsAndUserCredentials() throws Exception { - String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, foo, bar, hornetq.remoting.invm.serverid=99, key=val"; + String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, foo, bar, serverid=99, key=val"; HornetQXAResourceRecovery.ConfigParser parser = new HornetQXAResourceRecovery.ConfigParser(config); assertEquals(InVMConnectorFactory.class.getName(), parser.getConnectorFactoryClassName());