[hornetq-commits] JBoss hornetq SVN: r7842 - in trunk: docs/quickstart-guide/en and 130 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Aug 20 13:45:59 EDT 2009
Author: timfox
Date: 2009-08-20 13:45:57 -0400 (Thu, 20 Aug 2009)
New Revision: 7842
Modified:
trunk/build-hornetq.xml
trunk/docs/quickstart-guide/en/running.xml
trunk/docs/user-manual/en/appserver-integration.xml
trunk/docs/user-manual/en/embedding-jbm.xml
trunk/docs/user-manual/en/management.xml
trunk/docs/user-manual/en/using-server.xml
trunk/examples/common/config/hornetq-example-beans.xml
trunk/examples/core/embedded-remote/readme.html
trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java
trunk/examples/core/embedded/readme.html
trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java
trunk/examples/core/microcontainer/readme.html
trunk/examples/core/microcontainer/server0/hornetq-jboss-beans.xml
trunk/examples/core/perf/server0/hornetq-jboss-beans.xml
trunk/examples/javaee/jms-bridge/server/jms-bridge-jboss-beans.xml
trunk/examples/jms/application-layer-failover/server0/hornetq-jboss-beans.xml
trunk/examples/jms/application-layer-failover/server1/hornetq-jboss-beans.xml
trunk/examples/jms/automatic-failover/server0/hornetq-jboss-beans.xml
trunk/examples/jms/automatic-failover/server1/hornetq-jboss-beans.xml
trunk/examples/jms/bridge/server0/hornetq-jboss-beans.xml
trunk/examples/jms/bridge/server1/hornetq-jboss-beans.xml
trunk/examples/jms/browser/server0/hornetq-jboss-beans.xml
trunk/examples/jms/client-kickoff/readme.html
trunk/examples/jms/client-kickoff/server0/hornetq-jboss-beans.xml
trunk/examples/jms/client-kickoff/src/org/hornetq/jms/example/ClientKickoffExample.java
trunk/examples/jms/client-side-load-balancing/server0/hornetq-jboss-beans.xml
trunk/examples/jms/client-side-load-balancing/server1/hornetq-jboss-beans.xml
trunk/examples/jms/client-side-load-balancing/server2/hornetq-jboss-beans.xml
trunk/examples/jms/clustered-durable-subscription/server0/hornetq-jboss-beans.xml
trunk/examples/jms/clustered-durable-subscription/server1/hornetq-jboss-beans.xml
trunk/examples/jms/clustered-queue/server0/hornetq-jboss-beans.xml
trunk/examples/jms/clustered-queue/server1/hornetq-jboss-beans.xml
trunk/examples/jms/clustered-topic/server0/hornetq-jboss-beans.xml
trunk/examples/jms/clustered-topic/server1/hornetq-jboss-beans.xml
trunk/examples/jms/consumer-rate-limit/server0/hornetq-jboss-beans.xml
trunk/examples/jms/dead-letter/server0/hornetq-jboss-beans.xml
trunk/examples/jms/delayed-redelivery/server0/hornetq-jboss-beans.xml
trunk/examples/jms/divert/server0/hornetq-jboss-beans.xml
trunk/examples/jms/divert/server1/hornetq-jboss-beans.xml
trunk/examples/jms/durable-subscription/server0/hornetq-jboss-beans.xml
trunk/examples/jms/embedded/readme.html
trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java
trunk/examples/jms/expiry/server0/hornetq-jboss-beans.xml
trunk/examples/jms/http-transport/server0/hornetq-jboss-beans.xml
trunk/examples/jms/instantiate-connection-factory/server0/hornetq-jboss-beans.xml
trunk/examples/jms/interceptor/server0/hornetq-jboss-beans.xml
trunk/examples/jms/jaas/server0/hornetq-jboss-beans.xml
trunk/examples/jms/jmx/server0/hornetq-jboss-beans.xml
trunk/examples/jms/large-message/server0/hornetq-jboss-beans.xml
trunk/examples/jms/last-value-queue/server0/hornetq-jboss-beans.xml
trunk/examples/jms/management-notifications/server0/hornetq-jboss-beans.xml
trunk/examples/jms/management/server0/hornetq-jboss-beans.xml
trunk/examples/jms/message-counters/server0/hornetq-jboss-beans.xml
trunk/examples/jms/message-group/server0/hornetq-jboss-beans.xml
trunk/examples/jms/message-priority/server0/hornetq-jboss-beans.xml
trunk/examples/jms/no-consumer-buffering/server0/hornetq-jboss-beans.xml
trunk/examples/jms/paging/server0/hornetq-jboss-beans.xml
trunk/examples/jms/perf/server0/hornetq-jboss-beans.xml
trunk/examples/jms/pre-acknowledge/server0/hornetq-jboss-beans.xml
trunk/examples/jms/producer-rate-limit/server0/hornetq-jboss-beans.xml
trunk/examples/jms/queue-message-redistribution/server0/hornetq-jboss-beans.xml
trunk/examples/jms/queue-message-redistribution/server1/hornetq-jboss-beans.xml
trunk/examples/jms/queue-requestor/server0/hornetq-jboss-beans.xml
trunk/examples/jms/queue-selector/server0/hornetq-jboss-beans.xml
trunk/examples/jms/queue/server0/hornetq-jboss-beans.xml
trunk/examples/jms/reconnect-same-node/server0/hornetq-jboss-beans.xml
trunk/examples/jms/request-reply/server0/hornetq-jboss-beans.xml
trunk/examples/jms/scheduled-message/server0/hornetq-jboss-beans.xml
trunk/examples/jms/security/server0/hornetq-jboss-beans.xml
trunk/examples/jms/send-acknowledgements/server0/hornetq-jboss-beans.xml
trunk/examples/jms/ssl-enabled/server0/hornetq-jboss-beans.xml
trunk/examples/jms/static-selector-jms/server0/hornetq-jboss-beans.xml
trunk/examples/jms/static-selector/server0/hornetq-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server0/hornetq-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server1/hornetq-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server2/hornetq-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server3/hornetq-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server4/hornetq-jboss-beans.xml
trunk/examples/jms/symmetric-cluster/server5/hornetq-jboss-beans.xml
trunk/examples/jms/temp-queue/server0/hornetq-jboss-beans.xml
trunk/examples/jms/topic-hierarchies/server0/hornetq-jboss-beans.xml
trunk/examples/jms/topic-selector-example1/server0/hornetq-jboss-beans.xml
trunk/examples/jms/topic-selector-example2/server0/hornetq-jboss-beans.xml
trunk/examples/jms/topic/server0/hornetq-jboss-beans.xml
trunk/examples/jms/transactional/server0/hornetq-jboss-beans.xml
trunk/examples/jms/xa-heuristic/readme.html
trunk/examples/jms/xa-heuristic/server0/hornetq-jboss-beans.xml
trunk/examples/jms/xa-heuristic/src/org/hornetq/jms/example/XAHeuristicExample.java
trunk/examples/jms/xa-receive/server0/hornetq-jboss-beans.xml
trunk/examples/jms/xa-send/server0/hornetq-jboss-beans.xml
trunk/examples/jms/xa-with-jta/server0/hornetq-jboss-beans.xml
trunk/examples/soak/normal/server0/hornetq-jboss-beans.xml
trunk/src/config/jboss-as/clustered/hornetq-jboss-beans.xml
trunk/src/config/jboss-as/non-clustered/hornetq-jboss-beans.xml
trunk/src/config/stand-alone/clustered/hornetq-jboss-beans.xml
trunk/src/config/stand-alone/non-clustered/hornetq-jboss-beans.xml
trunk/src/config/trunk/clustered/hornetq-jboss-beans.xml
trunk/src/config/trunk/non-clustered/hornetq-jboss-beans.xml
trunk/src/main/org/hornetq/core/management/ObjectNames.java
trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
trunk/src/main/org/hornetq/core/management/impl/ManagementServiceImpl.java
trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java
trunk/src/main/org/hornetq/core/server/HornetQ.java
trunk/src/main/org/hornetq/core/server/HornetQServer.java
trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
trunk/tests/jms-tests/config/hornetq-jboss-beans.xml
trunk/tests/jms-tests/config/test-beans.xml
trunk/tests/jms-tests/src/org/hornetq/jmstests/HornetQServerTestCase.java
trunk/tests/jms-tests/src/org/hornetq/jmstests/JMSTestCase.java
trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/ServerManagement.java
trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/container/LocalTestServer.java
trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/container/Server.java
trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java
trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java
trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java
trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java
trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java
trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java
trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java
trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java
trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java
trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java
trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java
trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java
trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientTestBase.java
trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java
trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ActivationTimeoutTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverManagementTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/MultiThreadRandomFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyMultiThreadRandomFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RandomFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectWithBackupTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleManualFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SplitBrainTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareHornetQServerControlWrapperTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareTestBase.java
trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java
trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java
trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java
trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java
trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java
trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/ManagementControlHelper.java
trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java
trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java
trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java
trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java
trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java
trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java
trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java
trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java
trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java
trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java
trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java
trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java
trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java
trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java
trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java
Log:
removed MessagingServer
Modified: trunk/build-hornetq.xml
===================================================================
--- trunk/build-hornetq.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/build-hornetq.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -308,7 +308,7 @@
<delete dir="${test.output.dir}"/>
<delete dir="${test.jms.build.dir}"/>
<delete dir="${test.joram.build.dir}"/>
- <delete dir="${thirdparty.dir}"/>
+ <delete dir="${thirdparty.dir}"/>
<delete>
<fileset dir="${logs.dir}" includes="*"/>
</delete>
Modified: trunk/docs/quickstart-guide/en/running.xml
===================================================================
--- trunk/docs/quickstart-guide/en/running.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/docs/quickstart-guide/en/running.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -30,7 +30,7 @@
15:05:54,108 INFO @main [HornetQBootstrapServer] Starting HornetQ server
...
- 15:06:02,566 INFO @main [MessagingServerImpl] HornetQ Server version
+ 15:06:02,566 INFO @main [HornetQServerImpl] HornetQ Server version
2.0.0.BETA5 (buzz-buzz, 107) started
</programlisting>
<para>HornetQ is now running. If any errors are displayed or if the server was not
@@ -54,7 +54,7 @@
15:18:35,462 INFO [ServerImpl] Release ID: JBoss [The Oracle] 5.1.0.CR1 (build:
SVNTag=JBoss_5_1_0_CR1 date=200904091504)
...
- 15:19:30,305 INFO [MessagingServerImpl] HornetQ Server version
+ 15:19:30,305 INFO [HornetQServerImpl] HornetQ Server version
2.0.0.BETA5 (buzz-buzz, 107) started
...
15:19:43,601 INFO [ServerImpl] JBoss (Microcontainer) [5.1.0.CR1 (build:
Modified: trunk/docs/user-manual/en/appserver-integration.xml
===================================================================
--- trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -642,7 +642,7 @@
<bean name="JMSBridge" class="org.hornetq.jms.bridge.impl.JMSBridgeImpl">
<!-- HornetQ must be started before the bridge -->
- <depends>MessagingServer</depends>
+ <depends>HornetQServer</depends>
<constructor>
<!-- Source ConnectionFactory Factory -->
<parameter>
Modified: trunk/docs/user-manual/en/embedding-jbm.xml
===================================================================
--- trunk/docs/user-manual/en/embedding-jbm.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/docs/user-manual/en/embedding-jbm.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -55,13 +55,13 @@
...
-MessagingServer server = Messaging.newMessagingServer(config);
+HornetQServer server = Messaging.newHornetQServer(config);
server.start();</programlisting>
- <para>You also have the option of instantiating <literal>MessagingServerImpl</literal>
+ <para>You also have the option of instantiating <literal>HornetQServerImpl</literal>
directly:</para>
- <programlisting>MessagingServer server =
- new MessagingServerImpl(config);
+ <programlisting>HornetQServer server =
+ new HornetQServerImpl(config);
server.start();</programlisting>
</section>
<section>
@@ -73,7 +73,7 @@
which are part of the HornetQ distribution provide a very complete
implementation of what's needed to bootstrap the server using JBoss Micro Container. </para>
<para>When using JBoss Micro Container, you need to provide a XML declaring the <literal
- >MessagingServer</literal> and <literal>Configuration</literal> object, you can also
+ >HornetQServer</literal> and <literal>Configuration</literal> object, you can also
inject a security manager and a MBean server if you want, but those are optional.</para>
<para>A very basic XML Bean declaration for the JBoss Micro Container would be:</para>
<programlisting><?xml version="1.0" encoding="UTF-8"?>
@@ -86,7 +86,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer"
+ <bean name="HornetQServer"
class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
Modified: trunk/docs/user-manual/en/management.xml
===================================================================
--- trunk/docs/user-manual/en/management.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/docs/user-manual/en/management.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -64,7 +64,7 @@
<para>Core queues can be created or destroyed using the management operations
<literal>createQueue()</literal> or <literal>deployQueue()</literal> or
<literal>destroyQueue()</literal>)on the <literal
- >MessagingServerControl</literal> (with the ObjectName <literal
+ >HornetQServerControl</literal> (with the ObjectName <literal
>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
@@ -101,7 +101,7 @@
</listitem>
<listitem>
<para>Retrieving the server configuration and attributes</para>
- <para>The <literal>MessagingServerControl</literal> exposes HornetQ
+ <para>The <literal>HornetQServerControl</literal> exposes HornetQ
server configuration through all its attributes (e.g. <literal
>getVersion()</literal> method to retrieve the server's version,
etc.)</para>
Modified: trunk/docs/user-manual/en/using-server.xml
===================================================================
--- trunk/docs/user-manual/en/using-server.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/docs/user-manual/en/using-server.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -215,7 +215,7 @@
</bean>
<!-- The core server -->
-<bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+<bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<start ignored="true"/>
<stop ignored="true"/>
<constructor>
@@ -236,7 +236,7 @@
class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
@@ -277,7 +277,7 @@
too.</para>
</listitem>
<listitem>
- <para>MessagingServer</para>
+ <para>HornetQServer</para>
<para>This is the core server. It's where 99% of the magic happens</para>
</listitem>
<listitem>
Modified: trunk/examples/common/config/hornetq-example-beans.xml
===================================================================
--- trunk/examples/common/config/hornetq-example-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/common/config/hornetq-example-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -40,7 +40,7 @@
</property>
</bean>
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<depends>AddressSettingsDeployer</depends>
<depends>QueueDeployer</depends>
@@ -83,7 +83,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer" property="serverManagement"/>
+ <inject bean="HornetQServer" property="serverManagement"/>
</parameter>
<parameter>
<inject bean="JMSManagementService"/>
@@ -111,7 +111,7 @@
<inject bean="DeploymentManager"/>
</parameter>
<parameter>
- <inject bean="MessagingServer" property="addressSettingsRepository" state="Configured"/>
+ <inject bean="HornetQServer" property="addressSettingsRepository" state="Configured"/>
</parameter>
</constructor>
</bean>
@@ -133,7 +133,7 @@
<inject bean="DeploymentManager"/>
</parameter>
<parameter>
- <inject bean="MessagingServer" property="securityRepository"/>
+ <inject bean="HornetQServer" property="securityRepository"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/core/embedded/readme.html
===================================================================
--- trunk/examples/core/embedded/readme.html 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/core/embedded/readme.html 2009-08-20 17:45:57 UTC (rev 7842)
@@ -14,7 +14,7 @@
<br>
<h2>Example step-by-step</h2>
<p><i>To run the example, simply type <code>ant</code> from this directory</i></p>
- <p>In this we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, MessagingServer, start it and operate on JMS regularly</p>
+ <p>In this we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, HornetQServer, start it and operate on JMS regularly</p>
<br>
<ol>
<li>Create the Configuration, and set the properties accordingly</li>
@@ -27,7 +27,7 @@
<li>Create and start the server</li>
<pre>
- <code>MessagingServer server = Messaging.newMessagingServer(configuration);</code>
+ <code>HornetQServer server = Messaging.newHornetQServer(configuration);</code>
<code>server.start();</code></pre>
<li>As we are not using a JNDI environment we instantiate the objects directly</li>
Modified: trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java
===================================================================
--- trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -51,7 +51,7 @@
configuration.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
// Step 2. Create and start the server
- HornetQServer server = HornetQ.newMessagingServer(configuration);
+ HornetQServer server = HornetQ.newHornetQServer(configuration);
server.start();
Modified: trunk/examples/core/embedded-remote/readme.html
===================================================================
--- trunk/examples/core/embedded-remote/readme.html 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/core/embedded-remote/readme.html 2009-08-20 17:45:57 UTC (rev 7842)
@@ -29,7 +29,7 @@
<h2>Example step-by-step</h2>
<p><i>To run the example, simply type <code>ant</code> from this directory</i></p>
- <p>In this we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, MessagingServer, start it and operate on JMS regularly</p>
+ <p>In this we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, HornetQServer, start it and operate on JMS regularly</p>
<br/>
<ol>
@@ -46,7 +46,7 @@
<li>On EmbeddedServer: Create and start the server</li>
<pre>
- <code>MessagingServer server = Messaging.newMessagingServer(configuration);</code>
+ <code>HornetQServer server = Messaging.newHornetQServer(configuration);</code>
<code>server.start();</code></pre>
<li>As we are not using a JNDI environment we instantiate the objects directly</li>
Modified: trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java
===================================================================
--- trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -60,7 +60,7 @@
configuration.setAcceptorConfigurations(setTransp);
// Step 3. Create and start the server
- HornetQServer server = HornetQ.newMessagingServer(configuration);
+ HornetQServer server = HornetQ.newHornetQServer(configuration);
server.start();
System.out.println("STARTED::");
}
Modified: trunk/examples/core/microcontainer/readme.html
===================================================================
--- trunk/examples/core/microcontainer/readme.html 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/core/microcontainer/readme.html 2009-08-20 17:45:57 UTC (rev 7842)
@@ -10,7 +10,7 @@
<p>Refer to the user's manual for the list of required Jars, since JBoss Micro Container requires a few jars.</p>
<h2>Example step-by-step</h2>
<p><i>To run the example, simply type <code>ant</code> from this directory</i></p>
- <p>In this we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, MessagingServer, start it and operate on JMS regularly</p>
+ <p>In this we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, HornetQServer, start it and operate on JMS regularly</p>
<br/>
<ol>
Modified: trunk/examples/core/microcontainer/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/core/microcontainer/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/core/microcontainer/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -18,7 +18,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
Modified: trunk/examples/core/perf/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/core/perf/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/core/perf/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -6,7 +6,7 @@
<bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
Modified: trunk/examples/javaee/jms-bridge/server/jms-bridge-jboss-beans.xml
===================================================================
--- trunk/examples/javaee/jms-bridge/server/jms-bridge-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/javaee/jms-bridge/server/jms-bridge-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -4,7 +4,7 @@
<bean name="JMSBridge" class="org.hornetq.jms.bridge.impl.JMSBridgeImpl">
<!-- HornetQ must be started before the bridge -->
- <depends>MessagingServer</depends>
+ <depends>HornetQServer</depends>
<constructor>
<!-- Source ConnectionFactory Factory -->
<parameter>
Modified: trunk/examples/jms/application-layer-failover/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/application-layer-failover/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/application-layer-failover/server1/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/application-layer-failover/server1/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/automatic-failover/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/automatic-failover/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/automatic-failover/server1/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/automatic-failover/server1/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/bridge/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/bridge/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/bridge/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/bridge/server1/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/bridge/server1/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/bridge/server1/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/browser/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/browser/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/browser/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/client-kickoff/readme.html
===================================================================
--- trunk/examples/jms/client-kickoff/readme.html 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/client-kickoff/readme.html 2009-08-20 17:45:57 UTC (rev 7842)
@@ -63,15 +63,15 @@
<code>connection.start();</code>
</pre>
- <li>We create a MBean proxy to the MessagingServerControlMBean used to manage HornetQ server
+ <li>We create a MBean proxy to the HornetQServerControlMBean used to manage HornetQ server
(see <a href="../jmx/readme.html">JMX example</a> for a complete explanation of the different steps)</li>
<pre>
- <code>ObjectName on = ObjectNames.getMessagingServerObjectName();
+ <code>ObjectName on = ObjectNames.getHornetQServerObjectName();
JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(JMX_URL), new HashMap<String, String>());
MBeanServerConnection mbsc = connector.getMBeanServerConnection();
- MessagingServerControlMBean serverControl = (MessagingServerControlMBean)MBeanServerInvocationHandler.newProxyInstance(mbsc,
+ HornetQServerControlMBean serverControl = (HornetQServerControlMBean)MBeanServerInvocationHandler.newProxyInstance(mbsc,
on,
- MessagingServerControlMBean.class,
+ HornetQServerControlMBean.class,
false);
</code>
</pre>
Modified: trunk/examples/jms/client-kickoff/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/client-kickoff/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/client-kickoff/src/org/hornetq/jms/example/ClientKickoffExample.java
===================================================================
--- trunk/examples/jms/client-kickoff/src/org/hornetq/jms/example/ClientKickoffExample.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/client-kickoff/src/org/hornetq/jms/example/ClientKickoffExample.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -72,8 +72,8 @@
// Step 5. We start the connection
connection.start();
- // Step 6. Create a MessagingServerControlMBean proxy to manage the server
- ObjectName on = ObjectNames.getMessagingServerObjectName();
+ // Step 6. Create a HornetQServerControlMBean proxy to manage the server
+ ObjectName on = ObjectNames.getHornetQServerObjectName();
JMXConnector connector = JMXConnectorFactory.connect(new JMXServiceURL(JMX_URL), new HashMap<String, String>());
MBeanServerConnection mbsc = connector.getMBeanServerConnection();
HornetQServerControl serverControl = (HornetQServerControl)MBeanServerInvocationHandler.newProxyInstance(mbsc,
Modified: trunk/examples/jms/client-side-load-balancing/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/client-side-load-balancing/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/client-side-load-balancing/server1/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/client-side-load-balancing/server1/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/client-side-load-balancing/server2/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/client-side-load-balancing/server2/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/clustered-durable-subscription/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/clustered-durable-subscription/server1/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/clustered-queue/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/clustered-queue/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/clustered-queue/server1/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/clustered-queue/server1/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/clustered-topic/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/clustered-topic/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/clustered-topic/server1/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/clustered-topic/server1/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/consumer-rate-limit/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/consumer-rate-limit/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/dead-letter/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/dead-letter/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/delayed-redelivery/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/delayed-redelivery/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/divert/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/divert/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/divert/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/divert/server1/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/divert/server1/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/divert/server1/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/durable-subscription/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/durable-subscription/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/embedded/readme.html
===================================================================
--- trunk/examples/jms/embedded/readme.html 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/embedded/readme.html 2009-08-20 17:45:57 UTC (rev 7842)
@@ -14,7 +14,7 @@
<br>
<h2>Example step-by-step</h2>
<p><i>To run the example, simply type <code>ant</code> from this directory</i></p>
- <p>In this we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, MessagingServer, start it and operate on JMS regularly</p>
+ <p>In this we don't use any configuration files. (Everything is embedded). We simply instantiate ConfigurationImpl, HornetQServer, start it and operate on JMS regularly</p>
<br>
<ol>
<li>Create the Configuration, and set the properties accordingly</li>
@@ -26,7 +26,7 @@
<li>Create and start the server</li>
<pre>
- <code>MessagingServer server = Messaging.newMessagingServer(configuration);</code>
+ <code>HornetQServer server = Messaging.newHornetQServer(configuration);</code>
<code>server.start();</code></pre>
<li>As we are not using a JNDI environment we instantiate the objects directly</li>
Modified: trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java
===================================================================
--- trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -52,7 +52,7 @@
configuration.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
// Step 2. Create and start the server
- HornetQServer server = HornetQ.newMessagingServer(configuration);
+ HornetQServer server = HornetQ.newHornetQServer(configuration);
server.start();
Modified: trunk/examples/jms/expiry/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/expiry/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/expiry/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/http-transport/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/http-transport/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/instantiate-connection-factory/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/instantiate-connection-factory/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/instantiate-connection-factory/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/interceptor/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/interceptor/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/jaas/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/jaas/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/jaas/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -64,7 +64,7 @@
<bean name="ExampleCallbackHandler" class="org.hornetq.jms.example.ExampleCallbackHandler" />
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -84,7 +84,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/jmx/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/jmx/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/jmx/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/large-message/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/large-message/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/large-message/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/last-value-queue/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/last-value-queue/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/management/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/management/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/management/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/management-notifications/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/management-notifications/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/message-counters/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/message-counters/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/message-group/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/message-group/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/message-group/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/message-priority/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/message-priority/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/no-consumer-buffering/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/no-consumer-buffering/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/paging/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/paging/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/paging/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/perf/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/perf/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/perf/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -19,7 +19,7 @@
<bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -33,7 +33,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/pre-acknowledge/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/pre-acknowledge/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/producer-rate-limit/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/producer-rate-limit/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/queue/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/queue/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/queue/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/queue-message-redistribution/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/queue-message-redistribution/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/queue-message-redistribution/server1/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/queue-message-redistribution/server1/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/queue-requestor/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/queue-requestor/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/queue-selector/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/queue-selector/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/reconnect-same-node/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/reconnect-same-node/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/request-reply/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/request-reply/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/scheduled-message/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/scheduled-message/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/security/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/security/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/security/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/send-acknowledgements/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/send-acknowledgements/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/send-acknowledgements/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/ssl-enabled/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/ssl-enabled/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/static-selector/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/static-selector/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/static-selector-jms/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/static-selector-jms/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/static-selector-jms/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/symmetric-cluster/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server1/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server1/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/symmetric-cluster/server1/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server2/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server2/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/symmetric-cluster/server2/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server3/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server3/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/symmetric-cluster/server3/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server4/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server4/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/symmetric-cluster/server4/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/symmetric-cluster/server5/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/server5/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/symmetric-cluster/server5/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/temp-queue/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/temp-queue/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/topic/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/topic/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/topic/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/topic-hierarchies/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/topic-hierarchies/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/topic-selector-example1/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/topic-selector-example1/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/topic-selector-example2/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/topic-selector-example2/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/transactional/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/transactional/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/transactional/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/xa-heuristic/readme.html
===================================================================
--- trunk/examples/jms/xa-heuristic/readme.html 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/xa-heuristic/readme.html 2009-08-20 17:45:57 UTC (rev 7842)
@@ -170,7 +170,7 @@
<li>We list the prepared transactions</li>
<pre>
<code>
- ObjectName serverObject = ObjectNames.getMessagingServerObjectName();
+ ObjectName serverObject = ObjectNames.getHornetQServerObjectName();
String[] infos = (String[])mbsc.invoke(serverObject, "listPreparedTransactions", null, null);
System.out.println("Prepared transactions: ");
Modified: trunk/examples/jms/xa-heuristic/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/xa-heuristic/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/xa-heuristic/src/org/hornetq/jms/example/XAHeuristicExample.java
===================================================================
--- trunk/examples/jms/xa-heuristic/src/org/hornetq/jms/example/XAHeuristicExample.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/xa-heuristic/src/org/hornetq/jms/example/XAHeuristicExample.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -147,7 +147,7 @@
MBeanServerConnection mbsc = connector.getMBeanServerConnection();
//Step 27. List the prepared transactions
- ObjectName serverObject = ObjectNames.getMessagingServerObjectName();
+ ObjectName serverObject = ObjectNames.getHornetQServerObjectName();
String[] infos = (String[])mbsc.invoke(serverObject, "listPreparedTransactions", null, null);
System.out.println("Prepared transactions: ");
Modified: trunk/examples/jms/xa-receive/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/xa-receive/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/xa-send/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/xa-send/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/jms/xa-with-jta/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/jms/xa-with-jta/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -31,7 +31,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -51,7 +51,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/examples/soak/normal/server0/hornetq-jboss-beans.xml
===================================================================
--- trunk/examples/soak/normal/server0/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/examples/soak/normal/server0/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -19,7 +19,7 @@
<bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -33,7 +33,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/src/config/jboss-as/clustered/hornetq-jboss-beans.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/config/jboss-as/clustered/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -19,7 +19,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -39,7 +39,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/src/config/jboss-as/non-clustered/hornetq-jboss-beans.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/config/jboss-as/non-clustered/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -19,7 +19,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -39,7 +39,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/src/config/stand-alone/clustered/hornetq-jboss-beans.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/config/stand-alone/clustered/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -32,7 +32,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -52,7 +52,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/src/config/stand-alone/non-clustered/hornetq-jboss-beans.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/config/stand-alone/non-clustered/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -32,7 +32,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -52,7 +52,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/src/config/trunk/clustered/hornetq-jboss-beans.xml
===================================================================
--- trunk/src/config/trunk/clustered/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/config/trunk/clustered/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -32,7 +32,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -52,7 +52,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/src/config/trunk/non-clustered/hornetq-jboss-beans.xml
===================================================================
--- trunk/src/config/trunk/non-clustered/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/config/trunk/non-clustered/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -32,7 +32,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -52,7 +52,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/src/main/org/hornetq/core/management/ObjectNames.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/ObjectNames.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/main/org/hornetq/core/management/ObjectNames.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -42,7 +42,7 @@
// Static --------------------------------------------------------
- public static ObjectName getMessagingServerObjectName() throws Exception
+ public static ObjectName getHornetQServerObjectName() throws Exception
{
return getInstance(DOMAIN + ":module=Core,type=Server");
}
Modified: trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -111,7 +111,7 @@
return configuration;
}
- // MessagingServerControlMBean implementation --------------------
+ // HornetQServerControlMBean implementation --------------------
public boolean isStarted()
{
Modified: trunk/src/main/org/hornetq/core/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/ManagementServiceImpl.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/main/org/hornetq/core/management/impl/ManagementServiceImpl.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -209,7 +209,7 @@
messagingServer,
messageCounterManager,
broadcaster);
- ObjectName objectName = ObjectNames.getMessagingServerObjectName();
+ ObjectName objectName = ObjectNames.getHornetQServerObjectName();
registerInJMX(objectName, new ReplicationAwareHornetQServerControlWrapper(messagingServerControl,
replicationInvoker));
registerInRegistry(ResourceNames.CORE_SERVER, messagingServerControl);
@@ -219,7 +219,7 @@
public synchronized void unregisterServer() throws Exception
{
- ObjectName objectName = ObjectNames.getMessagingServerObjectName();
+ ObjectName objectName = ObjectNames.getHornetQServerObjectName();
unregisterFromJMX(objectName);
unregisterFromRegistry(ResourceNames.CORE_SERVER);
}
Modified: trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -50,7 +50,7 @@
this.localControl = localControl;
}
- // MessagingServerControlMBean implementation ------------------------------
+ // HornetQServerControlMBean implementation ------------------------------
public String getBackupConnectorName()
{
Modified: trunk/src/main/org/hornetq/core/server/HornetQ.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/HornetQ.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/main/org/hornetq/core/server/HornetQ.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -36,11 +36,11 @@
{
private static final Logger log = Logger.getLogger(HornetQ.class);
- public static HornetQServer newMessagingServer(final Configuration config, boolean enablePersistence)
+ public static HornetQServer newHornetQServer(final Configuration config, boolean enablePersistence)
{
HornetQSecurityManager securityManager = new HornetQSecurityManagerImpl();
- HornetQServer server = newMessagingServer(config,
+ HornetQServer server = newHornetQServer(config,
ManagementFactory.getPlatformMBeanServer(),
securityManager,
enablePersistence);
@@ -48,37 +48,37 @@
return server;
}
- public static HornetQServer newMessagingServer(final Configuration config)
+ public static HornetQServer newHornetQServer(final Configuration config)
{
- return newMessagingServer(config, config.isPersistenceEnabled());
+ return newHornetQServer(config, config.isPersistenceEnabled());
}
- public static HornetQServer newMessagingServer(final Configuration config,
+ public static HornetQServer newHornetQServer(final Configuration config,
final MBeanServer mbeanServer,
final boolean enablePersistence)
{
HornetQSecurityManager securityManager = new HornetQSecurityManagerImpl();
- HornetQServer server = newMessagingServer(config, mbeanServer, securityManager, enablePersistence);
+ HornetQServer server = newHornetQServer(config, mbeanServer, securityManager, enablePersistence);
return server;
}
- public static HornetQServer newMessagingServer(final Configuration config, final MBeanServer mbeanServer)
+ public static HornetQServer newHornetQServer(final Configuration config, final MBeanServer mbeanServer)
{
- return newMessagingServer(config, mbeanServer, true);
+ return newHornetQServer(config, mbeanServer, true);
}
- public static HornetQServer newMessagingServer(final Configuration config,
+ public static HornetQServer newHornetQServer(final Configuration config,
final MBeanServer mbeanServer,
final HornetQSecurityManager securityManager)
{
- HornetQServer server = newMessagingServer(config, mbeanServer, securityManager, true);
+ HornetQServer server = newHornetQServer(config, mbeanServer, securityManager, true);
return server;
}
- public static HornetQServer newMessagingServer(final Configuration config,
+ public static HornetQServer newHornetQServer(final Configuration config,
final MBeanServer mbeanServer,
final HornetQSecurityManager securityManager,
final boolean enablePersistence)
Modified: trunk/src/main/org/hornetq/core/server/HornetQServer.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/HornetQServer.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/main/org/hornetq/core/server/HornetQServer.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -41,7 +41,7 @@
/**
* This interface defines the internal interface of the HornetQ Server exposed to other components of the server. The
- * external management interface of the HornetQ Server is defined by the MessagingServerManagement interface This
+ * external management interface of the HornetQ Server is defined by the HornetQServerManagement interface This
* interface is never exposed outside the messaging server, e.g. by JMX or other means
*
* @author <a href="tim.fox at jboss.com">Tim Fox</a>
@@ -63,7 +63,7 @@
Version getVersion();
- HornetQServerControlImpl getMessagingServerControl();
+ HornetQServerControlImpl getHornetQServerControl();
void registerActivateCallback(ActivateCallback callback);
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -650,7 +650,7 @@
}
}
- public HornetQServerControlImpl getMessagingServerControl()
+ public HornetQServerControlImpl getHornetQServerControl()
{
return messagingServerControl;
}
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -190,7 +190,7 @@
public boolean isStarted()
{
- return server.getMessagingServerControl().isStarted();
+ return server.getHornetQServerControl().isStarted();
}
// JMSServerManager implementation -------------------------------
@@ -206,7 +206,7 @@
{
checkInitialised();
- return server.getMessagingServerControl().getVersion();
+ return server.getHornetQServerControl().getVersion();
}
public synchronized boolean createQueue(final String queueName,
@@ -225,7 +225,7 @@
coreFilterString = SelectorTranslator.convertToHornetQFilterString(selectorString);
}
- server.getMessagingServerControl().deployQueue(jBossQueue.getAddress(),
+ server.getHornetQServerControl().deployQueue(jBossQueue.getAddress(),
jBossQueue.getAddress(),
coreFilterString,
durable);
@@ -249,7 +249,7 @@
// checks when routing messages to a topic that
// does not exist - otherwise we would not be able to distinguish from a non existent topic and one with no
// subscriptions - core has no notion of a topic
- server.getMessagingServerControl().deployQueue(jBossTopic.getAddress(),
+ server.getHornetQServerControl().deployQueue(jBossTopic.getAddress(),
jBossTopic.getAddress(),
REJECT_FILTER,
true);
@@ -290,7 +290,7 @@
destinations.remove(name);
jmsManagementService.unregisterQueue(name);
- server.getMessagingServerControl().destroyQueue(HornetQQueue.createAddressFromName(name).toString());
+ server.getHornetQServerControl().destroyQueue(HornetQQueue.createAddressFromName(name).toString());
return true;
}
@@ -302,7 +302,7 @@
destinations.remove(name);
jmsManagementService.unregisterTopic(name);
- server.getMessagingServerControl().destroyQueue(HornetQTopic.createAddressFromName(name).toString());
+ server.getHornetQServerControl().destroyQueue(HornetQTopic.createAddressFromName(name).toString());
return true;
}
@@ -601,30 +601,30 @@
public String[] listRemoteAddresses() throws Exception
{
checkInitialised();
- return server.getMessagingServerControl().listRemoteAddresses();
+ return server.getHornetQServerControl().listRemoteAddresses();
}
public String[] listRemoteAddresses(final String ipAddress) throws Exception
{
checkInitialised();
- return server.getMessagingServerControl().listRemoteAddresses(ipAddress);
+ return server.getHornetQServerControl().listRemoteAddresses(ipAddress);
}
public boolean closeConnectionsForAddress(final String ipAddress) throws Exception
{
checkInitialised();
- return server.getMessagingServerControl().closeConnectionsForAddress(ipAddress);
+ return server.getHornetQServerControl().closeConnectionsForAddress(ipAddress);
}
public String[] listConnectionIDs() throws Exception
{
- return server.getMessagingServerControl().listConnectionIDs();
+ return server.getHornetQServerControl().listConnectionIDs();
}
public String[] listSessions(final String connectionID) throws Exception
{
checkInitialised();
- return server.getMessagingServerControl().listSessions(connectionID);
+ return server.getHornetQServerControl().listSessions(connectionID);
}
// Public --------------------------------------------------------
Modified: trunk/tests/jms-tests/config/hornetq-jboss-beans.xml
===================================================================
--- trunk/tests/jms-tests/config/hornetq-jboss-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/jms-tests/config/hornetq-jboss-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -32,7 +32,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -52,7 +52,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/tests/jms-tests/config/test-beans.xml
===================================================================
--- trunk/tests/jms-tests/config/test-beans.xml 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/jms-tests/config/test-beans.xml 2009-08-20 17:45:57 UTC (rev 7842)
@@ -32,7 +32,7 @@
</bean>
<!-- The core server -->
- <bean name="MessagingServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
+ <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl">
<constructor>
<parameter>
<inject bean="Configuration"/>
@@ -52,7 +52,7 @@
<bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl">
<constructor>
<parameter>
- <inject bean="MessagingServer"/>
+ <inject bean="HornetQServer"/>
</parameter>
</constructor>
</bean>
Modified: trunk/tests/jms-tests/src/org/hornetq/jmstests/HornetQServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jmstests/HornetQServerTestCase.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/jms-tests/src/org/hornetq/jmstests/HornetQServerTestCase.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -254,7 +254,7 @@
protected HornetQServer getJmsServer() throws Exception
{
- return servers.get(0).getMessagingServer();
+ return servers.get(0).getHornetQServer();
}
protected JMSServerManager getJmsServerManager() throws Exception
@@ -413,7 +413,7 @@
protected static void assertActiveConnectionsOnTheServer(int expectedSize)
throws Exception
{
- assertEquals(expectedSize, servers.get(0).getMessagingServer().getMessagingServerControl().getConnectionCount());
+ assertEquals(expectedSize, servers.get(0).getHornetQServer().getHornetQServerControl().getConnectionCount());
}
public static void deployConnectionFactory(String clientId, String objectName,
Modified: trunk/tests/jms-tests/src/org/hornetq/jmstests/JMSTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jmstests/JMSTestCase.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/jms-tests/src/org/hornetq/jmstests/JMSTestCase.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -63,7 +63,7 @@
protected String overrideConf;
- protected boolean startMessagingServer = true;
+ protected boolean startHornetQServer = true;
protected void setUp() throws Exception
{
Modified: trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/ServerManagement.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/ServerManagement.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/ServerManagement.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -74,7 +74,7 @@
*/
public static void start(int i, String config,
boolean clearDatabase,
- boolean startMessagingServer) throws Exception
+ boolean startHornetQServer) throws Exception
{
throw new IllegalStateException("Method to start a server is not implemented");
}
Modified: trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/container/LocalTestServer.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/container/LocalTestServer.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -190,13 +190,13 @@
public synchronized void startServerPeer() throws Exception
{
System.setProperty(Constants.SERVER_INDEX_PROPERTY_NAME, "" + getServerID());
- getMessagingServer().start();
+ getHornetQServer().start();
}
public synchronized void stopServerPeer() throws Exception
{
System.setProperty(Constants.SERVER_INDEX_PROPERTY_NAME, "" + getServerID());
- getMessagingServer().stop();
+ getHornetQServer().stop();
// also unbind everything
unbindAll();
}
@@ -218,7 +218,7 @@
*/
public HornetQServer getServerPeer()
{
- return getMessagingServer();
+ return getHornetQServer();
}
public void destroyQueue(String name, String jndiName) throws Exception
@@ -352,11 +352,11 @@
String destination = (isQueue ? "jms.queue." : "jms.topic.") + destName;
if (roles != null)
{
- getMessagingServer().getSecurityRepository().addMatch(destination, roles);
+ getHornetQServer().getSecurityRepository().addMatch(destination, roles);
}
else
{
- getMessagingServer().getSecurityRepository().removeMatch(destination);
+ getHornetQServer().getSecurityRepository().removeMatch(destination);
}
}
@@ -368,7 +368,7 @@
// Private --------------------------------------------------------------------------------------
- public HornetQServer getMessagingServer()
+ public HornetQServer getHornetQServer()
{
return (HornetQServer)bootstrap.getKernel().getRegistry().getEntry("HornetQServer").getTarget();
}
@@ -411,7 +411,7 @@
public Integer getMessageCountForQueue(String queueName) throws Exception
{
- JMSQueueControl queue = (JMSQueueControl)getMessagingServer().getManagementService()
+ JMSQueueControl queue = (JMSQueueControl)getHornetQServer().getManagementService()
.getResource(ResourceNames.JMS_QUEUE + queueName);
if (queue != null)
{
@@ -430,7 +430,7 @@
{
address = HornetQTopic.createAddressFromName(destination);
}
- Binding binding = getMessagingServer().getPostOffice().getBinding(address);
+ Binding binding = getHornetQServer().getPostOffice().getBinding(address);
if (binding != null && binding.getType() == BindingType.LOCAL_QUEUE)
{
((Queue)binding.getBindable()).deleteAllReferences();
@@ -456,13 +456,13 @@
public Set<Role> getSecurityConfig() throws Exception
{
- return getMessagingServer().getSecurityRepository().getMatch("*");
+ return getHornetQServer().getSecurityRepository().getMatch("*");
}
public void setSecurityConfig(Set<Role> defConfig) throws Exception
{
- getMessagingServer().getSecurityRepository().removeMatch("#");
- getMessagingServer().getSecurityRepository().addMatch("#", defConfig);
+ getHornetQServer().getSecurityRepository().removeMatch("#");
+ getHornetQServer().getSecurityRepository().addMatch("#", defConfig);
}
// Inner classes --------------------------------------------------------------------------------
Modified: trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/container/Server.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/container/Server.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/jms-tests/src/org/hornetq/jmstests/tools/container/Server.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -181,7 +181,7 @@
void configureSecurityForDestination(String destName, boolean isQueue, Set<Role> roles) throws Exception;
- HornetQServer getMessagingServer() throws Exception;
+ HornetQServer getHornetQServer() throws Exception;
InitialContext getInitialContext() throws Exception;
Modified: trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java
===================================================================
--- trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -69,7 +69,7 @@
conf.setFileDeploymentEnabled(false);
// disable server persistence since JORAM tests do not restart server
- final HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ final HornetQServer server = HornetQ.newHornetQServer(conf, false);
Hashtable<String, String> env = new Hashtable<String, String>();
env.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
Modified: trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -867,7 +867,7 @@
conf.setIDCacheSize(cacheSize);
- HornetQServer messagingService2 = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -905,7 +905,7 @@
messagingService2.stop();
- messagingService2 = HornetQ.newMessagingServer(conf);
+ messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -950,7 +950,7 @@
conf.setIDCacheSize(theCacheSize);
- HornetQServer messagingService2 = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -984,7 +984,7 @@
messagingService2.stop();
- messagingService2 = HornetQ.newMessagingServer(conf);
+ messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1028,7 +1028,7 @@
conf.setIDCacheSize(initialCacheSize);
- HornetQServer messagingService2 = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1064,7 +1064,7 @@
conf.setIDCacheSize(subsequentCacheSize);
- messagingService2 = HornetQ.newMessagingServer(conf);
+ messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1117,7 +1117,7 @@
conf.setIDCacheSize(initialCacheSize);
- HornetQServer messagingService2 = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1153,7 +1153,7 @@
conf.setIDCacheSize(subsequentCacheSize);
- messagingService2 = HornetQ.newMessagingServer(conf);
+ messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1163,7 +1163,7 @@
conf.setIDCacheSize(initialCacheSize);
- messagingService2 = HornetQ.newMessagingServer(conf);
+ messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1216,7 +1216,7 @@
conf.setPersistIDCache(false);
- HornetQServer messagingService2 = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1254,7 +1254,7 @@
messagingService2.stop();
- messagingService2 = HornetQ.newMessagingServer(conf);
+ messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1299,7 +1299,7 @@
conf.setPersistIDCache(false);
- HornetQServer messagingService2 = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1339,7 +1339,7 @@
messagingService2.stop();
- messagingService2 = HornetQ.newMessagingServer(conf);
+ messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1384,7 +1384,7 @@
conf.setIDCacheSize(cacheSize);
- HornetQServer messagingService2 = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1428,7 +1428,7 @@
messagingService2.stop();
- messagingService2 = HornetQ.newMessagingServer(conf);
+ messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1475,7 +1475,7 @@
conf.setPersistIDCache(false);
- HornetQServer messagingService2 = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1517,7 +1517,7 @@
messagingService2.stop();
- messagingService2 = HornetQ.newMessagingServer(conf);
+ messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1574,7 +1574,7 @@
conf.setIDCacheSize(cacheSize);
- HornetQServer messagingService2 = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1614,7 +1614,7 @@
messagingService2.stop();
- messagingService2 = HornetQ.newMessagingServer(conf);
+ messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1671,7 +1671,7 @@
conf.setIDCacheSize(cacheSize);
- HornetQServer messagingService2 = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1713,7 +1713,7 @@
messagingService2.stop();
- messagingService2 = HornetQ.newMessagingServer(conf);
+ messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1770,7 +1770,7 @@
conf.setIDCacheSize(cacheSize);
- HornetQServer messagingService2 = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1811,7 +1811,7 @@
messagingService2.stop();
- messagingService2 = HornetQ.newMessagingServer(conf);
+ messagingService2 = HornetQ.newHornetQServer(conf);
messagingService2.start();
@@ -1871,7 +1871,7 @@
conf.setIDCacheSize(cacheSize);
- messagingService = HornetQ.newMessagingServer(conf, false);
+ messagingService = HornetQ.newHornetQServer(conf, false);
messagingService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -207,7 +207,7 @@
Configuration config = new ConfigurationImpl();
config.setSecurityEnabled(false);
config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- server = HornetQ.newMessagingServer(config, false);
+ server = HornetQ.newHornetQServer(config, false);
server.start();
sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -155,7 +155,7 @@
Configuration config = new ConfigurationImpl();
config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName()));
config.setSecurityEnabled(false);
- server = HornetQ.newMessagingServer(config, false);
+ server = HornetQ.newHornetQServer(config, false);
server.start();
address = randomSimpleString();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -66,7 +66,7 @@
conf.getAcceptorConfigurations().add(new TransportConfiguration(acceptorFactoryClassName));
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -385,7 +385,7 @@
configuration.setSecurityEnabled(false);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- server = HornetQ.newMessagingServer(configuration, false);
+ server = HornetQ.newHornetQServer(configuration, false);
// start the server
server.start();
// then we create a client as normal
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -320,7 +320,7 @@
configuration.setSecurityEnabled(false);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- server = HornetQ.newMessagingServer(configuration, false);
+ server = HornetQ.newHornetQServer(configuration, false);
// start the server
server.start();
// then we create a client as normal
Modified: trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -61,7 +61,7 @@
conf.setSecurityEnabled(false);
conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
- server = HornetQ.newMessagingServer(conf, false);
+ server = HornetQ.newHornetQServer(conf, false);
jmsServer = new JMSServerManagerImpl(server);
jmsServer.setContext(new NullInitialContext());
jmsServer.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -73,7 +73,7 @@
{
server.start();
- HornetQServerControl jmxServer = ManagementControlHelper.createMessagingServerControl(mbeanServer);
+ HornetQServerControl jmxServer = ManagementControlHelper.createHornetQServerControl(mbeanServer);
assertFalse(jmxServer.commitPreparedTransaction("Nananananana"));
}
@@ -130,7 +130,7 @@
session.close();
- HornetQServerControl jmxServer = ManagementControlHelper.createMessagingServerControl(mbeanServer);
+ HornetQServerControl jmxServer = ManagementControlHelper.createHornetQServerControl(mbeanServer);
String preparedTransactions[] = jmxServer.listPreparedTransactions();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -549,7 +549,7 @@
configuration.setSecurityEnabled(false);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- server = HornetQ.newMessagingServer(configuration, false);
+ server = HornetQ.newHornetQServer(configuration, false);
// start the server
server.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -218,7 +218,7 @@
Configuration config = new ConfigurationImpl();
config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName()));
config.setSecurityEnabled(false);
- server = HornetQ.newMessagingServer(config, false);
+ server = HornetQ.newHornetQServer(config, false);
server.start();
sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -79,7 +79,7 @@
Configuration config = new ConfigurationImpl();
config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName()));
config.setSecurityEnabled(false);
- server = HornetQ.newMessagingServer(config, false);
+ server = HornetQ.newHornetQServer(config, false);
server.start();
sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
Modified: trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -219,7 +219,7 @@
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(false);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- service = HornetQ.newMessagingServer(conf, false);
+ service = HornetQ.newHornetQServer(conf, false);
service.start();
sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -251,7 +251,7 @@
Configuration config = new ConfigurationImpl();
config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName()));
config.setSecurityEnabled(false);
- server = HornetQ.newMessagingServer(config, false);
+ server = HornetQ.newHornetQServer(config, false);
server.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -873,7 +873,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -911,7 +911,7 @@
bcConfigs1.add(bcConfig1);
liveConf.setBroadcastGroupConfigurations(bcConfigs1);
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
}
Modified: trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -762,7 +762,7 @@
configuration.setTransactionTimeoutScanPeriod(500);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- server = HornetQ.newMessagingServer(configuration, false);
+ server = HornetQ.newHornetQServer(configuration, false);
//start the server
server.start();
server.getManagementService().enableNotifications(false);
Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientTestBase.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientTestBase.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -66,7 +66,7 @@
protected void assertActiveConnections(int expectedActiveConnections) throws Exception
{
- assertEquals(expectedActiveConnections, server.getMessagingServerControl().getConnectionCount());
+ assertEquals(expectedActiveConnections, server.getHornetQServerControl().getConnectionCount());
}
protected void assertActiveSession(int expectedActiveSession) throws Exception
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -55,13 +55,13 @@
public void testFailoverAndReconnectImmediately() throws Exception
{
Map<String, Object> server0Params = new HashMap<String, Object>();
- HornetQServer server0 = createMessagingServer(0, server0Params);
+ HornetQServer server0 = createHornetQServer(0, server0Params);
Map<String, Object> server1Params = new HashMap<String, Object>();
- HornetQServer server1 = createMessagingServer(1, server1Params);
+ HornetQServer server1 = createHornetQServer(1, server1Params);
Map<String, Object> server2Params = new HashMap<String, Object>();
- HornetQServer service2 = createMessagingServer(2, server2Params, true);
+ HornetQServer service2 = createHornetQServer(2, server2Params, true);
TransportConfiguration server0tc = new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory",
server0Params,
@@ -180,13 +180,13 @@
public void testFailoverAndReconnectAfterAFewTries() throws Exception
{
Map<String, Object> server0Params = new HashMap<String, Object>();
- HornetQServer server0 = createMessagingServer(0, server0Params);
+ HornetQServer server0 = createHornetQServer(0, server0Params);
Map<String, Object> server1Params = new HashMap<String, Object>();
- HornetQServer server1 = createMessagingServer(1, server1Params);
+ HornetQServer server1 = createHornetQServer(1, server1Params);
Map<String, Object> server2Params = new HashMap<String, Object>();
- HornetQServer service2 = createMessagingServer(2, server2Params, true);
+ HornetQServer service2 = createHornetQServer(2, server2Params, true);
TransportConfiguration server0tc = new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory",
server0Params,
@@ -310,10 +310,10 @@
public void testReconnectSameNode() throws Exception
{
Map<String, Object> server0Params = new HashMap<String, Object>();
- HornetQServer server0 = createMessagingServer(0, server0Params);
+ HornetQServer server0 = createHornetQServer(0, server0Params);
Map<String, Object> server1Params = new HashMap<String, Object>();
- HornetQServer server1 = createMessagingServer(1, server1Params);
+ HornetQServer server1 = createHornetQServer(1, server1Params);
TransportConfiguration server0tc = new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory",
server0Params,
@@ -424,10 +424,10 @@
public void testShutdownServerCleanlyAndReconnectSameNode() throws Exception
{
Map<String, Object> server0Params = new HashMap<String, Object>();
- HornetQServer server0 = createMessagingServer(0, server0Params);
+ HornetQServer server0 = createHornetQServer(0, server0Params);
Map<String, Object> server1Params = new HashMap<String, Object>();
- HornetQServer server1 = createMessagingServer(1, server1Params);
+ HornetQServer server1 = createHornetQServer(1, server1Params);
TransportConfiguration server0tc = new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory",
server0Params,
@@ -531,10 +531,10 @@
public void testFailoverThenFailAgainAndReconnect() throws Exception
{
Map<String, Object> server0Params = new HashMap<String, Object>();
- HornetQServer server0 = createMessagingServer(0, server0Params);
+ HornetQServer server0 = createHornetQServer(0, server0Params);
Map<String, Object> server1Params = new HashMap<String, Object>();
- HornetQServer server1 = createMessagingServer(1, server1Params);
+ HornetQServer server1 = createHornetQServer(1, server1Params);
TransportConfiguration server0tc = new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory",
server0Params,
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -35,12 +35,12 @@
*/
public abstract class BridgeTestBase extends UnitTestCase
{
- protected HornetQServer createMessagingServerNIO(final int id, final Map<String, Object> params)
+ protected HornetQServer createHornetQServerNIO(final int id, final Map<String, Object> params)
{
- return createMessagingServerNIO(id, params, false);
+ return createHornetQServerNIO(id, params, false);
}
- protected HornetQServer createMessagingServerNIO(final int id,
+ protected HornetQServer createHornetQServerNIO(final int id,
final Map<String, Object> params,
final boolean backup)
{
@@ -54,16 +54,16 @@
serviceConf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
params));
- HornetQServer service = HornetQ.newMessagingServer(serviceConf);
+ HornetQServer service = HornetQ.newHornetQServer(serviceConf);
return service;
}
- protected HornetQServer createMessagingServer(final int id, final Map<String, Object> params)
+ protected HornetQServer createHornetQServer(final int id, final Map<String, Object> params)
{
- return createMessagingServer(id, params, false);
+ return createHornetQServer(id, params, false);
}
- protected HornetQServer createMessagingServer(final int id, final Map<String, Object> params, final boolean backup)
+ protected HornetQServer createHornetQServer(final int id, final Map<String, Object> params, final boolean backup)
{
Configuration serviceConf = new ConfigurationImpl();
serviceConf.setClustered(true);
@@ -73,12 +73,12 @@
serviceConf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
params));
- HornetQServer service = HornetQ.newMessagingServer(serviceConf, false);
+ HornetQServer service = HornetQ.newHornetQServer(serviceConf, false);
return service;
}
- protected HornetQServer createMessagingServer(final int id)
+ protected HornetQServer createHornetQServer(final int id)
{
- return this.createMessagingServer(id, new HashMap<String, Object>());
+ return this.createHornetQServer(id, new HashMap<String, Object>());
}
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -954,11 +954,11 @@
if (fileStorage)
{
- server = HornetQ.newMessagingServer(configuration);
+ server = HornetQ.newHornetQServer(configuration);
}
else
{
- server = HornetQ.newMessagingServer(configuration, false);
+ server = HornetQ.newHornetQServer(configuration, false);
}
servers[node] = server;
}
@@ -1085,11 +1085,11 @@
if (fileStorage)
{
- server = HornetQ.newMessagingServer(configuration);
+ server = HornetQ.newHornetQServer(configuration);
}
else
{
- server = HornetQ.newMessagingServer(configuration, false);
+ server = HornetQ.newHornetQServer(configuration, false);
}
servers[node] = server;
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ActivationTimeoutTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -269,7 +269,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -283,7 +283,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -256,7 +256,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -270,7 +270,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverManagementTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverManagementTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverManagementTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -260,7 +260,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -273,7 +273,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -186,7 +186,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -199,7 +199,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -168,7 +168,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -181,7 +181,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -198,7 +198,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -211,7 +211,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -118,11 +118,11 @@
backupConf.setJournalType(JournalType.ASYNCIO);
- backupServer = HornetQ.newMessagingServer(backupConf);
+ backupServer = HornetQ.newHornetQServer(backupConf);
}
else
{
- backupServer = HornetQ.newMessagingServer(backupConf, false);
+ backupServer = HornetQ.newHornetQServer(backupConf, false);
}
backupServer.start();
@@ -158,11 +158,11 @@
if (fileBased)
{
- liveServer = HornetQ.newMessagingServer(liveConf);
+ liveServer = HornetQ.newHornetQServer(liveConf);
}
else
{
- liveServer = HornetQ.newMessagingServer(liveConf, false);
+ liveServer = HornetQ.newHornetQServer(liveConf, false);
}
AddressSettings settings = new AddressSettings();
@@ -201,12 +201,12 @@
backupConf.setJournalType(JournalType.ASYNCIO);
- backupServer = HornetQ.newMessagingServer(backupConf);
+ backupServer = HornetQ.newHornetQServer(backupConf);
}
else
{
- backupServer = HornetQ.newMessagingServer(backupConf, false);
+ backupServer = HornetQ.newHornetQServer(backupConf, false);
}
backupServer.start();
@@ -252,14 +252,14 @@
liveConf.setJournalFileSize(100 * 1024);
liveConf.setJournalType(JournalType.ASYNCIO);
- liveServer = HornetQ.newMessagingServer(liveConf);
+ liveServer = HornetQ.newHornetQServer(liveConf);
}
else
{
- liveServer = HornetQ.newMessagingServer(liveConf, false);
+ liveServer = HornetQ.newHornetQServer(liveConf, false);
}
- liveServer = HornetQ.newMessagingServer(liveConf, false);
+ liveServer = HornetQ.newHornetQServer(liveConf, false);
liveServer.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -516,7 +516,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -530,7 +530,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -88,7 +88,7 @@
liveConf.setSecurityEnabled(false);
liveConf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
- service = HornetQ.newMessagingServer(liveConf, false);
+ service = HornetQ.newHornetQServer(liveConf, false);
service.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -99,7 +99,7 @@
.add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName(), backupParams));
backupConf.setBackup(true);
- backupServer = HornetQ.newMessagingServer(backupConf);
+ backupServer = HornetQ.newHornetQServer(backupConf);
backupServer.start();
Configuration liveConf = new ConfigurationImpl();
@@ -125,7 +125,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveServer = HornetQ.newMessagingServer(liveConf);
+ liveServer = HornetQ.newHornetQServer(liveConf);
liveServer.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/MultiThreadRandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/MultiThreadRandomFailoverTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/MultiThreadRandomFailoverTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -41,7 +41,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupServer = HornetQ.newMessagingServer(backupConf, false);
+ backupServer = HornetQ.newHornetQServer(backupConf, false);
backupServer.start();
Configuration liveConf = new ConfigurationImpl();
@@ -55,7 +55,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveServer = HornetQ.newMessagingServer(liveConf, false);
+ liveServer = HornetQ.newHornetQServer(liveConf, false);
liveServer.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyMultiThreadRandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyMultiThreadRandomFailoverTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyMultiThreadRandomFailoverTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -47,7 +47,7 @@
.add(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupServer = HornetQ.newMessagingServer(backupConf, false);
+ backupServer = HornetQ.newHornetQServer(backupConf, false);
backupServer.start();
Configuration liveConf = new ConfigurationImpl();
@@ -63,7 +63,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveServer = HornetQ.newMessagingServer(liveConf, false);
+ liveServer = HornetQ.newHornetQServer(liveConf, false);
liveServer.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -381,7 +381,7 @@
backupConf.setJournalType(JournalType.ASYNCIO);
- backupServer = HornetQ.newMessagingServer(backupConf);
+ backupServer = HornetQ.newHornetQServer(backupConf);
AddressSettings defaultSetting = new AddressSettings();
defaultSetting.setPageSizeBytes(pageSize);
@@ -392,7 +392,7 @@
}
else
{
- backupServer = HornetQ.newMessagingServer(backupConf, false);
+ backupServer = HornetQ.newHornetQServer(backupConf, false);
}
backupServer.start();
@@ -424,7 +424,7 @@
liveConf.setJournalType(JournalType.ASYNCIO);
- liveServer = HornetQ.newMessagingServer(liveConf);
+ liveServer = HornetQ.newHornetQServer(liveConf);
AddressSettings defaultSetting = new AddressSettings();
defaultSetting.setPageSizeBytes(pageSize);
@@ -435,7 +435,7 @@
}
else
{
- liveServer = HornetQ.newMessagingServer(liveConf, false);
+ liveServer = HornetQ.newHornetQServer(liveConf, false);
}
AddressSettings settings = new AddressSettings();
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RandomFailoverTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/RandomFailoverTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -1439,7 +1439,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -1453,7 +1453,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -692,7 +692,7 @@
liveConf.setSecurityEnabled(false);
liveConf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
- service = HornetQ.newMessagingServer(liveConf, false);
+ service = HornetQ.newHornetQServer(liveConf, false);
service.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectWithBackupTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -273,7 +273,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -287,7 +287,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -139,7 +139,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupServer = HornetQ.newMessagingServer(backupConf, false);
+ backupServer = HornetQ.newHornetQServer(backupConf, false);
backupServer.start();
Configuration liveConf = new ConfigurationImpl();
@@ -153,7 +153,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveServer = HornetQ.newMessagingServer(liveConf, false);
+ liveServer = HornetQ.newHornetQServer(liveConf, false);
liveServer.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -921,7 +921,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -935,7 +935,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleManualFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -172,14 +172,14 @@
server1Conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
server1Params));
- server1Service = HornetQ.newMessagingServer(server1Conf, false);
+ server1Service = HornetQ.newHornetQServer(server1Conf, false);
server1Service.start();
Configuration server0Conf = new ConfigurationImpl();
server0Conf.setSecurityEnabled(false);
server0Conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
- server0Service = HornetQ.newMessagingServer(server0Conf, false);
+ server0Service = HornetQ.newHornetQServer(server0Conf, false);
server0Service.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SplitBrainTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SplitBrainTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SplitBrainTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -210,7 +210,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupServer = HornetQ.newMessagingServer(backupConf, false);
+ backupServer = HornetQ.newHornetQServer(backupConf, false);
backupServer.start();
Configuration liveConf = new ConfigurationImpl();
@@ -223,7 +223,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveServer = HornetQ.newMessagingServer(liveConf, false);
+ liveServer = HornetQ.newHornetQServer(liveConf, false);
liveServer.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -85,7 +85,7 @@
.add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName(), backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf);
+ backupService = HornetQ.newHornetQServer(backupConf);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -111,7 +111,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf);
+ liveService = HornetQ.newHornetQServer(liveConf);
liveService.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -635,7 +635,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -649,7 +649,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareHornetQServerControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareHornetQServerControlWrapperTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareHornetQServerControlWrapperTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -13,7 +13,7 @@
package org.hornetq.tests.integration.cluster.management;
-import static org.hornetq.tests.integration.management.ManagementControlHelper.createMessagingServerControl;
+import static org.hornetq.tests.integration.management.ManagementControlHelper.createHornetQServerControl;
import static org.hornetq.tests.integration.management.ManagementControlHelper.createQueueControl;
import static org.hornetq.tests.util.RandomUtil.randomLong;
import static org.hornetq.tests.util.RandomUtil.randomPositiveLong;
@@ -61,7 +61,7 @@
SimpleString address = randomSimpleString();
SimpleString name = randomSimpleString();
- HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer);
+ HornetQServerControl liveServerControl = createHornetQServerControl(liveMBeanServer);
ObjectName queueON = ObjectNames.getQueueObjectName(address, name);
assertResourceNotExists(liveMBeanServer, queueON);
@@ -78,7 +78,7 @@
SimpleString address = randomSimpleString();
SimpleString name = randomSimpleString();
- HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer);
+ HornetQServerControl liveServerControl = createHornetQServerControl(liveMBeanServer);
ObjectName queueON = ObjectNames.getQueueObjectName(address, name);
assertResourceNotExists(liveMBeanServer, queueON);
@@ -99,8 +99,8 @@
public void testEnableMessageCounters() throws Exception
{
- HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer);
- HornetQServerControl backupServerControl = createMessagingServerControl(backupMBeanServer);
+ HornetQServerControl liveServerControl = createHornetQServerControl(liveMBeanServer);
+ HornetQServerControl backupServerControl = createHornetQServerControl(backupMBeanServer);
assertFalse(liveServerControl.isMessageCounterEnabled());
assertFalse(backupServerControl.isMessageCounterEnabled());
@@ -113,8 +113,8 @@
public void testDisableMessageCounters() throws Exception
{
- HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer);
- HornetQServerControl backupServerControl = createMessagingServerControl(backupMBeanServer);
+ HornetQServerControl liveServerControl = createHornetQServerControl(liveMBeanServer);
+ HornetQServerControl backupServerControl = createHornetQServerControl(backupMBeanServer);
assertFalse(liveServerControl.isMessageCounterEnabled());
assertFalse(backupServerControl.isMessageCounterEnabled());
@@ -134,7 +134,7 @@
public void testResetAllMessageCounters() throws Exception
{
- HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer);
+ HornetQServerControl liveServerControl = createHornetQServerControl(liveMBeanServer);
liveServerControl.enableMessageCounters();
liveServerControl.setMessageCounterSamplePeriod(2000);
@@ -173,8 +173,8 @@
{
long newPeriod = randomPositiveLong();
- HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer);
- HornetQServerControl backupServerControl = createMessagingServerControl(backupMBeanServer);
+ HornetQServerControl liveServerControl = createHornetQServerControl(liveMBeanServer);
+ HornetQServerControl backupServerControl = createHornetQServerControl(backupMBeanServer);
assertEquals(liveServerControl.getMessageCounterSamplePeriod(),
backupServerControl.getMessageCounterSamplePeriod());
@@ -189,8 +189,8 @@
{
int newCount = RandomUtil.randomPositiveInt();
- HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer);
- HornetQServerControl backupServerControl = createMessagingServerControl(backupMBeanServer);
+ HornetQServerControl liveServerControl = createHornetQServerControl(liveMBeanServer);
+ HornetQServerControl backupServerControl = createHornetQServerControl(backupMBeanServer);
assertEquals(liveServerControl.getMessageCounterMaxDayCount(), backupServerControl.getMessageCounterMaxDayCount());
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareTestBase.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareTestBase.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -104,7 +104,7 @@
backupParams));
backupConf.setBackup(true);
backupConf.setJMXManagementEnabled(true);
- backupServer = HornetQ.newMessagingServer(backupConf, backupMBeanServer, false);
+ backupServer = HornetQ.newHornetQServer(backupConf, backupMBeanServer, false);
if (startServers)
{
backupServer.start();
@@ -122,7 +122,7 @@
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
liveConf.setJMXManagementEnabled(true);
- liveServer = HornetQ.newMessagingServer(liveConf, liveMBeanServer, false);
+ liveServer = HornetQ.newHornetQServer(liveConf, liveMBeanServer, false);
if (startServers)
{
liveServer.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -68,7 +68,7 @@
conf.setDivertConfigurations(divertConfs);
- HornetQServer messagingService = HornetQ.newMessagingServer(conf, false);
+ HornetQServer messagingService = HornetQ.newHornetQServer(conf, false);
messagingService.start();
@@ -162,7 +162,7 @@
conf.setDivertConfigurations(divertConfs);
- HornetQServer messagingService = HornetQ.newMessagingServer(conf, false);
+ HornetQServer messagingService = HornetQ.newHornetQServer(conf, false);
messagingService.start();
@@ -294,7 +294,7 @@
conf.setDivertConfigurations(divertConfs);
- HornetQServer messagingService = HornetQ.newMessagingServer(conf, false);
+ HornetQServer messagingService = HornetQ.newHornetQServer(conf, false);
messagingService.start();
@@ -369,7 +369,7 @@
conf.setDivertConfigurations(divertConfs);
- HornetQServer messagingService = HornetQ.newMessagingServer(conf, false);
+ HornetQServer messagingService = HornetQ.newHornetQServer(conf, false);
messagingService.start();
@@ -486,7 +486,7 @@
conf.setDivertConfigurations(divertConfs);
- HornetQServer messagingService = HornetQ.newMessagingServer(conf, false);
+ HornetQServer messagingService = HornetQ.newHornetQServer(conf, false);
messagingService.start();
@@ -638,7 +638,7 @@
conf.setDivertConfigurations(divertConfs);
- HornetQServer messagingService = HornetQ.newMessagingServer(conf, false);
+ HornetQServer messagingService = HornetQ.newHornetQServer(conf, false);
messagingService.start();
@@ -779,7 +779,7 @@
conf.setDivertConfigurations(divertConfs);
- HornetQServer messagingService = HornetQ.newMessagingServer(conf, false);
+ HornetQServer messagingService = HornetQ.newHornetQServer(conf, false);
messagingService.start();
@@ -912,7 +912,7 @@
conf.setDivertConfigurations(divertConfs);
- HornetQServer messagingService = HornetQ.newMessagingServer(conf, false);
+ HornetQServer messagingService = HornetQ.newHornetQServer(conf, false);
messagingService.start();
@@ -1096,7 +1096,7 @@
conf.setDivertConfigurations(divertConfs);
- HornetQServer messagingService = HornetQ.newMessagingServer(conf, false);
+ HornetQServer messagingService = HornetQ.newHornetQServer(conf, false);
messagingService.start();
@@ -1256,7 +1256,7 @@
conf.setDivertConfigurations(divertConfs);
- HornetQServer messagingService = HornetQ.newMessagingServer(conf, false);
+ HornetQServer messagingService = HornetQ.newHornetQServer(conf, false);
messagingService.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -73,7 +73,7 @@
conf.setDivertConfigurations(divertConfs);
- HornetQServer messagingService = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService = HornetQ.newHornetQServer(conf);
messagingService.start();
@@ -209,7 +209,7 @@
conf.setDivertConfigurations(divertConfs);
- HornetQServer messagingService = HornetQ.newMessagingServer(conf);
+ HornetQServer messagingService = HornetQ.newHornetQServer(conf);
messagingService.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -46,7 +46,7 @@
params.put("hornetq.remoting.netty.httpenabled", true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params));
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
@@ -98,7 +98,7 @@
params.put("hornetq.remoting.netty.httpenabled", true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params));
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -98,7 +98,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName()));
- server = HornetQ.newMessagingServer(conf, false);
+ server = HornetQ.newHornetQServer(conf, false);
server.start();
serverManager = new JMSServerManagerImpl(server);
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -1074,7 +1074,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -1112,7 +1112,7 @@
bcConfigs1.add(bcConfig1);
liveConf.setBroadcastGroupConfigurations(bcConfigs1);
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -190,7 +190,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName()));
- server = HornetQ.newMessagingServer(conf, false);
+ server = HornetQ.newHornetQServer(conf, false);
server.start();
serverManager = new JMSServerManagerImpl(server);
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -101,7 +101,7 @@
conf0.setSecurityEnabled(false);
conf0.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
- server0 = HornetQ.newMessagingServer(conf0, false);
+ server0 = HornetQ.newHornetQServer(conf0, false);
context0 = new InVMContext();
jmsServer0 = new JMSServerManagerImpl(server0);
@@ -116,7 +116,7 @@
conf1.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory", params1));
- server1 = HornetQ.newMessagingServer(conf1, false);
+ server1 = HornetQ.newHornetQServer(conf1, false);
context1 = new InVMContext();
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -242,7 +242,7 @@
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
backupParams));
backupConf.setBackup(true);
- backupService = HornetQ.newMessagingServer(backupConf, false);
+ backupService = HornetQ.newHornetQServer(backupConf, false);
backupService.start();
Configuration liveConf = new ConfigurationImpl();
@@ -256,7 +256,7 @@
connectors.put(backupTC.getName(), backupTC);
liveConf.setConnectorConfigurations(connectors);
liveConf.setBackupConnectorName(backupTC.getName());
- liveService = HornetQ.newMessagingServer(liveConf, false);
+ liveService = HornetQ.newHornetQServer(liveConf, false);
liveService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -54,7 +54,7 @@
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
- server = HornetQ.newMessagingServer(conf, false);
+ server = HornetQ.newHornetQServer(conf, false);
jmsServer = new JMSServerManagerImpl(server);
jmsServer.setContext(new NullInitialContext());
jmsServer.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -59,7 +59,7 @@
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
- server = HornetQ.newMessagingServer(conf, false);
+ server = HornetQ.newHornetQServer(conf, false);
jmsServer = new JMSServerManagerImpl(server);
jmsServer.setContext(new NullInitialContext());
jmsServer.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -60,7 +60,7 @@
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
- server = HornetQ.newMessagingServer(conf, false);
+ server = HornetQ.newHornetQServer(conf, false);
jmsServer = new JMSServerManagerImpl(server);
jmsServer.setContext(new NullInitialContext());
jmsServer.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -719,7 +719,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- server = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ server = HornetQ.newHornetQServer(conf, mbeanServer, false);
server.start();
serverManager = new JMSServerManagerImpl(server);
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -69,13 +69,13 @@
// Static --------------------------------------------------------
- private void startMessagingServer(String acceptorFactory) throws Exception
+ private void startHornetQServer(String acceptorFactory) throws Exception
{
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(acceptorFactory));
- server = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ server = HornetQ.newHornetQServer(conf, mbeanServer, false);
server.start();
context = new InVMContext();
@@ -163,7 +163,7 @@
{
try
{
- startMessagingServer(acceptorFactory);
+ startHornetQServer(acceptorFactory);
JMSServerControl control = createManagementControl();
@@ -210,7 +210,7 @@
{
try
{
- startMessagingServer(acceptorFactory);
+ startHornetQServer(acceptorFactory);
JMSServerControl control = createManagementControl();
@@ -254,7 +254,7 @@
{
try
{
- startMessagingServer(acceptorFactory);
+ startHornetQServer(acceptorFactory);
JMSServerControl control = createManagementControl();
@@ -297,7 +297,7 @@
{
try
{
- startMessagingServer(acceptorFactory);
+ startHornetQServer(acceptorFactory);
JMSServerControl control = createManagementControl();
@@ -353,7 +353,7 @@
try
{
- startMessagingServer(acceptorFactory);
+ startHornetQServer(acceptorFactory);
JMSServerControl control = createManagementControl();
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -477,7 +477,7 @@
// restart the server with a discovery group configuration
serverManager.stop();
- startMessagingServer(8765);
+ startHornetQServer(8765);
for (String cfJNDIBinding : cfJNDIBindings)
{
@@ -545,7 +545,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- server = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ server = HornetQ.newHornetQServer(conf, mbeanServer, false);
context = new InVMContext();
serverManager = new JMSServerManagerImpl(server);
@@ -601,7 +601,7 @@
checkResource(ObjectNames.getConnectionFactoryObjectName(cfName));
}
- private JMSServerManager startMessagingServer(int discoveryPort) throws Exception
+ private JMSServerManager startHornetQServer(int discoveryPort) throws Exception
{
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(false);
@@ -612,7 +612,7 @@
"231.7.7.7",
discoveryPort,
ConfigurationImpl.DEFAULT_BROADCAST_REFRESH_TIMEOUT));
- HornetQServer server = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, mbeanServer, false);
context = new InVMContext();
JMSServerManagerImpl serverManager = new JMSServerManagerImpl(server);
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -413,7 +413,7 @@
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
- server = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ server = HornetQ.newHornetQServer(conf, mbeanServer, false);
server.start();
serverManager = new JMSServerManagerImpl(server);
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -336,7 +336,7 @@
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations()
.add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
- server = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ server = HornetQ.newHornetQServer(conf, mbeanServer, false);
server.start();
serverManager = new JMSServerManagerImpl(server);
Modified: trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -67,7 +67,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(acceptorConfig);
- service = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ service = HornetQ.newHornetQServer(conf, mbeanServer, false);
service.start();
AcceptorControl acceptorControl = createManagementControl(acceptorConfig.getName());
@@ -85,7 +85,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(acceptorConfig);
- service = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ service = HornetQ.newHornetQServer(conf, mbeanServer, false);
service.start();
AcceptorControl acceptorControl = createManagementControl(acceptorConfig.getName());
Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -344,7 +344,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- server = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ server = HornetQ.newHornetQServer(conf, mbeanServer, false);
server.start();
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -282,7 +282,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- server = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ server = HornetQ.newHornetQServer(conf, mbeanServer, false);
server.start();
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -180,10 +180,10 @@
conf_0.getQueueConfigurations().add(sourceQueueConfig);
conf_0.getBridgeConfigurations().add(bridgeConfig);
- server_1 = HornetQ.newMessagingServer(conf_1, MBeanServerFactory.createMBeanServer(), false);
+ server_1 = HornetQ.newHornetQServer(conf_1, MBeanServerFactory.createMBeanServer(), false);
server_1.start();
- server_0 = HornetQ.newMessagingServer(conf_0, mbeanServer, false);
+ server_0 = HornetQ.newHornetQServer(conf_0, mbeanServer, false);
server_0.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -156,10 +156,10 @@
conf_0.getQueueConfigurations().add(sourceQueueConfig);
conf_0.getBridgeConfigurations().add(bridgeConfig);
- server_1 = HornetQ.newMessagingServer(conf_1, MBeanServerFactory.createMBeanServer(), false);
+ server_1 = HornetQ.newHornetQServer(conf_1, MBeanServerFactory.createMBeanServer(), false);
server_1.start();
- server_0 = HornetQ.newMessagingServer(conf_0, mbeanServer, false);
+ server_0 = HornetQ.newHornetQServer(conf_0, mbeanServer, false);
server_0.start();
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
Modified: trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -86,7 +86,7 @@
conf.getConnectorConfigurations().put(connectorConfiguration.getName(), connectorConfiguration);
conf.getBroadcastGroupConfigurations().add(broadcastGroupConfig);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- service = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ service = HornetQ.newHornetQServer(conf, mbeanServer, false);
service.start();
BroadcastGroupControl broadcastGroupControl = createManagementControl(broadcastGroupConfig.getName());
@@ -128,7 +128,7 @@
conf.getConnectorConfigurations().put(connectorConfiguration.getName(), connectorConfiguration);
conf.getBroadcastGroupConfigurations().add(broadcastGroupConfig);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- service = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ service = HornetQ.newHornetQServer(conf, mbeanServer, false);
service.start();
BroadcastGroupControl broadcastGroupControl = createManagementControl(broadcastGroupConfig.getName());
Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -161,10 +161,10 @@
conf_0.getConnectorConfigurations().put(connectorConfig.getName(), connectorConfig);
conf_0.getClusterConfigurations().add(clusterConnectionConfig);
- server_1 = HornetQ.newMessagingServer(conf_1, MBeanServerFactory.createMBeanServer(), false);
+ server_1 = HornetQ.newHornetQServer(conf_1, MBeanServerFactory.createMBeanServer(), false);
server_1.start();
- server_0 = HornetQ.newMessagingServer(conf_0, mbeanServer, false);
+ server_0 = HornetQ.newHornetQServer(conf_0, mbeanServer, false);
server_0.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -60,7 +60,7 @@
conf.setClustered(true);
conf.getDiscoveryGroupConfigurations().put(discoveryGroupConfig.getName(), discoveryGroupConfig);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- service = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ service = HornetQ.newHornetQServer(conf, mbeanServer, false);
service.start();
DiscoveryGroupControl discoveryGroupControl = createManagementControl(discoveryGroupConfig.getName());
@@ -81,7 +81,7 @@
conf.setClustered(true);
conf.getDiscoveryGroupConfigurations().put(discoveryGroupConfig.getName(), discoveryGroupConfig);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- service = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ service = HornetQ.newHornetQServer(conf, mbeanServer, false);
service.start();
DiscoveryGroupControl discoveryGroupControl = createManagementControl(discoveryGroupConfig.getName());
Modified: trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -105,7 +105,7 @@
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
conf.getConnectorConfigurations().put(connectorConfig.getName(), connectorConfig);
- service = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ service = HornetQ.newHornetQServer(conf, mbeanServer, false);
service.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -303,7 +303,7 @@
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- server = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ server = HornetQ.newHornetQServer(conf, mbeanServer, false);
conf.getConnectorConfigurations().put(connectorConfig.getName(), connectorConfig);
server.start();
}
@@ -325,7 +325,7 @@
protected HornetQServerControl createManagementControl() throws Exception
{
- return ManagementControlHelper.createMessagingServerControl(mbeanServer);
+ return ManagementControlHelper.createHornetQServerControl(mbeanServer);
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementControlHelper.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ManagementControlHelper.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementControlHelper.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -92,9 +92,9 @@
mbeanServer);
}
- public static HornetQServerControl createMessagingServerControl(MBeanServer mbeanServer) throws Exception
+ public static HornetQServerControl createHornetQServerControl(MBeanServer mbeanServer) throws Exception
{
- return (HornetQServerControl)createProxy(ObjectNames.getMessagingServerObjectName(),
+ return (HornetQServerControl)createProxy(ObjectNames.getHornetQServerObjectName(),
HornetQServerControl.class,
mbeanServer);
}
Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -55,7 +55,7 @@
Configuration conf = new ConfigurationImpl();
conf.setJMXManagementEnabled(false);
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
// invoke attribute and operation on the server
@@ -80,7 +80,7 @@
Configuration conf = new ConfigurationImpl();
conf.setJMXManagementEnabled(false);
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
// invoke attribute and operation on the server
@@ -104,7 +104,7 @@
Configuration conf = new ConfigurationImpl();
conf.setJMXManagementEnabled(false);
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
// invoke attribute and operation on the server
@@ -128,7 +128,7 @@
Configuration conf = new ConfigurationImpl();
conf.setJMXManagementEnabled(false);
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
// invoke attribute and operation on the server
Modified: trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -200,7 +200,7 @@
conf.setJMXManagementEnabled(false);
conf.getAcceptorConfigurations()
.add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- service = HornetQ.newMessagingServer(conf, false);
+ service = HornetQ.newHornetQServer(conf, false);
service.start();
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -13,7 +13,7 @@
package org.hornetq.tests.integration.management;
-import static org.hornetq.tests.integration.management.ManagementControlHelper.createMessagingServerControl;
+import static org.hornetq.tests.integration.management.ManagementControlHelper.createHornetQServerControl;
import static org.hornetq.tests.integration.management.ManagementControlHelper.createQueueControl;
import static org.hornetq.tests.util.RandomUtil.randomBoolean;
import static org.hornetq.tests.util.RandomUtil.randomInt;
@@ -1100,7 +1100,7 @@
session.createQueue(address, queue, null, false);
QueueControl queueControl = createManagementControl(address, queue);
- HornetQServerControl serverControl = createMessagingServerControl(mbeanServer);
+ HornetQServerControl serverControl = createHornetQServerControl(mbeanServer);
serverControl.enableMessageCounters();
serverControl.setMessageCounterSamplePeriod(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD);
@@ -1152,7 +1152,7 @@
session.createQueue(address, queue, null, false);
QueueControl queueControl = createManagementControl(address, queue);
- HornetQServerControl serverControl = createMessagingServerControl(mbeanServer);
+ HornetQServerControl serverControl = createHornetQServerControl(mbeanServer);
serverControl.enableMessageCounters();
serverControl.setMessageCounterSamplePeriod(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD);
@@ -1219,7 +1219,7 @@
session.createQueue(address, queue, null, false);
QueueControl queueControl = createManagementControl(address, queue);
- HornetQServerControl serverControl = createMessagingServerControl(mbeanServer);
+ HornetQServerControl serverControl = createHornetQServerControl(mbeanServer);
serverControl.enableMessageCounters();
serverControl.setMessageCounterSamplePeriod(counterPeriod);
@@ -1239,7 +1239,7 @@
session.createQueue(address, queue, null, false);
QueueControl queueControl = createManagementControl(address, queue);
- HornetQServerControl serverControl = createMessagingServerControl(mbeanServer);
+ HornetQServerControl serverControl = createHornetQServerControl(mbeanServer);
serverControl.enableMessageCounters();
serverControl.setMessageCounterSamplePeriod(counterPeriod);
@@ -1262,7 +1262,7 @@
conf.setSecurityEnabled(false);
conf.setJMXManagementEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- server = HornetQ.newMessagingServer(conf, mbeanServer, false);
+ server = HornetQ.newHornetQServer(conf, mbeanServer, false);
server.start();
ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -57,7 +57,7 @@
{
super.setUp();
- service = setupAndStartMessagingServer();
+ service = setupAndStartHornetQServer();
}
@Override
@@ -70,7 +70,7 @@
super.tearDown();
}
- protected abstract HornetQServer setupAndStartMessagingServer() throws Exception;
+ protected abstract HornetQServer setupAndStartHornetQServer() throws Exception;
protected void doSendManagementMessage(String user, String password, boolean expectSuccess) throws Exception
{
Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -83,12 +83,12 @@
// Protected -----------------------------------------------------
- protected HornetQServer setupAndStartMessagingServer() throws Exception
+ protected HornetQServer setupAndStartHornetQServer() throws Exception
{
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
HierarchicalRepository<Set<Role>> securityRepository = server.getSecurityRepository();
HornetQSecurityManagerImpl securityManager = (HornetQSecurityManagerImpl)server.getSecurityManager();
Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -59,12 +59,12 @@
// Protected -----------------------------------------------------
@Override
- protected HornetQServer setupAndStartMessagingServer() throws Exception
+ protected HornetQServer setupAndStartHornetQServer() throws Exception
{
Configuration conf = new ConfigurationImpl();
conf.setSecurityEnabled(true);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
return server;
Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -66,13 +66,13 @@
// Protected -----------------------------------------------------
@Override
- protected HornetQServer setupAndStartMessagingServer() throws Exception
+ protected HornetQServer setupAndStartHornetQServer() throws Exception
{
ConfigurationImpl conf = new ConfigurationImpl();
conf.setSecurityEnabled(true);
conf.setManagementClusterPassword(configuredClusterPassword);
conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
return server;
Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -141,7 +141,7 @@
conf.setJMXManagementEnabled(false);
conf.getAcceptorConfigurations()
.add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- server = HornetQ.newMessagingServer(conf, false);
+ server = HornetQ.newHornetQServer(conf, false);
server.start();
notifQueue = randomSimpleString();
Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -123,7 +123,7 @@
clearData();
Configuration config = createDefaultConfig();
- HornetQServer server = newMessagingServer(config);
+ HornetQServer server = newHornetQServer(config);
server.start();
@@ -208,7 +208,7 @@
// Private -------------------------------------------------------
- private HornetQServer newMessagingServer(final Configuration configuration)
+ private HornetQServer newHornetQServer(final Configuration configuration)
{
HornetQSecurityManager securityManager = new HornetQSecurityManagerImpl();
Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -100,7 +100,7 @@
*/
public void testSynchronousClose() throws Exception
{
- assertEquals(0, server.getMessagingServerControl().listRemoteAddresses().length);
+ assertEquals(0, server.getHornetQServerControl().listRemoteAddresses().length);
ClientSessionFactory sf = createSessionFactory();
Modified: trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -75,7 +75,7 @@
ConfigurationImpl config = new ConfigurationImpl();
config.setSecurityEnabled(false);
config.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName()));
- messagingService = HornetQ.newMessagingServer(config, false);
+ messagingService = HornetQ.newHornetQServer(config, false);
messagingService.start();
}
Modified: trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -286,7 +286,7 @@
configuration.setMessageExpiryScanPeriod(1000);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- server = HornetQ.newMessagingServer(configuration, false);
+ server = HornetQ.newHornetQServer(configuration, false);
// start the server
server.start();
// then we create a client as normal
Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -547,7 +547,7 @@
configuration.setSecurityEnabled(false);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- server = HornetQ.newMessagingServer(configuration, false);
+ server = HornetQ.newHornetQServer(configuration, false);
// start the server
server.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -74,7 +74,7 @@
conf.setQueueConfigurations(queueConfs);
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
@@ -144,7 +144,7 @@
conf.setQueueConfigurations(queueConfs);
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
@@ -212,7 +212,7 @@
final String queueName3 = "queue3";
- HornetQServer server = HornetQ.newMessagingServer(conf);
+ HornetQServer server = HornetQ.newHornetQServer(conf);
server.start();
@@ -325,7 +325,7 @@
conf.setQueueConfigurations(queueConfs);
- HornetQServer server = HornetQ.newMessagingServer(conf);
+ HornetQServer server = HornetQ.newHornetQServer(conf);
server.start();
@@ -411,7 +411,7 @@
conf.setQueueConfigurations(queueConfs);
- HornetQServer server = HornetQ.newMessagingServer(conf, false);
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
server.start();
Modified: trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -103,7 +103,7 @@
// Map<String, Object> params = new HashMap<String, Object>();
// params.put(TransportConstants.SSL_ENABLED_PROP_NAME, true);
// config.getAcceptorInfos().add(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyAcceptorFactory", params));
-// server = HornetQServerImpl.newNullStorageMessagingServer(config);
+// server = HornetQServerImpl.newNullStorageHornetQServer(config);
// server.start();
// ConnectorFactory cf = new NettyConnectorFactory();
// ClientSessionFactory sf = new ClientSessionFactoryImpl(cf);
Modified: trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -75,7 +75,7 @@
configuration.setTransactionTimeoutScanPeriod(500);
TransportConfiguration transportConfig = new TransportConfiguration(INVM_ACCEPTOR_FACTORY);
configuration.getAcceptorConfigurations().add(transportConfig);
- messagingService = HornetQ.newMessagingServer(configuration, false);
+ messagingService = HornetQ.newHornetQServer(configuration, false);
//start the server
messagingService.start();
//then we create a client as normal
Modified: trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -446,7 +446,7 @@
config.setSecurityEnabled(false);
config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
InVMContext context = new InVMContext();
- jmsServer = new JMSServerManagerImpl(HornetQ.newMessagingServer(config, false));
+ jmsServer = new JMSServerManagerImpl(HornetQ.newHornetQServer(config, false));
jmsServer.setContext(context);
jmsServer.start();
Modified: trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -511,7 +511,7 @@
}
/* (non-Javadoc)
- * @see org.hornetq.core.management.MessagingServerControlMBean#getAIOBufferSize()
+ * @see org.hornetq.core.management.HornetQServerControlMBean#getAIOBufferSize()
*/
public int getAIOBufferSize()
{
@@ -520,7 +520,7 @@
}
/* (non-Javadoc)
- * @see org.hornetq.core.management.MessagingServerControlMBean#getAIOBufferTimeout()
+ * @see org.hornetq.core.management.HornetQServerControlMBean#getAIOBufferTimeout()
*/
public int getAIOBufferTimeout()
{
@@ -528,7 +528,7 @@
}
/* (non-Javadoc)
- * @see org.hornetq.core.management.MessagingServerControlMBean#getAIOFlushOnSync()
+ * @see org.hornetq.core.management.HornetQServerControlMBean#getAIOFlushOnSync()
*/
public boolean isAIOFlushOnSync()
{
Modified: trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -65,7 +65,7 @@
try
{
- HornetQServer server = HornetQ.newMessagingServer(new ConfigurationImpl());
+ HornetQServer server = HornetQ.newHornetQServer(new ConfigurationImpl());
ConnectionMetaData meta = new HornetQConnectionMetaData(server.getVersion());
Modified: trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2009-08-20 17:43:35 UTC (rev 7841)
+++ trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2009-08-20 17:45:57 UTC (rev 7842)
@@ -143,11 +143,11 @@
if (realFiles)
{
- server = HornetQ.newMessagingServer(configuration);
+ server = HornetQ.newHornetQServer(configuration);
}
else
{
- server = HornetQ.newMessagingServer(configuration, false);
+ server = HornetQ.newHornetQServer(configuration, false);
}
for (Map.Entry<String, AddressSettings> setting : settings.entrySet())
@@ -173,11 +173,11 @@
if (realFiles)
{
- server = HornetQ.newMessagingServer(configuration, mbeanServer);
+ server = HornetQ.newHornetQServer(configuration, mbeanServer);
}
else
{
- server = HornetQ.newMessagingServer(configuration, mbeanServer, false);
+ server = HornetQ.newHornetQServer(configuration, mbeanServer, false);
}
for (Map.Entry<String, AddressSettings> setting : settings.entrySet())
@@ -209,13 +209,13 @@
if (realFiles)
{
- server = HornetQ.newMessagingServer(configuration,
+ server = HornetQ.newHornetQServer(configuration,
ManagementFactory.getPlatformMBeanServer(),
securityManager);
}
else
{
- server = HornetQ.newMessagingServer(configuration,
+ server = HornetQ.newHornetQServer(configuration,
ManagementFactory.getPlatformMBeanServer(),
securityManager,
false);
More information about the hornetq-commits
mailing list