[hornetq-commits] JBoss hornetq SVN: r7837 - in trunk: src/main/org/hornetq/utils and 4 other directories.

Author: timfox Date: 2009-08-20 12:50:33 -0400 (Thu, 20 Aug 2009) New Revision: 7837 Modified: trunk/docs/user-manual/en/management.xml trunk/src/main/org/hornetq/utils/XMLUtil.java trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/ConfigurationHelper.java trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/container/Constants.java trunk/tests/smoke/artifacts/smoketest-clustered-queue-service.xml trunk/tests/smoke/artifacts/smoketest-clustered-topic-service.xml trunk/tests/smoke/artifacts/smoketest-queue-service.xml trunk/tests/smoke/artifacts/smoketest-topic-service.xml trunk/tests/smoke/build.xml Log: changed more object names Modified: trunk/docs/user-manual/en/management.xml =================================================================== --- trunk/docs/user-manual/en/management.xml 2009-08-20 16:45:14 UTC (rev 7836) +++ trunk/docs/user-manual/en/management.xml 2009-08-20 16:50:33 UTC (rev 7837) @@ -65,7 +65,7 @@ <literal>createQueue()</literal> or <literal>deployQueue()</literal> or <literal>destroyQueue()</literal>)on the <literal - >org.jboss.messaging:module=Core,type=Server</literal> or the resource name + >org.hornetq:module=Core,type=Server</literal> or the resource name <literal>core.server</literal>)</para> <para><literal>createQueue</literal> will fail if the queue already exists while <literal>deployQueue</literal> will do nothing.</para> @@ -112,7 +112,7 @@ <title>Core Address Management</title> <para>Core addresses can be managed using the <literal>AddressControl</literal> class (with the ObjectName <literal - >org.jboss.messaging:module=Core,type=Address,name="&lt;the address + >org.hornetq:module=Core,type=Address,name="&lt;the address name&gt;"</literal> or the resource name <literal>core.address.&lt;the address name&gt;</literal>). </para> <itemizedlist> @@ -130,7 +130,7 @@ <para>The bulk of the core management API deals with core queues. The <literal (with the ObjectName <literal - >org.jboss.messaging:module=Core,type=Queue,address="&lt;the bound + >org.hornetq:module=Core,type=Queue,address="&lt;the bound address&gt;",name="&lt;the queue name&gt;"</literal> or the resource name <literal <para>Most of the management operations on queues take either a single message ID (e.g. @@ -207,7 +207,7 @@ <para>They can be started or stopped using the <literal>start()</literal> or. <literal>stop()</literal> method on the <literal - >org.jboss.messaging:module=Core,type=Acceptor,name="&lt;the acceptor + >org.hornetq:module=Core,type=Acceptor,name="&lt;the acceptor name&gt;"</literal> or the resource name <literal>core.acceptor.&lt;the address name&gt;</literal>). The acceptors parameters can be retrieved using the <literal>AcceptorControl</literal> attributes (see <xref @@ -218,7 +218,7 @@ <para>They can be started or stopped using the <literal>start()</literal> or <literal>stop()</literal> method on the <literal - >org.jboss.messaging:module=Core,type=Divert,name=&lt;the divert + >org.hornetq:module=Core,type=Divert,name=&lt;the divert name&gt;</literal> or the resource name <literal>core.divert.&lt;the divert name&gt;</literal>). Diverts parameters can be retrieved using the <literal @@ -229,7 +229,7 @@ <para>They can be started or stopped using the <literal>start()</literal> (resp. <literal>stop()</literal>) method on the <literal - >org.jboss.messaging:module=Core,type=Bridge,name="&lt;the bridge + >org.hornetq:module=Core,type=Bridge,name="&lt;the bridge name&gt;"</literal> or the resource name <literal>core.bridge.&lt;the bridge name&gt;</literal>). Bridges parameters can be retrieved using the <literal @@ -240,7 +240,7 @@ <para>They can be started or stopped using the <literal>start()</literal> or <literal>stop()</literal> method on the <literal - >org.jboss.messaging:module=Core,type=BroadcastGroup,name="&lt;the broadcast + >org.hornetq:module=Core,type=BroadcastGroup,name="&lt;the broadcast group name&gt;"</literal> or the resource name <literal groups parameters can be retrieved using the <literal @@ -252,7 +252,7 @@ <para>They can be started or stopped using the <literal>start()</literal> or <literal>stop()</literal> method on the <literal - >org.jboss.messaging:module=Core,type=DiscoveryGroup,name="&lt;the discovery + >org.hornetq:module=Core,type=DiscoveryGroup,name="&lt;the discovery group name&gt;"</literal> or the resource name <literal groups parameters can be retrieved using the <literal @@ -264,7 +264,7 @@ <para>They can be started or stopped using the <literal>start()</literal> or <literal>stop()</literal> method on the <literal - >org.jboss.messaging:module=Core,type=ClusterConnection,name="&lt;the + >org.hornetq:module=Core,type=ClusterConnection,name="&lt;the cluster connection name&gt;"</literal> or the resource name <literal Cluster connections parameters can be retrieved using the <literal @@ -282,7 +282,7 @@ <title>JMS Server Management</title> <para>JMS Resources (connection factories and destinations) can be created using the <literal>JMSServerControl</literal> class (with the ObjectName <literal - >org.jboss.messaging:module=JMS,type=Server</literal> or the resource name + >org.hornetq:module=JMS,type=Server</literal> or the resource name <literal>jms.server</literal>).</para> <itemizedlist> <listitem> @@ -331,7 +331,7 @@ <title>JMS ConnectionFactory Management</title> <para>JMS Connection Factories can be managed using the <literal - >org.jboss.messaging:module=JMS,type=ConnectionFactory,name="&lt;the connection + >org.hornetq:module=JMS,type=ConnectionFactory,name="&lt;the connection factory name&gt;"</literal> or the resource name <literal <itemizedlist> @@ -349,7 +349,7 @@ <section> <title>JMS Queue Management</title> <para>JMS queues can be managed using the <literal>JMSQueueControl</literal> class - (with the ObjectName <literal>org.jboss.messaging:module=JMS,type=Queue,name="&lt;the + (with the ObjectName <literal>org.hornetq:module=JMS,type=Queue,name="&lt;the queue name&gt;"</literal> or the resource name <literal>jms.queue.&lt;the queue name&gt;</literal>). </para> <para><emphasis>The management operations on a JMS queue are very similar to the @@ -414,7 +414,7 @@ <section> <title>JMS Topic Management</title> <para>JMS Topics can be managed using the <literal>TopicControl</literal> class - (with the ObjectName <literal>org.jboss.messaging:module=JMS,type=Topic,name="&lt;the + (with the ObjectName <literal>org.hornetq:module=JMS,type=Topic,name="&lt;the topic name&gt;"</literal> or the resource name <literal>jms.topic.&lt;the topic name&gt;</literal>).</para> <itemizedlist> @@ -451,11 +451,11 @@ <para>The management API is exposed by HornetQ using MBeans interfaces. JBoss Messaging registers its resources with the domain <literal - >org.jboss.messaging</literal>.</para> + >org.hornetq</literal>.</para> <para>For example, the <literal>ObjectName</literal> to manage a JMS Queue <literal <programlisting> - org.jboss.messaging:module=JMS,type=Queue,name="exampleQueue" + org.hornetq:module=JMS,type=Queue,name="exampleQueue" </programlisting> <para>and the MBean is:</para> <programlisting> @@ -723,11 +723,11 @@ notifications can be received by subscribing to 2 MBeans:</para> <itemizedlist> <listitem> - <para><literal>org.jboss.messaging:module=Core,type=Server</literal> for + <para><literal>org.hornetq:module=Core,type=Server</literal> for notifications on <emphasis>Core</emphasis> resources</para> </listitem> <listitem> - <para><literal>org.jboss.messaging:module=JMS,type=Server</literal> for notifications + <para><literal>org.hornetq:module=JMS,type=Server</literal> for notifications on <emphasis>JMS</emphasis> resources</para> </listitem> </itemizedlist> Modified: trunk/src/main/org/hornetq/utils/XMLUtil.java =================================================================== --- trunk/src/main/org/hornetq/utils/XMLUtil.java 2009-08-20 16:45:14 UTC (rev 7836) +++ trunk/src/main/org/hornetq/utils/XMLUtil.java 2009-08-20 16:50:33 UTC (rev 7837) @@ -85,14 +85,8 @@ // Quick hardcoded replace, FIXME this is a kludge - use regexp to match properly String s = buff.toString(); - s = doReplace(s, "jboss.messaging.groupname", "MessagingPostOffice"); - s = doReplace(s, "jboss.messaging.datachanneludpaddress", "228.6.6.6"); - s = doReplace(s, "jboss.messaging.controlchanneludpaddress", "228.7.7.7"); - s = doReplace(s, "jboss.messaging.datachanneludpport", "45567"); - s = doReplace(s, "jboss.messaging.controlchanneludpport", "45568"); - s = doReplace(s, "jboss.messaging.ipttl", "2"); - s = doReplace(s, "jboss.messaging.ipttl", "8"); + StringReader sreader = new StringReader(s); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); Modified: trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/ConfigurationHelper.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/ConfigurationHelper.java 2009-08-20 16:45:14 UTC (rev 7836) +++ trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/ConfigurationHelper.java 2009-08-20 16:50:33 UTC (rev 7837) @@ -70,7 +70,7 @@ { Hashtable<String, Serializable> env = new Hashtable<String, Serializable>(); env.put("java.naming.factory.initial", "org.hornetq.jmstests.tools.container.InVMInitialContextFactory"); - env.put("jboss.messaging.test.server.index", "0"); + env.put("hornetq.test.server.index", "0"); return env; } Modified: trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/container/Constants.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/container/Constants.java 2009-08-20 16:45:14 UTC (rev 7836) +++ trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/container/Constants.java 2009-08-20 16:50:33 UTC (rev 7837) @@ -22,7 +22,7 @@ { // Constants ----------------------------------------------------- - public static final String SERVER_INDEX_PROPERTY_NAME = "jboss.messaging.test.server.index"; + public static final String SERVER_INDEX_PROPERTY_NAME = "hornetq.test.server.index"; // Static -------------------------------------------------------- Modified: trunk/tests/smoke/artifacts/smoketest-clustered-queue-service.xml =================================================================== --- trunk/tests/smoke/artifacts/smoketest-clustered-queue-service.xml 2009-08-20 16:45:14 UTC (rev 7836) +++ trunk/tests/smoke/artifacts/smoketest-clustered-queue-service.xml 2009-08-20 16:50:33 UTC (rev 7837) @@ -3,7 +3,7 @@ <server> <mbean code="org.hornetq.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=DistributedSmokeTestQueue" + name="hornetq.destination:service=Queue,name=DistributedSmokeTestQueue" xmbean-dd="xmdesc/Queue-xmbean.xml"> <attribute name="Clustered">true</attribute> <depends optional-attribute-name="ServerPeer">hornetq:service=ServerPeer</depends> Modified: trunk/tests/smoke/artifacts/smoketest-clustered-topic-service.xml =================================================================== --- trunk/tests/smoke/artifacts/smoketest-clustered-topic-service.xml 2009-08-20 16:45:14 UTC (rev 7836) +++ trunk/tests/smoke/artifacts/smoketest-clustered-topic-service.xml 2009-08-20 16:50:33 UTC (rev 7837) @@ -3,7 +3,7 @@ <server> <mbean code="org.hornetq.jms.server.destination.TopicService" - name="jboss.messaging.destination:service=Topic,name=DistributedSmokeTestTopic" + name="hornetq.destination:service=Topic,name=DistributedSmokeTestTopic" xmbean-dd="xmdesc/Topic-xmbean.xml"> <attribute name="Clustered">true</attribute> <depends optional-attribute-name="ServerPeer">hornetq:service=ServerPeer</depends> Modified: trunk/tests/smoke/artifacts/smoketest-queue-service.xml =================================================================== --- trunk/tests/smoke/artifacts/smoketest-queue-service.xml 2009-08-20 16:45:14 UTC (rev 7836) +++ trunk/tests/smoke/artifacts/smoketest-queue-service.xml 2009-08-20 16:50:33 UTC (rev 7837) @@ -3,7 +3,7 @@ <server> <mbean code="org.hornetq.jms.server.destination.QueueService" - name="jboss.messaging.destination:service=Queue,name=SmokeTestQueue" + name="hornetq.destination:service=Queue,name=SmokeTestQueue" xmbean-dd="xmdesc/Queue-xmbean.xml"> <depends optional-attribute-name="ServerPeer">hornetq:service=ServerPeer</depends> </mbean> Modified: trunk/tests/smoke/artifacts/smoketest-topic-service.xml =================================================================== --- trunk/tests/smoke/artifacts/smoketest-topic-service.xml 2009-08-20 16:45:14 UTC (rev 7836) +++ trunk/tests/smoke/artifacts/smoketest-topic-service.xml 2009-08-20 16:50:33 UTC (rev 7837) @@ -3,7 +3,7 @@ <server> <mbean code="org.hornetq.jms.server.destination.TopicService" - name="jboss.messaging.destination:service=Topic,name=SmokeTestTopic" + name="hornetq.destination:service=Topic,name=SmokeTestTopic" xmbean-dd="xmdesc/Topic-xmbean.xml"> <depends optional-attribute-name="ServerPeer">hornetq:service=ServerPeer</depends> </mbean> Modified: trunk/tests/smoke/build.xml =================================================================== --- trunk/tests/smoke/build.xml 2009-08-20 16:45:14 UTC (rev 7836) +++ trunk/tests/smoke/build.xml 2009-08-20 16:50:33 UTC (rev 7837) @@ -654,7 +654,7 @@ <target name="ping-queue"> <java classname="org.jboss.console.twiddle.Twiddle" fork="yes" failonerror="yes" dir="${jboss.home}/bin"> - <arg line="-s jnp://localhost:${jnpPort} get jboss.messaging.destination:name=${example.queue.name},service=Queue Name"/> + <arg line="-s jnp://localhost:${jnpPort} get hornetq.destination:name=${example.queue.name},service=Queue Name"/> <classpath> <path refid="twiddle.classpath"/> </classpath> @@ -674,7 +674,7 @@ <target name="ping-topic"> <java classname="org.jboss.console.twiddle.Twiddle" fork="yes" failonerror="yes" dir="${jboss.home}/bin"> - <arg line="-s jnp://localhost:${jnpPort} get jboss.messaging.destination:name=${example.topic.name},service=Topic Name"/> + <arg line="-s jnp://localhost:${jnpPort} get hornetq.destination:name=${example.topic.name},service=Topic Name"/> <classpath> <path refid="twiddle.classpath"/> </classpath>