August 2009 - hornetq-commits - Jboss List Archives

JBoss hornetq SVN: r7842 - in trunk: docs/quickstart-guide/en and 130 other directories.

by do-not-reply＠jboss.org

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">  - <depends>MessagingServer</depends> + <depends>HornetQServer</depends> <constructor>  <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>  - <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>  -<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>  - <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"/>  - <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">  - <depends>MessagingServer</depends> + <depends>HornetQServer</depends> <constructor>  <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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" />  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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"/>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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"/>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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>  - <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(a)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>  - <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>  - <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);

15 years, 4 months

1
0
0 / 0

JBoss hornetq SVN: r7841 - trunk/native/bin.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2009-08-20 13:43:35 -0400 (Thu, 20 Aug 2009) New Revision: 7841 Added: trunk/native/bin/libHornetQAIO_ia64.so Removed: trunk/native/bin/libHornetQAIO_is64.so Log: renaming file Copied: trunk/native/bin/libHornetQAIO_ia64.so (from rev 7840, trunk/native/bin/libHornetQAIO_is64.so) =================================================================== (Binary files differ) Deleted: trunk/native/bin/libHornetQAIO_is64.so =================================================================== (Binary files differ)

15 years, 4 months

1
0
0 / 0

JBoss hornetq SVN: r7840 - trunk/native/bin.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2009-08-20 13:39:11 -0400 (Thu, 20 Aug 2009) New Revision: 7840 Added: trunk/native/bin/libHornetQAIO_is64.so Log: ia64 bits compilation from dev15 @ qa lab Added: trunk/native/bin/libHornetQAIO_is64.so =================================================================== (Binary files differ) Property changes on: trunk/native/bin/libHornetQAIO_is64.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream

15 years, 4 months

1
0
0 / 0

JBoss hornetq SVN: r7839 - in trunk: examples/javaee/xarecovery/server and 43 other directories.

by do-not-reply＠jboss.org

Author: timfox Date: 2009-08-20 13:26:39 -0400 (Thu, 20 Aug 2009) New Revision: 7839 Added: trunk/src/main/org/hornetq/core/management/HornetQComponentControl.java trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java trunk/src/main/org/hornetq/core/server/HornetQComponent.java trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder.java trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceRecovery.java trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareHornetQServerControlWrapperTest.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/HornetQXAResourceRecoveryTest.java Removed: trunk/src/main/org/hornetq/core/management/MessagingComponentControl.java trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java trunk/src/main/org/hornetq/core/server/MessagingComponent.java trunk/src/main/org/hornetq/integration/transports/netty/MessagingFrameDecoder.java trunk/src/main/org/hornetq/jms/server/recovery/MessagingXAResourceRecovery.java trunk/src/main/org/hornetq/jms/server/recovery/MessagingXAResourceWrapper.java trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java trunk/tests/src/org/hornetq/tests/integration/management/MessagingServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/MessagingServerControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/MessagingBufferTestBase.java trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/MessagingXAResourceRecoveryTest.java Modified: trunk/docs/user-manual/en/appserver-integration.xml trunk/examples/javaee/xarecovery/server/jbossts-properties.xml trunk/src/main/org/hornetq/core/cluster/DiscoveryGroup.java trunk/src/main/org/hornetq/core/config/Configuration.java trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java trunk/src/main/org/hornetq/core/deployers/Deployer.java trunk/src/main/org/hornetq/core/deployers/DeploymentManager.java trunk/src/main/org/hornetq/core/deployers/impl/XmlDeployer.java trunk/src/main/org/hornetq/core/journal/Journal.java trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java trunk/src/main/org/hornetq/core/management/AcceptorControl.java trunk/src/main/org/hornetq/core/management/BridgeControl.java trunk/src/main/org/hornetq/core/management/BroadcastGroupControl.java trunk/src/main/org/hornetq/core/management/ClusterConnectionControl.java trunk/src/main/org/hornetq/core/management/DiscoveryGroupControl.java trunk/src/main/org/hornetq/core/management/ManagementService.java trunk/src/main/org/hornetq/core/management/impl/ManagementServiceImpl.java trunk/src/main/org/hornetq/core/paging/PagingManager.java trunk/src/main/org/hornetq/core/paging/PagingStore.java trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java trunk/src/main/org/hornetq/core/persistence/StorageManager.java trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java trunk/src/main/org/hornetq/core/postoffice/PostOffice.java trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java trunk/src/main/org/hornetq/core/remoting/server/RemotingService.java trunk/src/main/org/hornetq/core/remoting/spi/Acceptor.java trunk/src/main/org/hornetq/core/security/HornetQSecurityManager.java trunk/src/main/org/hornetq/core/security/impl/HornetQSecurityManagerImpl.java trunk/src/main/org/hornetq/core/security/impl/JAASSecurityManager.java trunk/src/main/org/hornetq/core/server/HornetQServer.java trunk/src/main/org/hornetq/core/server/MemoryManager.java trunk/src/main/org/hornetq/core/server/cluster/Bridge.java trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroup.java trunk/src/main/org/hornetq/core/server/cluster/ClusterConnection.java trunk/src/main/org/hornetq/core/server/cluster/ClusterManager.java trunk/src/main/org/hornetq/core/transaction/ResourceManager.java trunk/src/main/org/hornetq/core/transaction/impl/ResourceManagerImpl.java trunk/src/main/org/hornetq/integration/security/JBossASSecurityManager.java trunk/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java trunk/src/main/org/hornetq/jms/bridge/BridgeService.java trunk/src/main/org/hornetq/jms/bridge/JMSBridge.java trunk/src/main/org/hornetq/jms/bridge/impl/JMSBridgeImpl.java trunk/src/main/org/hornetq/jms/server/JMSServerManager.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java trunk/tests/jms-tests/config/jbossjta-properties.xml trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.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/TemporaryQueueTest.java trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/ByteBufferWrapperTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakePostOffice.java trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java Log: renamed more Messaging* classes Modified: trunk/docs/user-manual/en/appserver-integration.xml =================================================================== --- trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 17:26:39 UTC (rev 7839) @@ -1009,7 +1009,7 @@ ... <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1" - value="org.hornetq.jms.server.recovery.MessagingXAResourceRecovery;[connection configuration]"/> + value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;[connection configuration]"/> </properties> </programlisting> <para>The <literal>[connection configuration]</literal> contains all the information @@ -1055,7 +1055,7 @@ >conf/jbossts-properties.xml</literal> is:</para> <programlisting> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1" - value="org.hornetq.jms.server.recovery.MessagingXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/> + value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/> </programlisting> <para>If it is now configured with a netty acceptor on a non-default port:</para> <programlisting> @@ -1068,7 +1068,7 @@ >conf/jbossts-properties.xml</literal> is:</para> <programlisting> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1" - value="org.hornetq.jms.server.recovery.MessagingXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, , , hornetq.remoting.netty.port=8888"/> + value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, , , hornetq.remoting.netty.port=8888"/> </programlisting> <note> <para>Note the additional commas to skip the user and password before connector @@ -1078,7 +1078,7 @@ configuration would have been:</para> <programlisting> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1" - value="org.hornetq.jms.server.recovery.MessagingXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, admin, adminpass, hornetq.remoting.netty.port=8888"/> + value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, admin, adminpass, hornetq.remoting.netty.port=8888"/> </programlisting> <para>Configuring HornetQ with an invm acceptor and configuring the Recovery Manager with an invm connector is the recommended way to enable XA Recovery.</para> Modified: trunk/examples/javaee/xarecovery/server/jbossts-properties.xml =================================================================== --- trunk/examples/javaee/xarecovery/server/jbossts-properties.xml 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/examples/javaee/xarecovery/server/jbossts-properties.xml 2009-08-20 17:26:39 UTC (rev 7839) @@ -240,7 +240,7 @@ com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple --> <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" - value="org.hornetq.jms.server.recovery.MessagingXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/> + value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/> </properties> <properties depends="arjuna,txoj,jta" name="recoverymanager">  -<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ" value="org.hornetq.jms.server.recovery.MessagingXAResourceRecovery;adaptor1"/> +<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ" value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;adaptor1"/> 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:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -68,7 +68,7 @@ assertTrue(consumer.isClosed()); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { @@ -76,7 +76,7 @@ } }); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { @@ -84,7 +84,7 @@ } }); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -138,7 +138,7 @@ session.start(); - expectHornetQException(HornetQException.QUEUE_DOES_NOT_EXIST, new MessagingAction() + expectHornetQException(HornetQException.QUEUE_DOES_NOT_EXIST, new HornetQAction() { public void run() throws HornetQException { @@ -165,7 +165,7 @@ restart(); session.start(); - expectHornetQException(HornetQException.QUEUE_DOES_NOT_EXIST, new MessagingAction() + expectHornetQException(HornetQException.QUEUE_DOES_NOT_EXIST, new HornetQAction() { public void run() throws HornetQException { 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:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -59,7 +59,7 @@ assertTrue(producer.isClosed()); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { 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:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -160,7 +160,7 @@ session.close(); - expectHornetQException("ClientRequestor's session must not be closed", HornetQException.OBJECT_CLOSED, new MessagingAction(){ + expectHornetQException("ClientRequestor's session must not be closed", HornetQException.OBJECT_CLOSED, new HornetQAction(){ public void run() throws Exception { new ClientRequestor(session, requestAddress); @@ -198,7 +198,7 @@ requestor.close(); - expectHornetQException("can not send a request on a closed ClientRequestor", HornetQException.OBJECT_CLOSED, new MessagingAction(){ + expectHornetQException("can not send a request on a closed ClientRequestor", HornetQException.OBJECT_CLOSED, new HornetQAction(){ public void run() throws Exception { 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:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -69,7 +69,7 @@ assertTrue(session.isClosed()); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { @@ -77,7 +77,7 @@ } }); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { @@ -85,7 +85,7 @@ } }); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { @@ -93,7 +93,7 @@ } }); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { @@ -101,7 +101,7 @@ } }); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { @@ -109,7 +109,7 @@ } }); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { @@ -117,7 +117,7 @@ } }); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { @@ -125,7 +125,7 @@ } }); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { @@ -133,7 +133,7 @@ } }); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { @@ -141,7 +141,7 @@ } }); - expectHornetQException(HornetQException.OBJECT_CLOSED, new MessagingAction() + expectHornetQException(HornetQException.OBJECT_CLOSED, new HornetQAction() { public void run() throws HornetQException { @@ -161,7 +161,7 @@ assertTrue(session.isXA()); assertTrue(session.isClosed()); - expectXAException(XAException.XAER_RMERR, new MessagingAction() + expectXAException(XAException.XAER_RMERR, new HornetQAction() { public void run() throws XAException { @@ -169,7 +169,7 @@ } }); - expectXAException(XAException.XAER_RMERR, new MessagingAction() + expectXAException(XAException.XAER_RMERR, new HornetQAction() { public void run() throws XAException { @@ -177,7 +177,7 @@ } }); - expectXAException(XAException.XAER_RMERR, new MessagingAction() + expectXAException(XAException.XAER_RMERR, new HornetQAction() { public void run() throws XAException { @@ -185,7 +185,7 @@ } }); - expectXAException(XAException.XAER_RMERR, new MessagingAction() + expectXAException(XAException.XAER_RMERR, new HornetQAction() { public void run() throws XAException { @@ -193,7 +193,7 @@ } }); - expectXAException(XAException.XAER_RMERR, new MessagingAction() + expectXAException(XAException.XAER_RMERR, new HornetQAction() { public void run() throws XAException { @@ -201,7 +201,7 @@ } }); - expectXAException(XAException.XAER_RMERR, new MessagingAction() + expectXAException(XAException.XAER_RMERR, new HornetQAction() { public void run() throws XAException { @@ -209,7 +209,7 @@ } }); - expectXAException(XAException.XAER_RMERR, new MessagingAction() + expectXAException(XAException.XAER_RMERR, new HornetQAction() { public void run() throws XAException { Modified: trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -207,7 +207,7 @@ session = sf.createSession(false, true, true); session.start(); - expectHornetQException("temp queue must not exist after the server detected the client crash", HornetQException.QUEUE_DOES_NOT_EXIST, new MessagingAction() + expectHornetQException("temp queue must not exist after the server detected the client crash", HornetQException.QUEUE_DOES_NOT_EXIST, new HornetQAction() { public void run() throws HornetQException { Copied: trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareHornetQServerControlWrapperTest.java (from rev 7831, trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java) =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareHornetQServerControlWrapperTest.java (rev 0) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareHornetQServerControlWrapperTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -0,0 +1,239 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.tests.integration.cluster.management; + +import static org.hornetq.tests.integration.management.ManagementControlHelper.createMessagingServerControl; +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; +import static org.hornetq.tests.util.RandomUtil.randomSimpleString; + +import javax.management.ObjectName; + +import org.hornetq.core.client.ClientMessage; +import org.hornetq.core.client.ClientProducer; +import org.hornetq.core.client.ClientSession; +import org.hornetq.core.client.impl.ClientSessionFactoryImpl; +import org.hornetq.core.client.impl.ClientSessionFactoryInternal; +import org.hornetq.core.config.TransportConfiguration; +import org.hornetq.core.management.MessageCounterInfo; +import org.hornetq.core.management.HornetQServerControl; +import org.hornetq.core.management.ObjectNames; +import org.hornetq.core.management.QueueControl; +import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; +import org.hornetq.tests.util.RandomUtil; +import org.hornetq.utils.SimpleString; + +/** + * A ReplicationAwareQueueControlWrapperTest + * + * @author <a href="jmesnil(a)redhat.com">Jeff Mesnil</a> + */ +public class ReplicationAwareHornetQServerControlWrapperTest extends ReplicationAwareTestBase +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + private SimpleString address; + + private ClientSession session; + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + public void testCreateQueue() throws Exception + { + SimpleString address = randomSimpleString(); + SimpleString name = randomSimpleString(); + + HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); + ObjectName queueON = ObjectNames.getQueueObjectName(address, name); + + assertResourceNotExists(liveMBeanServer, queueON); + assertResourceNotExists(backupMBeanServer, queueON); + + liveServerControl.createQueue(address.toString(), name.toString()); + + assertResourceExists(liveMBeanServer, queueON); + assertResourceExists(backupMBeanServer, queueON); + } + + public void testDestroyQueue() throws Exception + { + SimpleString address = randomSimpleString(); + SimpleString name = randomSimpleString(); + + HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); + ObjectName queueON = ObjectNames.getQueueObjectName(address, name); + + assertResourceNotExists(liveMBeanServer, queueON); + assertResourceNotExists(backupMBeanServer, queueON); + + // create the queue... + liveServerControl.createQueue(address.toString(), name.toString()); + + assertResourceExists(liveMBeanServer, queueON); + assertResourceExists(backupMBeanServer, queueON); + + // ... and destroy it + liveServerControl.destroyQueue(name.toString()); + + assertResourceNotExists(liveMBeanServer, queueON); + assertResourceNotExists(backupMBeanServer, queueON); + } + + public void testEnableMessageCounters() throws Exception + { + HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); + HornetQServerControl backupServerControl = createMessagingServerControl(backupMBeanServer); + + assertFalse(liveServerControl.isMessageCounterEnabled()); + assertFalse(backupServerControl.isMessageCounterEnabled()); + + liveServerControl.enableMessageCounters(); + + assertTrue(liveServerControl.isMessageCounterEnabled()); + assertTrue(backupServerControl.isMessageCounterEnabled()); + } + + public void testDisableMessageCounters() throws Exception + { + HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); + HornetQServerControl backupServerControl = createMessagingServerControl(backupMBeanServer); + + assertFalse(liveServerControl.isMessageCounterEnabled()); + assertFalse(backupServerControl.isMessageCounterEnabled()); + + // enable the counters... + liveServerControl.enableMessageCounters(); + + assertTrue(liveServerControl.isMessageCounterEnabled()); + assertTrue(backupServerControl.isMessageCounterEnabled()); + + // and disable them + liveServerControl.disableMessageCounters(); + + assertFalse(liveServerControl.isMessageCounterEnabled()); + assertFalse(backupServerControl.isMessageCounterEnabled()); + } + + public void testResetAllMessageCounters() throws Exception + { + HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); + liveServerControl.enableMessageCounters(); + liveServerControl.setMessageCounterSamplePeriod(2000); + + QueueControl liveQueueControl = createQueueControl(address, address, liveMBeanServer); + QueueControl backupQueueControl = createQueueControl(address, address, backupMBeanServer); + + // send on queue + ClientProducer producer = session.createProducer(address); + ClientMessage message = session.createClientMessage(false); + SimpleString key = randomSimpleString(); + long value = randomLong(); + message.putLongProperty(key, value); + producer.send(message); + + Thread.sleep(liveServerControl.getMessageCounterSamplePeriod() * 2); + + // check the count is to 1 on both live & backup nodes + String jsonString = liveQueueControl.listMessageCounter(); + MessageCounterInfo counter = MessageCounterInfo.fromJSON(jsonString); + + assertEquals(1, counter.getCount()); + counter = MessageCounterInfo.fromJSON(backupQueueControl.listMessageCounter()); + assertEquals(1, counter.getCount()); + + liveServerControl.resetAllMessageCounters(); + Thread.sleep(liveServerControl.getMessageCounterSamplePeriod() * 2); + + // check the count has been reset to 0 on both live & backup nodes + counter = MessageCounterInfo.fromJSON(liveQueueControl.listMessageCounter()); + assertEquals(0, counter.getCount()); + counter = MessageCounterInfo.fromJSON(backupQueueControl.listMessageCounter()); + assertEquals(0, counter.getCount()); + } + + public void testSetMessageCounterSamplePeriod() throws Exception + { + long newPeriod = randomPositiveLong(); + + HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); + HornetQServerControl backupServerControl = createMessagingServerControl(backupMBeanServer); + + assertEquals(liveServerControl.getMessageCounterSamplePeriod(), + backupServerControl.getMessageCounterSamplePeriod()); + + liveServerControl.setMessageCounterSamplePeriod(newPeriod); + + assertEquals(newPeriod, liveServerControl.getMessageCounterSamplePeriod()); + assertEquals(newPeriod, backupServerControl.getMessageCounterSamplePeriod()); + } + + public void testSetMessageCounterMaxDayCount() throws Exception + { + int newCount = RandomUtil.randomPositiveInt(); + + HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); + HornetQServerControl backupServerControl = createMessagingServerControl(backupMBeanServer); + + assertEquals(liveServerControl.getMessageCounterMaxDayCount(), backupServerControl.getMessageCounterMaxDayCount()); + + liveServerControl.setMessageCounterMaxDayCount(newCount); + + assertEquals(newCount, liveServerControl.getMessageCounterMaxDayCount()); + assertEquals(newCount, backupServerControl.getMessageCounterMaxDayCount()); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + address = RandomUtil.randomSimpleString(); + + ClientSessionFactoryInternal sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()), + new TransportConfiguration(InVMConnectorFactory.class.getName(), + backupParams)); + + session = sf.createSession(false, true, true); + + session.createQueue(address, address, null, false); + } + + @Override + protected void tearDown() throws Exception + { + session.close(); + + session = null; + + address = null; + + super.tearDown(); + } + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -1,239 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.tests.integration.cluster.management; - -import static org.hornetq.tests.integration.management.ManagementControlHelper.createMessagingServerControl; -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; -import static org.hornetq.tests.util.RandomUtil.randomSimpleString; - -import javax.management.ObjectName; - -import org.hornetq.core.client.ClientMessage; -import org.hornetq.core.client.ClientProducer; -import org.hornetq.core.client.ClientSession; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.config.TransportConfiguration; -import org.hornetq.core.management.MessageCounterInfo; -import org.hornetq.core.management.HornetQServerControl; -import org.hornetq.core.management.ObjectNames; -import org.hornetq.core.management.QueueControl; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.utils.SimpleString; - -/** - * A ReplicationAwareQueueControlWrapperTest - * - * @author <a href="jmesnil(a)redhat.com">Jeff Mesnil</a> - */ -public class ReplicationAwareMessagingServerControlWrapperTest extends ReplicationAwareTestBase -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - private SimpleString address; - - private ClientSession session; - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - public void testCreateQueue() throws Exception - { - SimpleString address = randomSimpleString(); - SimpleString name = randomSimpleString(); - - HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); - ObjectName queueON = ObjectNames.getQueueObjectName(address, name); - - assertResourceNotExists(liveMBeanServer, queueON); - assertResourceNotExists(backupMBeanServer, queueON); - - liveServerControl.createQueue(address.toString(), name.toString()); - - assertResourceExists(liveMBeanServer, queueON); - assertResourceExists(backupMBeanServer, queueON); - } - - public void testDestroyQueue() throws Exception - { - SimpleString address = randomSimpleString(); - SimpleString name = randomSimpleString(); - - HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); - ObjectName queueON = ObjectNames.getQueueObjectName(address, name); - - assertResourceNotExists(liveMBeanServer, queueON); - assertResourceNotExists(backupMBeanServer, queueON); - - // create the queue... - liveServerControl.createQueue(address.toString(), name.toString()); - - assertResourceExists(liveMBeanServer, queueON); - assertResourceExists(backupMBeanServer, queueON); - - // ... and destroy it - liveServerControl.destroyQueue(name.toString()); - - assertResourceNotExists(liveMBeanServer, queueON); - assertResourceNotExists(backupMBeanServer, queueON); - } - - public void testEnableMessageCounters() throws Exception - { - HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); - HornetQServerControl backupServerControl = createMessagingServerControl(backupMBeanServer); - - assertFalse(liveServerControl.isMessageCounterEnabled()); - assertFalse(backupServerControl.isMessageCounterEnabled()); - - liveServerControl.enableMessageCounters(); - - assertTrue(liveServerControl.isMessageCounterEnabled()); - assertTrue(backupServerControl.isMessageCounterEnabled()); - } - - public void testDisableMessageCounters() throws Exception - { - HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); - HornetQServerControl backupServerControl = createMessagingServerControl(backupMBeanServer); - - assertFalse(liveServerControl.isMessageCounterEnabled()); - assertFalse(backupServerControl.isMessageCounterEnabled()); - - // enable the counters... - liveServerControl.enableMessageCounters(); - - assertTrue(liveServerControl.isMessageCounterEnabled()); - assertTrue(backupServerControl.isMessageCounterEnabled()); - - // and disable them - liveServerControl.disableMessageCounters(); - - assertFalse(liveServerControl.isMessageCounterEnabled()); - assertFalse(backupServerControl.isMessageCounterEnabled()); - } - - public void testResetAllMessageCounters() throws Exception - { - HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); - liveServerControl.enableMessageCounters(); - liveServerControl.setMessageCounterSamplePeriod(2000); - - QueueControl liveQueueControl = createQueueControl(address, address, liveMBeanServer); - QueueControl backupQueueControl = createQueueControl(address, address, backupMBeanServer); - - // send on queue - ClientProducer producer = session.createProducer(address); - ClientMessage message = session.createClientMessage(false); - SimpleString key = randomSimpleString(); - long value = randomLong(); - message.putLongProperty(key, value); - producer.send(message); - - Thread.sleep(liveServerControl.getMessageCounterSamplePeriod() * 2); - - // check the count is to 1 on both live & backup nodes - String jsonString = liveQueueControl.listMessageCounter(); - MessageCounterInfo counter = MessageCounterInfo.fromJSON(jsonString); - - assertEquals(1, counter.getCount()); - counter = MessageCounterInfo.fromJSON(backupQueueControl.listMessageCounter()); - assertEquals(1, counter.getCount()); - - liveServerControl.resetAllMessageCounters(); - Thread.sleep(liveServerControl.getMessageCounterSamplePeriod() * 2); - - // check the count has been reset to 0 on both live & backup nodes - counter = MessageCounterInfo.fromJSON(liveQueueControl.listMessageCounter()); - assertEquals(0, counter.getCount()); - counter = MessageCounterInfo.fromJSON(backupQueueControl.listMessageCounter()); - assertEquals(0, counter.getCount()); - } - - public void testSetMessageCounterSamplePeriod() throws Exception - { - long newPeriod = randomPositiveLong(); - - HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); - HornetQServerControl backupServerControl = createMessagingServerControl(backupMBeanServer); - - assertEquals(liveServerControl.getMessageCounterSamplePeriod(), - backupServerControl.getMessageCounterSamplePeriod()); - - liveServerControl.setMessageCounterSamplePeriod(newPeriod); - - assertEquals(newPeriod, liveServerControl.getMessageCounterSamplePeriod()); - assertEquals(newPeriod, backupServerControl.getMessageCounterSamplePeriod()); - } - - public void testSetMessageCounterMaxDayCount() throws Exception - { - int newCount = RandomUtil.randomPositiveInt(); - - HornetQServerControl liveServerControl = createMessagingServerControl(liveMBeanServer); - HornetQServerControl backupServerControl = createMessagingServerControl(backupMBeanServer); - - assertEquals(liveServerControl.getMessageCounterMaxDayCount(), backupServerControl.getMessageCounterMaxDayCount()); - - liveServerControl.setMessageCounterMaxDayCount(newCount); - - assertEquals(newCount, liveServerControl.getMessageCounterMaxDayCount()); - assertEquals(newCount, backupServerControl.getMessageCounterMaxDayCount()); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - address = RandomUtil.randomSimpleString(); - - ClientSessionFactoryInternal sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()), - new TransportConfiguration(InVMConnectorFactory.class.getName(), - backupParams)); - - session = sf.createSession(false, true, true); - - session.createQueue(address, address, null, false); - } - - @Override - protected void tearDown() throws Exception - { - session.close(); - - session = null; - - address = null; - - super.tearDown(); - } - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Copied: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java (from rev 7831, trunk/tests/src/org/hornetq/tests/integration/management/MessagingServerControlTest.java) =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java (rev 0) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -0,0 +1,335 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.tests.integration.management; + +import static org.hornetq.tests.util.RandomUtil.randomBoolean; +import static org.hornetq.tests.util.RandomUtil.randomString; + +import java.util.HashMap; +import java.util.Map; + +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.TransportConfiguration; +import org.hornetq.core.config.impl.ConfigurationImpl; +import org.hornetq.core.management.HornetQServerControl; +import org.hornetq.core.management.ObjectNames; +import org.hornetq.core.management.QueueControl; +import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; +import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; +import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; +import org.hornetq.core.server.HornetQ; +import org.hornetq.core.server.HornetQServer; +import org.hornetq.tests.util.RandomUtil; +import org.hornetq.utils.SimpleString; +import org.hornetq.utils.json.JSONArray; +import org.hornetq.utils.json.JSONObject; + +/** + * A QueueControlTest + * + * @author jmesnil + * + * Created 26 nov. 2008 14:18:48 + * + * + */ +public class HornetQServerControlTest extends ManagementTestBase +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private HornetQServer server; + + private Configuration conf; + + private TransportConfiguration connectorConfig; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + public void testGetAttributes() throws Exception + { + HornetQServerControl serverControl = createManagementControl(); + + assertEquals(server.getVersion().getFullVersion(), serverControl.getVersion()); + + assertEquals(conf.isClustered(), serverControl.isClustered()); + assertEquals(conf.isPersistDeliveryCountBeforeDelivery(), serverControl.isPersistDeliveryCountBeforeDelivery()); + assertEquals(conf.isBackup(), serverControl.isBackup()); + assertEquals(conf.getQueueActivationTimeout(), serverControl.getQueueActivationTimeout()); + assertEquals(conf.getScheduledThreadPoolMaxSize(), serverControl.getScheduledThreadPoolMaxSize()); + assertEquals(conf.getThreadPoolMaxSize(), serverControl.getThreadPoolMaxSize()); + assertEquals(conf.getSecurityInvalidationInterval(), serverControl.getSecurityInvalidationInterval()); + assertEquals(conf.isSecurityEnabled(), serverControl.isSecurityEnabled()); + assertEquals(conf.getInterceptorClassNames().size(), serverControl.getInterceptorClassNames().length); + assertEquals(conf.getConnectionTTLOverride(), serverControl.getConnectionTTLOverride()); + assertEquals(conf.getBackupConnectorName(), serverControl.getBackupConnectorName()); + assertEquals(conf.getManagementAddress().toString(), serverControl.getManagementAddress()); + assertEquals(conf.getManagementNotificationAddress().toString(), serverControl.getManagementNotificationAddress()); + assertEquals(conf.getManagementRequestTimeout(), serverControl.getManagementRequestTimeout()); + assertEquals(conf.getIDCacheSize(), serverControl.getIDCacheSize()); + assertEquals(conf.isPersistIDCache(), serverControl.isPersistIDCache()); + assertEquals(conf.getBindingsDirectory(), serverControl.getBindingsDirectory()); + assertEquals(conf.getJournalDirectory(), serverControl.getJournalDirectory()); + assertEquals(conf.getJournalType().toString(), serverControl.getJournalType()); + assertEquals(conf.isJournalSyncTransactional(), serverControl.isJournalSyncTransactional()); + assertEquals(conf.isJournalSyncNonTransactional(), serverControl.isJournalSyncNonTransactional()); + assertEquals(conf.getJournalFileSize(), serverControl.getJournalFileSize()); + assertEquals(conf.getJournalMinFiles(), serverControl.getJournalMinFiles()); + assertEquals(conf.getJournalMaxAIO(), serverControl.getJournalMaxAIO()); + assertEquals(conf.getAIOBufferSize(), serverControl.getAIOBufferSize()); + assertEquals(conf.getAIOBufferTimeout(), serverControl.getAIOBufferTimeout()); + assertEquals(conf.isCreateBindingsDir(), serverControl.isCreateBindingsDir()); + assertEquals(conf.isCreateJournalDir(), serverControl.isCreateJournalDir()); + assertEquals(conf.getPagingDirectory(), serverControl.getPagingDirectory()); + assertEquals(conf.getLargeMessagesDirectory(), serverControl.getLargeMessagesDirectory()); + assertEquals(conf.isWildcardRoutingEnabled(), serverControl.isWildcardRoutingEnabled()); + assertEquals(conf.getTransactionTimeout(), serverControl.getTransactionTimeout()); + assertEquals(conf.isMessageCounterEnabled(), serverControl.isMessageCounterEnabled()); + assertEquals(conf.getTransactionTimeoutScanPeriod(), serverControl.getTransactionTimeoutScanPeriod()); + assertEquals(conf.getMessageExpiryScanPeriod(), serverControl.getMessageExpiryScanPeriod()); + assertEquals(conf.getMessageExpiryThreadPriority(), serverControl.getMessageExpiryThreadPriority()); + } + + public void testGetConnectors() throws Exception + { + HornetQServerControl serverControl = createManagementControl(); + + Object[] connectorData = serverControl.getConnectors(); + assertNotNull(connectorData); + assertEquals(1, connectorData.length); + + Object[] config = (Object[])connectorData[0]; + + assertEquals(connectorConfig.getName(), config[0]); + } + + public void testGetConnectorsAsJSON() throws Exception + { + HornetQServerControl serverControl = createManagementControl(); + + String jsonString = serverControl.getConnectorsAsJSON(); + assertNotNull(jsonString); + JSONArray array = new JSONArray(jsonString); + assertEquals(1, array.length()); + JSONObject data = array.getJSONObject(0); + assertEquals(connectorConfig.getName(), data.optString("name")); + assertEquals(connectorConfig.getFactoryClassName(), data.optString("factoryClassName")); + assertEquals(connectorConfig.getParams().size(), data.getJSONObject("params").length()); + } + + public void testCreateAndDestroyQueue() throws Exception + { + SimpleString address = RandomUtil.randomSimpleString(); + SimpleString name = RandomUtil.randomSimpleString(); + + HornetQServerControl serverControl = createManagementControl(); + + checkNoResource(ObjectNames.getQueueObjectName(address, name)); + + serverControl.createQueue(address.toString(), name.toString()); + + checkResource(ObjectNames.getQueueObjectName(address, name)); + QueueControl queueControl = ManagementControlHelper.createQueueControl(address, name, mbeanServer); + assertEquals(address.toString(), queueControl.getAddress()); + assertEquals(name.toString(), queueControl.getName()); + assertNull(queueControl.getFilter()); + assertEquals(true, queueControl.isDurable()); + assertEquals(false, queueControl.isTemporary()); + + serverControl.destroyQueue(name.toString()); + + checkNoResource(ObjectNames.getQueueObjectName(address, name)); + } + + public void testCreateAndDestroyQueue_2() throws Exception + { + SimpleString address = RandomUtil.randomSimpleString(); + SimpleString name = RandomUtil.randomSimpleString(); + String filter = "color = 'green'"; + boolean durable = true; + + HornetQServerControl serverControl = createManagementControl(); + + checkNoResource(ObjectNames.getQueueObjectName(address, name)); + + serverControl.createQueue(address.toString(), name.toString(), filter, durable); + + checkResource(ObjectNames.getQueueObjectName(address, name)); + QueueControl queueControl = ManagementControlHelper.createQueueControl(address, name, mbeanServer); + assertEquals(address.toString(), queueControl.getAddress()); + assertEquals(name.toString(), queueControl.getName()); + assertEquals(filter, queueControl.getFilter()); + assertEquals(durable, queueControl.isDurable()); + assertEquals(false, queueControl.isTemporary()); + + serverControl.destroyQueue(name.toString()); + + checkNoResource(ObjectNames.getQueueObjectName(address, name)); + } + + public void testCreateAndDestroyQueueWithNullFilter() throws Exception + { + SimpleString address = RandomUtil.randomSimpleString(); + SimpleString name = RandomUtil.randomSimpleString(); + String filter = null; + boolean durable = true; + + HornetQServerControl serverControl = createManagementControl(); + + checkNoResource(ObjectNames.getQueueObjectName(address, name)); + + serverControl.createQueue(address.toString(), name.toString(), filter, durable); + + checkResource(ObjectNames.getQueueObjectName(address, name)); + QueueControl queueControl = ManagementControlHelper.createQueueControl(address, name, mbeanServer); + assertEquals(address.toString(), queueControl.getAddress()); + assertEquals(name.toString(), queueControl.getName()); + assertNull(queueControl.getFilter()); + assertEquals(durable, queueControl.isDurable()); + assertEquals(false, queueControl.isTemporary()); + + serverControl.destroyQueue(name.toString()); + + checkNoResource(ObjectNames.getQueueObjectName(address, name)); + } + + public void testMessageCounterMaxDayCount() throws Exception + { + HornetQServerControl serverControl = createManagementControl(); + + assertEquals(MessageCounterManagerImpl.DEFAULT_MAX_DAY_COUNT, serverControl.getMessageCounterMaxDayCount()); + + int newCount = 100; + serverControl.setMessageCounterMaxDayCount(newCount); + + assertEquals(newCount, serverControl.getMessageCounterMaxDayCount()); + + try + { + serverControl.setMessageCounterMaxDayCount(-1); + fail(); + } + catch (Exception e) + { + } + + try + { + serverControl.setMessageCounterMaxDayCount(0); + fail(); + } + catch (Exception e) + { + } + + assertEquals(newCount, serverControl.getMessageCounterMaxDayCount()); + } + + public void testGetMessageCounterSamplePeriod() throws Exception + { + HornetQServerControl serverControl = createManagementControl(); + + assertEquals(MessageCounterManagerImpl.DEFAULT_SAMPLE_PERIOD, serverControl.getMessageCounterSamplePeriod()); + + long newSample = 20000; + serverControl.setMessageCounterSamplePeriod(newSample); + + assertEquals(newSample, serverControl.getMessageCounterSamplePeriod()); + + try + { + serverControl.setMessageCounterSamplePeriod(-1); + fail(); + } + catch (Exception e) + { + } + + try + { + serverControl.setMessageCounterSamplePeriod(0); + fail(); + } + catch (Exception e) + { + } + + try + { + serverControl.setMessageCounterSamplePeriod(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD - 1); + fail(); + } + catch (Exception e) + { + } + + assertEquals(newSample, serverControl.getMessageCounterSamplePeriod()); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + Map<String, Object> params = new HashMap<String, Object>(); + params.put(randomString(), randomBoolean()); + connectorConfig = new TransportConfiguration(InVMConnectorFactory.class.getName(), + params, + randomString()); + + conf = new ConfigurationImpl(); + conf.setSecurityEnabled(false); + conf.setJMXManagementEnabled(true); + conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); + + server = HornetQ.newMessagingServer(conf, mbeanServer, false); + conf.getConnectorConfigurations().put(connectorConfig.getName(), connectorConfig); + server.start(); + } + + @Override + protected void tearDown() throws Exception + { + if (server != null) + { + server.stop(); + } + + server = null; + + connectorConfig = null; + + super.tearDown(); + } + + protected HornetQServerControl createManagementControl() throws Exception + { + return ManagementControlHelper.createMessagingServerControl(mbeanServer); + } + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java (from rev 7831, trunk/tests/src/org/hornetq/tests/integration/management/MessagingServerControlUsingCoreTest.java) =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java (rev 0) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -0,0 +1,423 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.tests.integration.management; + +import org.hornetq.core.client.ClientSession; +import org.hornetq.core.client.ClientSessionFactory; +import org.hornetq.core.client.impl.ClientSessionFactoryImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.TransportConfiguration; +import org.hornetq.core.management.HornetQServerControl; +import org.hornetq.core.management.ResourceNames; +import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; + +/** + * A HornetQServerControlUsingCoreTest + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + */ +public class HornetQServerControlUsingCoreTest extends HornetQServerControlTest +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + // HornetQServerControlTest overrides -------------------------- + + private ClientSession session; + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + session = sf.createSession(false, true, true); + session.start(); + + } + + @Override + protected void tearDown() throws Exception + { + session.close(); + + session = null; + + super.tearDown(); + } + + @Override + protected HornetQServerControl createManagementControl() throws Exception + { + + return new HornetQServerControl() + { + private final CoreMessagingProxy proxy = new CoreMessagingProxy(session, + ResourceNames.CORE_SERVER); + + public boolean closeConnectionsForAddress(String ipAddress) throws Exception + { + return (Boolean)proxy.invokeOperation("closeConnectionsForAddress", ipAddress); + } + + public boolean commitPreparedTransaction(String transactionAsBase64) throws Exception + { + return (Boolean)proxy.invokeOperation("commitPreparedTransaction", transactionAsBase64); + } + + public void createQueue(String address, String name) throws Exception + { + proxy.invokeOperation("createQueue", address, name); + } + + public void createQueue(String address, String name, String filter, boolean durable) throws Exception + { + proxy.invokeOperation("createQueue", address, name, filter, durable); + } + + public void deployQueue(String address, String name, String filter, boolean durable) throws Exception + { + proxy.invokeOperation("deployQueue", address, name, filter, durable); + } + + public void deployQueue(String address, String name, String filterString) throws Exception + { + proxy.invokeOperation("deployQueue", address, name); + } + + public void destroyQueue(String name) throws Exception + { + proxy.invokeOperation("destroyQueue", name); + } + + public void disableMessageCounters() throws Exception + { + proxy.invokeOperation("disableMessageCounters"); + } + + public void enableMessageCounters() throws Exception + { + proxy.invokeOperation("enableMessageCounters"); + } + + public String getBackupConnectorName() + { + return (String)proxy.retrieveAttributeValue("backupConnectorName"); + } + + public String getBindingsDirectory() + { + return (String)proxy.retrieveAttributeValue("bindingsDirectory"); + } + + public Configuration getConfiguration() + { + return (Configuration)proxy.retrieveAttributeValue("configuration"); + } + + public int getConnectionCount() + { + return (Integer)proxy.retrieveAttributeValue("connectionCount"); + } + + public long getConnectionTTLOverride() + { + return (Long)proxy.retrieveAttributeValue("connectionTTLOverride", Long.class); + } + + public Object[] getConnectors() throws Exception + { + return (Object[])proxy.retrieveAttributeValue("connectors"); + } + + public String getConnectorsAsJSON() throws Exception + { + return (String)proxy.retrieveAttributeValue("connectorsAsJSON"); + } + + public int getIDCacheSize() + { + return (Integer)proxy.retrieveAttributeValue("IDCacheSize"); + } + + public String[] getInterceptorClassNames() + { + Object[] res = (Object[])proxy.retrieveAttributeValue("interceptorClassNames"); + String[] names = new String[res.length]; + for (int i = 0; i < res.length; i++) + { + names[i] = res[i].toString(); + } + return names; + } + + public String getJournalDirectory() + { + return (String)proxy.retrieveAttributeValue("journalDirectory"); + } + + public int getJournalFileSize() + { + return (Integer)proxy.retrieveAttributeValue("journalFileSize"); + } + + public int getJournalMaxAIO() + { + return (Integer)proxy.retrieveAttributeValue("journalMaxAIO"); + } + + public int getJournalMinFiles() + { + return (Integer)proxy.retrieveAttributeValue("journalMinFiles"); + } + + public String getJournalType() + { + return (String)proxy.retrieveAttributeValue("journalType"); + } + + public String getLargeMessagesDirectory() + { + return (String)proxy.retrieveAttributeValue("largeMessagesDirectory"); + } + + public String getManagementAddress() + { + return (String)proxy.retrieveAttributeValue("managementAddress"); + } + + public String getManagementNotificationAddress() + { + return (String)proxy.retrieveAttributeValue("managementNotificationAddress"); + } + + public long getManagementRequestTimeout() + { + return (Long)proxy.retrieveAttributeValue("managementRequestTimeout", Long.class); + } + + public int getMessageCounterMaxDayCount() + { + return (Integer)proxy.retrieveAttributeValue("messageCounterMaxDayCount"); + } + + public long getMessageCounterSamplePeriod() + { + return (Long)proxy.retrieveAttributeValue("messageCounterSamplePeriod", Long.class); + } + + public long getMessageExpiryScanPeriod() + { + return (Long)proxy.retrieveAttributeValue("messageExpiryScanPeriod", Long.class); + } + + public long getMessageExpiryThreadPriority() + { + return (Long)proxy.retrieveAttributeValue("messageExpiryThreadPriority", Long.class); + } + + public String getPagingDirectory() + { + return (String)proxy.retrieveAttributeValue("pagingDirectory"); + } + + public int getGlobalPageSize() + { + return (Integer)proxy.retrieveAttributeValue("globalPageSize"); + } + + public long getPagingMaxGlobalSizeBytes() + { + return (Long)proxy.retrieveAttributeValue("pagingMaxGlobalSizeBytes", Long.class); + } + + public long getQueueActivationTimeout() + { + return (Long)proxy.retrieveAttributeValue("queueActivationTimeout", Long.class); + } + + public int getScheduledThreadPoolMaxSize() + { + return (Integer)proxy.retrieveAttributeValue("scheduledThreadPoolMaxSize"); + } + + public int getThreadPoolMaxSize() + { + return (Integer)proxy.retrieveAttributeValue("threadPoolMaxSize"); + } + + public long getSecurityInvalidationInterval() + { + return (Long)proxy.retrieveAttributeValue("securityInvalidationInterval", Long.class); + } + + public long getTransactionTimeout() + { + return (Long)proxy.retrieveAttributeValue("transactionTimeout", Long.class); + } + + public long getTransactionTimeoutScanPeriod() + { + return (Long)proxy.retrieveAttributeValue("transactionTimeoutScanPeriod", Long.class); + } + + public String getVersion() + { + return (String)proxy.retrieveAttributeValue("version"); + } + + public boolean isBackup() + { + return (Boolean)proxy.retrieveAttributeValue("backup"); + } + + public boolean isClustered() + { + return (Boolean)proxy.retrieveAttributeValue("clustered"); + } + + public boolean isCreateBindingsDir() + { + return (Boolean)proxy.retrieveAttributeValue("createBindingsDir"); + } + + public boolean isCreateJournalDir() + { + return (Boolean)proxy.retrieveAttributeValue("createJournalDir"); + } + + public boolean isJournalSyncNonTransactional() + { + return (Boolean)proxy.retrieveAttributeValue("journalSyncNonTransactional"); + } + + public boolean isJournalSyncTransactional() + { + return (Boolean)proxy.retrieveAttributeValue("journalSyncTransactional"); + } + + public boolean isMessageCounterEnabled() + { + return (Boolean)proxy.retrieveAttributeValue("messageCounterEnabled"); + } + + public boolean isPersistDeliveryCountBeforeDelivery() + { + return (Boolean)proxy.retrieveAttributeValue("persistDeliveryCountBeforeDelivery"); + } + + public boolean isPersistIDCache() + { + return (Boolean)proxy.retrieveAttributeValue("persistIDCache"); + } + + public boolean isSecurityEnabled() + { + return (Boolean)proxy.retrieveAttributeValue("securityEnabled"); + } + + public boolean isStarted() + { + return (Boolean)proxy.retrieveAttributeValue("started"); + } + + public boolean isWildcardRoutingEnabled() + { + return (Boolean)proxy.retrieveAttributeValue("wildcardRoutingEnabled"); + } + + public String[] listConnectionIDs() throws Exception + { + return (String[])proxy.invokeOperation("listConnectionIDs"); + } + + public String[] listPreparedTransactions() throws Exception + { + return (String[])proxy.invokeOperation("listPreparedTransactions"); + } + + public String[] listRemoteAddresses() throws Exception + { + return (String[])proxy.invokeOperation("listRemoteAddresses"); + } + + public String[] listRemoteAddresses(String ipAddress) throws Exception + { + return (String[])proxy.invokeOperation("listRemoteAddresses", ipAddress); + } + + public String[] listSessions(String connectionID) throws Exception + { + return (String[])proxy.invokeOperation("listSessions", connectionID); + } + + public void resetAllMessageCounterHistories() throws Exception + { + proxy.invokeOperation("resetAllMessageCounterHistories"); + } + + public void resetAllMessageCounters() throws Exception + { + proxy.invokeOperation("resetAllMessageCounters"); + } + + public boolean rollbackPreparedTransaction(String transactionAsBase64) throws Exception + { + return (Boolean)proxy.invokeOperation("rollbackPreparedTransaction", transactionAsBase64); + } + + public void sendQueueInfoToQueue(String queueName, String address) throws Exception + { + proxy.invokeOperation("sendQueueInfoToQueue", queueName, address); + } + + public void setMessageCounterMaxDayCount(int count) throws Exception + { + proxy.invokeOperation("setMessageCounterMaxDayCount", count); + } + + public void setMessageCounterSamplePeriod(long newPeriod) throws Exception + { + proxy.invokeOperation("setMessageCounterSamplePeriod", newPeriod); + } + + public int getAIOBufferSize() + { + return (Integer)proxy.retrieveAttributeValue("AIOBufferSize"); + } + + public int getAIOBufferTimeout() + { + return (Integer)proxy.retrieveAttributeValue("AIOBufferTimeout"); + } + + }; + } + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: trunk/tests/src/org/hornetq/tests/integration/management/MessagingServerControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/MessagingServerControlTest.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/integration/management/MessagingServerControlTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -1,335 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.tests.integration.management; - -import static org.hornetq.tests.util.RandomUtil.randomBoolean; -import static org.hornetq.tests.util.RandomUtil.randomString; - -import java.util.HashMap; -import java.util.Map; - -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.TransportConfiguration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.management.HornetQServerControl; -import org.hornetq.core.management.ObjectNames; -import org.hornetq.core.management.QueueControl; -import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.server.HornetQ; -import org.hornetq.core.server.HornetQServer; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.utils.SimpleString; -import org.hornetq.utils.json.JSONArray; -import org.hornetq.utils.json.JSONObject; - -/** - * A QueueControlTest - * - * @author jmesnil - * - * Created 26 nov. 2008 14:18:48 - * - * - */ -public class MessagingServerControlTest extends ManagementTestBase -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private HornetQServer server; - - private Configuration conf; - - private TransportConfiguration connectorConfig; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - public void testGetAttributes() throws Exception - { - HornetQServerControl serverControl = createManagementControl(); - - assertEquals(server.getVersion().getFullVersion(), serverControl.getVersion()); - - assertEquals(conf.isClustered(), serverControl.isClustered()); - assertEquals(conf.isPersistDeliveryCountBeforeDelivery(), serverControl.isPersistDeliveryCountBeforeDelivery()); - assertEquals(conf.isBackup(), serverControl.isBackup()); - assertEquals(conf.getQueueActivationTimeout(), serverControl.getQueueActivationTimeout()); - assertEquals(conf.getScheduledThreadPoolMaxSize(), serverControl.getScheduledThreadPoolMaxSize()); - assertEquals(conf.getThreadPoolMaxSize(), serverControl.getThreadPoolMaxSize()); - assertEquals(conf.getSecurityInvalidationInterval(), serverControl.getSecurityInvalidationInterval()); - assertEquals(conf.isSecurityEnabled(), serverControl.isSecurityEnabled()); - assertEquals(conf.getInterceptorClassNames().size(), serverControl.getInterceptorClassNames().length); - assertEquals(conf.getConnectionTTLOverride(), serverControl.getConnectionTTLOverride()); - assertEquals(conf.getBackupConnectorName(), serverControl.getBackupConnectorName()); - assertEquals(conf.getManagementAddress().toString(), serverControl.getManagementAddress()); - assertEquals(conf.getManagementNotificationAddress().toString(), serverControl.getManagementNotificationAddress()); - assertEquals(conf.getManagementRequestTimeout(), serverControl.getManagementRequestTimeout()); - assertEquals(conf.getIDCacheSize(), serverControl.getIDCacheSize()); - assertEquals(conf.isPersistIDCache(), serverControl.isPersistIDCache()); - assertEquals(conf.getBindingsDirectory(), serverControl.getBindingsDirectory()); - assertEquals(conf.getJournalDirectory(), serverControl.getJournalDirectory()); - assertEquals(conf.getJournalType().toString(), serverControl.getJournalType()); - assertEquals(conf.isJournalSyncTransactional(), serverControl.isJournalSyncTransactional()); - assertEquals(conf.isJournalSyncNonTransactional(), serverControl.isJournalSyncNonTransactional()); - assertEquals(conf.getJournalFileSize(), serverControl.getJournalFileSize()); - assertEquals(conf.getJournalMinFiles(), serverControl.getJournalMinFiles()); - assertEquals(conf.getJournalMaxAIO(), serverControl.getJournalMaxAIO()); - assertEquals(conf.getAIOBufferSize(), serverControl.getAIOBufferSize()); - assertEquals(conf.getAIOBufferTimeout(), serverControl.getAIOBufferTimeout()); - assertEquals(conf.isCreateBindingsDir(), serverControl.isCreateBindingsDir()); - assertEquals(conf.isCreateJournalDir(), serverControl.isCreateJournalDir()); - assertEquals(conf.getPagingDirectory(), serverControl.getPagingDirectory()); - assertEquals(conf.getLargeMessagesDirectory(), serverControl.getLargeMessagesDirectory()); - assertEquals(conf.isWildcardRoutingEnabled(), serverControl.isWildcardRoutingEnabled()); - assertEquals(conf.getTransactionTimeout(), serverControl.getTransactionTimeout()); - assertEquals(conf.isMessageCounterEnabled(), serverControl.isMessageCounterEnabled()); - assertEquals(conf.getTransactionTimeoutScanPeriod(), serverControl.getTransactionTimeoutScanPeriod()); - assertEquals(conf.getMessageExpiryScanPeriod(), serverControl.getMessageExpiryScanPeriod()); - assertEquals(conf.getMessageExpiryThreadPriority(), serverControl.getMessageExpiryThreadPriority()); - } - - public void testGetConnectors() throws Exception - { - HornetQServerControl serverControl = createManagementControl(); - - Object[] connectorData = serverControl.getConnectors(); - assertNotNull(connectorData); - assertEquals(1, connectorData.length); - - Object[] config = (Object[])connectorData[0]; - - assertEquals(connectorConfig.getName(), config[0]); - } - - public void testGetConnectorsAsJSON() throws Exception - { - HornetQServerControl serverControl = createManagementControl(); - - String jsonString = serverControl.getConnectorsAsJSON(); - assertNotNull(jsonString); - JSONArray array = new JSONArray(jsonString); - assertEquals(1, array.length()); - JSONObject data = array.getJSONObject(0); - assertEquals(connectorConfig.getName(), data.optString("name")); - assertEquals(connectorConfig.getFactoryClassName(), data.optString("factoryClassName")); - assertEquals(connectorConfig.getParams().size(), data.getJSONObject("params").length()); - } - - public void testCreateAndDestroyQueue() throws Exception - { - SimpleString address = RandomUtil.randomSimpleString(); - SimpleString name = RandomUtil.randomSimpleString(); - - HornetQServerControl serverControl = createManagementControl(); - - checkNoResource(ObjectNames.getQueueObjectName(address, name)); - - serverControl.createQueue(address.toString(), name.toString()); - - checkResource(ObjectNames.getQueueObjectName(address, name)); - QueueControl queueControl = ManagementControlHelper.createQueueControl(address, name, mbeanServer); - assertEquals(address.toString(), queueControl.getAddress()); - assertEquals(name.toString(), queueControl.getName()); - assertNull(queueControl.getFilter()); - assertEquals(true, queueControl.isDurable()); - assertEquals(false, queueControl.isTemporary()); - - serverControl.destroyQueue(name.toString()); - - checkNoResource(ObjectNames.getQueueObjectName(address, name)); - } - - public void testCreateAndDestroyQueue_2() throws Exception - { - SimpleString address = RandomUtil.randomSimpleString(); - SimpleString name = RandomUtil.randomSimpleString(); - String filter = "color = 'green'"; - boolean durable = true; - - HornetQServerControl serverControl = createManagementControl(); - - checkNoResource(ObjectNames.getQueueObjectName(address, name)); - - serverControl.createQueue(address.toString(), name.toString(), filter, durable); - - checkResource(ObjectNames.getQueueObjectName(address, name)); - QueueControl queueControl = ManagementControlHelper.createQueueControl(address, name, mbeanServer); - assertEquals(address.toString(), queueControl.getAddress()); - assertEquals(name.toString(), queueControl.getName()); - assertEquals(filter, queueControl.getFilter()); - assertEquals(durable, queueControl.isDurable()); - assertEquals(false, queueControl.isTemporary()); - - serverControl.destroyQueue(name.toString()); - - checkNoResource(ObjectNames.getQueueObjectName(address, name)); - } - - public void testCreateAndDestroyQueueWithNullFilter() throws Exception - { - SimpleString address = RandomUtil.randomSimpleString(); - SimpleString name = RandomUtil.randomSimpleString(); - String filter = null; - boolean durable = true; - - HornetQServerControl serverControl = createManagementControl(); - - checkNoResource(ObjectNames.getQueueObjectName(address, name)); - - serverControl.createQueue(address.toString(), name.toString(), filter, durable); - - checkResource(ObjectNames.getQueueObjectName(address, name)); - QueueControl queueControl = ManagementControlHelper.createQueueControl(address, name, mbeanServer); - assertEquals(address.toString(), queueControl.getAddress()); - assertEquals(name.toString(), queueControl.getName()); - assertNull(queueControl.getFilter()); - assertEquals(durable, queueControl.isDurable()); - assertEquals(false, queueControl.isTemporary()); - - serverControl.destroyQueue(name.toString()); - - checkNoResource(ObjectNames.getQueueObjectName(address, name)); - } - - public void testMessageCounterMaxDayCount() throws Exception - { - HornetQServerControl serverControl = createManagementControl(); - - assertEquals(MessageCounterManagerImpl.DEFAULT_MAX_DAY_COUNT, serverControl.getMessageCounterMaxDayCount()); - - int newCount = 100; - serverControl.setMessageCounterMaxDayCount(newCount); - - assertEquals(newCount, serverControl.getMessageCounterMaxDayCount()); - - try - { - serverControl.setMessageCounterMaxDayCount(-1); - fail(); - } - catch (Exception e) - { - } - - try - { - serverControl.setMessageCounterMaxDayCount(0); - fail(); - } - catch (Exception e) - { - } - - assertEquals(newCount, serverControl.getMessageCounterMaxDayCount()); - } - - public void testGetMessageCounterSamplePeriod() throws Exception - { - HornetQServerControl serverControl = createManagementControl(); - - assertEquals(MessageCounterManagerImpl.DEFAULT_SAMPLE_PERIOD, serverControl.getMessageCounterSamplePeriod()); - - long newSample = 20000; - serverControl.setMessageCounterSamplePeriod(newSample); - - assertEquals(newSample, serverControl.getMessageCounterSamplePeriod()); - - try - { - serverControl.setMessageCounterSamplePeriod(-1); - fail(); - } - catch (Exception e) - { - } - - try - { - serverControl.setMessageCounterSamplePeriod(0); - fail(); - } - catch (Exception e) - { - } - - try - { - serverControl.setMessageCounterSamplePeriod(MessageCounterManagerImpl.MIN_SAMPLE_PERIOD - 1); - fail(); - } - catch (Exception e) - { - } - - assertEquals(newSample, serverControl.getMessageCounterSamplePeriod()); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - Map<String, Object> params = new HashMap<String, Object>(); - params.put(randomString(), randomBoolean()); - connectorConfig = new TransportConfiguration(InVMConnectorFactory.class.getName(), - params, - randomString()); - - conf = new ConfigurationImpl(); - conf.setSecurityEnabled(false); - conf.setJMXManagementEnabled(true); - conf.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - - server = HornetQ.newMessagingServer(conf, mbeanServer, false); - conf.getConnectorConfigurations().put(connectorConfig.getName(), connectorConfig); - server.start(); - } - - @Override - protected void tearDown() throws Exception - { - if (server != null) - { - server.stop(); - } - - server = null; - - connectorConfig = null; - - super.tearDown(); - } - - protected HornetQServerControl createManagementControl() throws Exception - { - return ManagementControlHelper.createMessagingServerControl(mbeanServer); - } - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/tests/src/org/hornetq/tests/integration/management/MessagingServerControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/MessagingServerControlUsingCoreTest.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/integration/management/MessagingServerControlUsingCoreTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -1,423 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.tests.integration.management; - -import org.hornetq.core.client.ClientSession; -import org.hornetq.core.client.ClientSessionFactory; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.TransportConfiguration; -import org.hornetq.core.management.HornetQServerControl; -import org.hornetq.core.management.ResourceNames; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; - -/** - * A MessagingServerControlUsingCoreTest - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - */ -public class MessagingServerControlUsingCoreTest extends MessagingServerControlTest -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // MessagingServerControlTest overrides -------------------------- - - private ClientSession session; - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); - session = sf.createSession(false, true, true); - session.start(); - - } - - @Override - protected void tearDown() throws Exception - { - session.close(); - - session = null; - - super.tearDown(); - } - - @Override - protected HornetQServerControl createManagementControl() throws Exception - { - - return new HornetQServerControl() - { - private final CoreMessagingProxy proxy = new CoreMessagingProxy(session, - ResourceNames.CORE_SERVER); - - public boolean closeConnectionsForAddress(String ipAddress) throws Exception - { - return (Boolean)proxy.invokeOperation("closeConnectionsForAddress", ipAddress); - } - - public boolean commitPreparedTransaction(String transactionAsBase64) throws Exception - { - return (Boolean)proxy.invokeOperation("commitPreparedTransaction", transactionAsBase64); - } - - public void createQueue(String address, String name) throws Exception - { - proxy.invokeOperation("createQueue", address, name); - } - - public void createQueue(String address, String name, String filter, boolean durable) throws Exception - { - proxy.invokeOperation("createQueue", address, name, filter, durable); - } - - public void deployQueue(String address, String name, String filter, boolean durable) throws Exception - { - proxy.invokeOperation("deployQueue", address, name, filter, durable); - } - - public void deployQueue(String address, String name, String filterString) throws Exception - { - proxy.invokeOperation("deployQueue", address, name); - } - - public void destroyQueue(String name) throws Exception - { - proxy.invokeOperation("destroyQueue", name); - } - - public void disableMessageCounters() throws Exception - { - proxy.invokeOperation("disableMessageCounters"); - } - - public void enableMessageCounters() throws Exception - { - proxy.invokeOperation("enableMessageCounters"); - } - - public String getBackupConnectorName() - { - return (String)proxy.retrieveAttributeValue("backupConnectorName"); - } - - public String getBindingsDirectory() - { - return (String)proxy.retrieveAttributeValue("bindingsDirectory"); - } - - public Configuration getConfiguration() - { - return (Configuration)proxy.retrieveAttributeValue("configuration"); - } - - public int getConnectionCount() - { - return (Integer)proxy.retrieveAttributeValue("connectionCount"); - } - - public long getConnectionTTLOverride() - { - return (Long)proxy.retrieveAttributeValue("connectionTTLOverride", Long.class); - } - - public Object[] getConnectors() throws Exception - { - return (Object[])proxy.retrieveAttributeValue("connectors"); - } - - public String getConnectorsAsJSON() throws Exception - { - return (String)proxy.retrieveAttributeValue("connectorsAsJSON"); - } - - public int getIDCacheSize() - { - return (Integer)proxy.retrieveAttributeValue("IDCacheSize"); - } - - public String[] getInterceptorClassNames() - { - Object[] res = (Object[])proxy.retrieveAttributeValue("interceptorClassNames"); - String[] names = new String[res.length]; - for (int i = 0; i < res.length; i++) - { - names[i] = res[i].toString(); - } - return names; - } - - public String getJournalDirectory() - { - return (String)proxy.retrieveAttributeValue("journalDirectory"); - } - - public int getJournalFileSize() - { - return (Integer)proxy.retrieveAttributeValue("journalFileSize"); - } - - public int getJournalMaxAIO() - { - return (Integer)proxy.retrieveAttributeValue("journalMaxAIO"); - } - - public int getJournalMinFiles() - { - return (Integer)proxy.retrieveAttributeValue("journalMinFiles"); - } - - public String getJournalType() - { - return (String)proxy.retrieveAttributeValue("journalType"); - } - - public String getLargeMessagesDirectory() - { - return (String)proxy.retrieveAttributeValue("largeMessagesDirectory"); - } - - public String getManagementAddress() - { - return (String)proxy.retrieveAttributeValue("managementAddress"); - } - - public String getManagementNotificationAddress() - { - return (String)proxy.retrieveAttributeValue("managementNotificationAddress"); - } - - public long getManagementRequestTimeout() - { - return (Long)proxy.retrieveAttributeValue("managementRequestTimeout", Long.class); - } - - public int getMessageCounterMaxDayCount() - { - return (Integer)proxy.retrieveAttributeValue("messageCounterMaxDayCount"); - } - - public long getMessageCounterSamplePeriod() - { - return (Long)proxy.retrieveAttributeValue("messageCounterSamplePeriod", Long.class); - } - - public long getMessageExpiryScanPeriod() - { - return (Long)proxy.retrieveAttributeValue("messageExpiryScanPeriod", Long.class); - } - - public long getMessageExpiryThreadPriority() - { - return (Long)proxy.retrieveAttributeValue("messageExpiryThreadPriority", Long.class); - } - - public String getPagingDirectory() - { - return (String)proxy.retrieveAttributeValue("pagingDirectory"); - } - - public int getGlobalPageSize() - { - return (Integer)proxy.retrieveAttributeValue("globalPageSize"); - } - - public long getPagingMaxGlobalSizeBytes() - { - return (Long)proxy.retrieveAttributeValue("pagingMaxGlobalSizeBytes", Long.class); - } - - public long getQueueActivationTimeout() - { - return (Long)proxy.retrieveAttributeValue("queueActivationTimeout", Long.class); - } - - public int getScheduledThreadPoolMaxSize() - { - return (Integer)proxy.retrieveAttributeValue("scheduledThreadPoolMaxSize"); - } - - public int getThreadPoolMaxSize() - { - return (Integer)proxy.retrieveAttributeValue("threadPoolMaxSize"); - } - - public long getSecurityInvalidationInterval() - { - return (Long)proxy.retrieveAttributeValue("securityInvalidationInterval", Long.class); - } - - public long getTransactionTimeout() - { - return (Long)proxy.retrieveAttributeValue("transactionTimeout", Long.class); - } - - public long getTransactionTimeoutScanPeriod() - { - return (Long)proxy.retrieveAttributeValue("transactionTimeoutScanPeriod", Long.class); - } - - public String getVersion() - { - return (String)proxy.retrieveAttributeValue("version"); - } - - public boolean isBackup() - { - return (Boolean)proxy.retrieveAttributeValue("backup"); - } - - public boolean isClustered() - { - return (Boolean)proxy.retrieveAttributeValue("clustered"); - } - - public boolean isCreateBindingsDir() - { - return (Boolean)proxy.retrieveAttributeValue("createBindingsDir"); - } - - public boolean isCreateJournalDir() - { - return (Boolean)proxy.retrieveAttributeValue("createJournalDir"); - } - - public boolean isJournalSyncNonTransactional() - { - return (Boolean)proxy.retrieveAttributeValue("journalSyncNonTransactional"); - } - - public boolean isJournalSyncTransactional() - { - return (Boolean)proxy.retrieveAttributeValue("journalSyncTransactional"); - } - - public boolean isMessageCounterEnabled() - { - return (Boolean)proxy.retrieveAttributeValue("messageCounterEnabled"); - } - - public boolean isPersistDeliveryCountBeforeDelivery() - { - return (Boolean)proxy.retrieveAttributeValue("persistDeliveryCountBeforeDelivery"); - } - - public boolean isPersistIDCache() - { - return (Boolean)proxy.retrieveAttributeValue("persistIDCache"); - } - - public boolean isSecurityEnabled() - { - return (Boolean)proxy.retrieveAttributeValue("securityEnabled"); - } - - public boolean isStarted() - { - return (Boolean)proxy.retrieveAttributeValue("started"); - } - - public boolean isWildcardRoutingEnabled() - { - return (Boolean)proxy.retrieveAttributeValue("wildcardRoutingEnabled"); - } - - public String[] listConnectionIDs() throws Exception - { - return (String[])proxy.invokeOperation("listConnectionIDs"); - } - - public String[] listPreparedTransactions() throws Exception - { - return (String[])proxy.invokeOperation("listPreparedTransactions"); - } - - public String[] listRemoteAddresses() throws Exception - { - return (String[])proxy.invokeOperation("listRemoteAddresses"); - } - - public String[] listRemoteAddresses(String ipAddress) throws Exception - { - return (String[])proxy.invokeOperation("listRemoteAddresses", ipAddress); - } - - public String[] listSessions(String connectionID) throws Exception - { - return (String[])proxy.invokeOperation("listSessions", connectionID); - } - - public void resetAllMessageCounterHistories() throws Exception - { - proxy.invokeOperation("resetAllMessageCounterHistories"); - } - - public void resetAllMessageCounters() throws Exception - { - proxy.invokeOperation("resetAllMessageCounters"); - } - - public boolean rollbackPreparedTransaction(String transactionAsBase64) throws Exception - { - return (Boolean)proxy.invokeOperation("rollbackPreparedTransaction", transactionAsBase64); - } - - public void sendQueueInfoToQueue(String queueName, String address) throws Exception - { - proxy.invokeOperation("sendQueueInfoToQueue", queueName, address); - } - - public void setMessageCounterMaxDayCount(int count) throws Exception - { - proxy.invokeOperation("setMessageCounterMaxDayCount", count); - } - - public void setMessageCounterSamplePeriod(long newPeriod) throws Exception - { - proxy.invokeOperation("setMessageCounterSamplePeriod", newPeriod); - } - - public int getAIOBufferSize() - { - return (Integer)proxy.retrieveAttributeValue("AIOBufferSize"); - } - - public int getAIOBufferTimeout() - { - return (Integer)proxy.retrieveAttributeValue("AIOBufferTimeout"); - } - - }; - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} 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:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -212,7 +212,7 @@ { HornetQSecurityManager securityManager = new HornetQSecurityManagerImpl(); - HornetQServer server = new FailingMessagingServerImpl(configuration, securityManager); + HornetQServer server = new FailingHornetQServer(configuration, securityManager); AddressSettings defaultSetting = new AddressSettings(); defaultSetting.setPageSizeBytes(10 * 1024); @@ -228,9 +228,9 @@ /** This is hacking HornetQServerImpl, * to make sure the server will fail right * before the page-file was removed */ - class FailingMessagingServerImpl extends HornetQServerImpl + class FailingHornetQServer extends HornetQServerImpl { - FailingMessagingServerImpl(final Configuration config, final HornetQSecurityManager securityManager) + FailingHornetQServer(final Configuration config, final HornetQSecurityManager securityManager) { super(config, ManagementFactory.getPlatformMBeanServer(), securityManager); } Modified: trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -1074,7 +1074,7 @@ } /* (non-Javadoc) - * @see org.hornetq.core.server.MessagingComponent#isStarted() + * @see org.hornetq.core.server.HornetQComponent#isStarted() */ public boolean isStarted() { @@ -1082,7 +1082,7 @@ } /* (non-Javadoc) - * @see org.hornetq.core.server.MessagingComponent#start() + * @see org.hornetq.core.server.HornetQComponent#start() */ public void start() throws Exception { @@ -1090,7 +1090,7 @@ } /* (non-Javadoc) - * @see org.hornetq.core.server.MessagingComponent#stop() + * @see org.hornetq.core.server.HornetQComponent#stop() */ public void stop() throws Exception { Copied: trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java (from rev 7831, trunk/tests/src/org/hornetq/tests/unit/core/remoting/MessagingBufferTestBase.java) =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java (rev 0) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -0,0 +1,336 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.tests.unit.core.remoting; + +import static org.hornetq.tests.util.RandomUtil.randomByte; +import static org.hornetq.tests.util.RandomUtil.randomBytes; +import static org.hornetq.tests.util.RandomUtil.randomDouble; +import static org.hornetq.tests.util.RandomUtil.randomFloat; +import static org.hornetq.tests.util.RandomUtil.randomInt; +import static org.hornetq.tests.util.RandomUtil.randomLong; +import static org.hornetq.tests.util.RandomUtil.randomString; + +import org.hornetq.core.remoting.spi.HornetQBuffer; +import org.hornetq.tests.util.RandomUtil; +import org.hornetq.tests.util.UnitTestCase; +import org.hornetq.utils.SimpleString; + +/** + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. + * + * @version <tt>$Revision$</tt> + */ +public abstract class HornetQBufferTestBase extends UnitTestCase +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + private HornetQBuffer wrapper; + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + wrapper = createBuffer(); + } + + @Override + protected void tearDown() throws Exception + { + wrapper = null; + + super.tearDown(); + } + + protected abstract HornetQBuffer createBuffer(); + + public void testNullString() throws Exception + { + assertNull(putAndGetNullableString(null)); + } + + public void testEmptyString() throws Exception + { + String result = putAndGetNullableString(""); + + assertNotNull(result); + assertEquals("", result); + } + + public void testNonEmptyString() throws Exception + { + String junk = randomString(); + + String result = putAndGetNullableString(junk); + + assertNotNull(result); + assertEquals(junk, result); + } + + public void testNullSimpleString() throws Exception + { + assertNull(putAndGetNullableSimpleString(null)); + } + + public void testEmptySimpleString() throws Exception + { + SimpleString emptySimpleString = new SimpleString(""); + SimpleString result = putAndGetNullableSimpleString(emptySimpleString); + + assertNotNull(result); + assertEqualsByteArrays(emptySimpleString.getData(), result.getData()); + } + + public void testNonEmptySimpleString() throws Exception + { + SimpleString junk = RandomUtil.randomSimpleString(); + SimpleString result = putAndGetNullableSimpleString(junk); + + assertNotNull(result); + assertEqualsByteArrays(junk.getData(), result.getData()); + } + + public void testByte() throws Exception + { + byte b = randomByte(); + wrapper.writeByte(b); + + assertEquals(b, wrapper.readByte()); + } + + public void testUnsignedByte() throws Exception + { + byte b = (byte) 0xff; + wrapper.writeByte(b); + + assertEquals(255, wrapper.readUnsignedByte()); + + b = (byte) 0xf; + wrapper.writeByte(b); + + assertEquals(b, wrapper.readUnsignedByte()); + } + + + + public void testBytes() throws Exception + { + byte[] bytes = randomBytes(); + wrapper.writeBytes(bytes); + + byte[] b = new byte[bytes.length]; + wrapper.readBytes(b); + assertEqualsByteArrays(bytes, b); + } + + public void testBytesWithLength() throws Exception + { + byte[] bytes = randomBytes(); + // put only half of the bytes + wrapper.writeBytes(bytes, 0, bytes.length / 2); + + byte[] b = new byte[bytes.length / 2]; + wrapper.readBytes(b, 0, b.length); + assertEqualsByteArrays(b.length, bytes, b); + } + + public void testPutTrueBoolean() throws Exception + { + wrapper.writeBoolean(true); + + assertTrue(wrapper.readBoolean()); + } + + public void testPutFalseBoolean() throws Exception + { + wrapper.writeBoolean(false); + + assertFalse(wrapper.readBoolean()); + } + + public void testChar() throws Exception + { + wrapper.writeChar('a'); + + assertEquals('a', wrapper.readChar()); + } + + public void testInt() throws Exception + { + int i = randomInt(); + wrapper.writeInt(i); + + assertEquals(i, wrapper.readInt()); + } + + public void testIntAtPosition() throws Exception + { + int firstInt = randomInt(); + int secondInt = randomInt(); + + wrapper.writeInt(secondInt); + wrapper.writeInt(secondInt); + // rewrite firstInt at the beginning + wrapper.setInt(0, firstInt); + + assertEquals(firstInt, wrapper.readInt()); + assertEquals(secondInt, wrapper.readInt()); + } + + public void testLong() throws Exception + { + long l = randomLong(); + wrapper.writeLong(l); + + assertEquals(l, wrapper.readLong()); + } + + public void testUnsignedShort() throws Exception + { + short s1 = Short.MAX_VALUE; + + wrapper.writeShort(s1); + + int s2 = wrapper.readUnsignedShort(); + + assertEquals(s1, s2); + + s1 = Short.MIN_VALUE; + + wrapper.writeShort(s1); + + s2 = wrapper.readUnsignedShort(); + + assertEquals(s1 * -1, s2); + + s1 = -1; + + wrapper.writeShort(s1); + + s2 = wrapper.readUnsignedShort(); + + // / The max of an unsigned short + // (http://en.wikipedia.org/wiki/Unsigned_short) + assertEquals(s2, 65535); + } + + public void testShort() throws Exception + { + wrapper.writeShort((short) 1); + + assertEquals((short)1, wrapper.readShort()); + } + + public void testDouble() throws Exception + { + double d = randomDouble(); + wrapper.writeDouble(d); + + assertEquals(d, wrapper.readDouble()); + } + + public void testFloat() throws Exception + { + float f = randomFloat(); + wrapper.writeFloat(f); + + assertEquals(f, wrapper.readFloat()); + } + + public void testUTF() throws Exception + { + String str = randomString(); + wrapper.writeUTF(str); + + assertEquals(str, wrapper.readUTF()); + } + + public void testArray() throws Exception + { + byte[] bytes = randomBytes(128); + wrapper.writeBytes(bytes); + + byte[] array = wrapper.array(); + assertEquals(wrapper.capacity(), array.length); + assertEqualsByteArrays(128, bytes, wrapper.array()); + } + + public void testRewind() throws Exception + { + int i = randomInt(); + wrapper.writeInt(i); + + assertEquals(i, wrapper.readInt()); + + wrapper.resetReaderIndex(); + + assertEquals(i, wrapper.readInt()); + } + + public void testRemaining() throws Exception + { + int capacity = wrapper.capacity(); + + // fill 1/3 of the buffer + int fill = capacity / 3; + byte[] bytes = randomBytes(fill); + wrapper.writeBytes(bytes); + + // check the remaining is 2/3 + assertEquals(capacity - fill, wrapper.writableBytes()); + } + + public void testPosition() throws Exception + { + assertEquals(0, wrapper.writerIndex()); + + byte[] bytes = randomBytes(128); + wrapper.writeBytes(bytes); + + assertEquals(bytes.length, wrapper.writerIndex()); + + wrapper.writerIndex(0); + assertEquals(0, wrapper.writerIndex()); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + private String putAndGetNullableString(String nullableString) throws Exception + { + wrapper.writeNullableString(nullableString); + + return wrapper.readNullableString(); + } + + private SimpleString putAndGetNullableSimpleString(SimpleString nullableSimpleString) throws Exception + { + wrapper.writeNullableSimpleString(nullableSimpleString); + + return wrapper.readNullableSimpleString(); + } + + // Inner classes ------------------------------------------------- +} Deleted: trunk/tests/src/org/hornetq/tests/unit/core/remoting/MessagingBufferTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/MessagingBufferTestBase.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/MessagingBufferTestBase.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -1,336 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.tests.unit.core.remoting; - -import static org.hornetq.tests.util.RandomUtil.randomByte; -import static org.hornetq.tests.util.RandomUtil.randomBytes; -import static org.hornetq.tests.util.RandomUtil.randomDouble; -import static org.hornetq.tests.util.RandomUtil.randomFloat; -import static org.hornetq.tests.util.RandomUtil.randomInt; -import static org.hornetq.tests.util.RandomUtil.randomLong; -import static org.hornetq.tests.util.RandomUtil.randomString; - -import org.hornetq.core.remoting.spi.HornetQBuffer; -import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.UnitTestCase; -import org.hornetq.utils.SimpleString; - -/** - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>. - * - * @version <tt>$Revision$</tt> - */ -public abstract class MessagingBufferTestBase extends UnitTestCase -{ - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - private HornetQBuffer wrapper; - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - wrapper = createBuffer(); - } - - @Override - protected void tearDown() throws Exception - { - wrapper = null; - - super.tearDown(); - } - - protected abstract HornetQBuffer createBuffer(); - - public void testNullString() throws Exception - { - assertNull(putAndGetNullableString(null)); - } - - public void testEmptyString() throws Exception - { - String result = putAndGetNullableString(""); - - assertNotNull(result); - assertEquals("", result); - } - - public void testNonEmptyString() throws Exception - { - String junk = randomString(); - - String result = putAndGetNullableString(junk); - - assertNotNull(result); - assertEquals(junk, result); - } - - public void testNullSimpleString() throws Exception - { - assertNull(putAndGetNullableSimpleString(null)); - } - - public void testEmptySimpleString() throws Exception - { - SimpleString emptySimpleString = new SimpleString(""); - SimpleString result = putAndGetNullableSimpleString(emptySimpleString); - - assertNotNull(result); - assertEqualsByteArrays(emptySimpleString.getData(), result.getData()); - } - - public void testNonEmptySimpleString() throws Exception - { - SimpleString junk = RandomUtil.randomSimpleString(); - SimpleString result = putAndGetNullableSimpleString(junk); - - assertNotNull(result); - assertEqualsByteArrays(junk.getData(), result.getData()); - } - - public void testByte() throws Exception - { - byte b = randomByte(); - wrapper.writeByte(b); - - assertEquals(b, wrapper.readByte()); - } - - public void testUnsignedByte() throws Exception - { - byte b = (byte) 0xff; - wrapper.writeByte(b); - - assertEquals(255, wrapper.readUnsignedByte()); - - b = (byte) 0xf; - wrapper.writeByte(b); - - assertEquals(b, wrapper.readUnsignedByte()); - } - - - - public void testBytes() throws Exception - { - byte[] bytes = randomBytes(); - wrapper.writeBytes(bytes); - - byte[] b = new byte[bytes.length]; - wrapper.readBytes(b); - assertEqualsByteArrays(bytes, b); - } - - public void testBytesWithLength() throws Exception - { - byte[] bytes = randomBytes(); - // put only half of the bytes - wrapper.writeBytes(bytes, 0, bytes.length / 2); - - byte[] b = new byte[bytes.length / 2]; - wrapper.readBytes(b, 0, b.length); - assertEqualsByteArrays(b.length, bytes, b); - } - - public void testPutTrueBoolean() throws Exception - { - wrapper.writeBoolean(true); - - assertTrue(wrapper.readBoolean()); - } - - public void testPutFalseBoolean() throws Exception - { - wrapper.writeBoolean(false); - - assertFalse(wrapper.readBoolean()); - } - - public void testChar() throws Exception - { - wrapper.writeChar('a'); - - assertEquals('a', wrapper.readChar()); - } - - public void testInt() throws Exception - { - int i = randomInt(); - wrapper.writeInt(i); - - assertEquals(i, wrapper.readInt()); - } - - public void testIntAtPosition() throws Exception - { - int firstInt = randomInt(); - int secondInt = randomInt(); - - wrapper.writeInt(secondInt); - wrapper.writeInt(secondInt); - // rewrite firstInt at the beginning - wrapper.setInt(0, firstInt); - - assertEquals(firstInt, wrapper.readInt()); - assertEquals(secondInt, wrapper.readInt()); - } - - public void testLong() throws Exception - { - long l = randomLong(); - wrapper.writeLong(l); - - assertEquals(l, wrapper.readLong()); - } - - public void testUnsignedShort() throws Exception - { - short s1 = Short.MAX_VALUE; - - wrapper.writeShort(s1); - - int s2 = wrapper.readUnsignedShort(); - - assertEquals(s1, s2); - - s1 = Short.MIN_VALUE; - - wrapper.writeShort(s1); - - s2 = wrapper.readUnsignedShort(); - - assertEquals(s1 * -1, s2); - - s1 = -1; - - wrapper.writeShort(s1); - - s2 = wrapper.readUnsignedShort(); - - // / The max of an unsigned short - // (http://en.wikipedia.org/wiki/Unsigned_short) - assertEquals(s2, 65535); - } - - public void testShort() throws Exception - { - wrapper.writeShort((short) 1); - - assertEquals((short)1, wrapper.readShort()); - } - - public void testDouble() throws Exception - { - double d = randomDouble(); - wrapper.writeDouble(d); - - assertEquals(d, wrapper.readDouble()); - } - - public void testFloat() throws Exception - { - float f = randomFloat(); - wrapper.writeFloat(f); - - assertEquals(f, wrapper.readFloat()); - } - - public void testUTF() throws Exception - { - String str = randomString(); - wrapper.writeUTF(str); - - assertEquals(str, wrapper.readUTF()); - } - - public void testArray() throws Exception - { - byte[] bytes = randomBytes(128); - wrapper.writeBytes(bytes); - - byte[] array = wrapper.array(); - assertEquals(wrapper.capacity(), array.length); - assertEqualsByteArrays(128, bytes, wrapper.array()); - } - - public void testRewind() throws Exception - { - int i = randomInt(); - wrapper.writeInt(i); - - assertEquals(i, wrapper.readInt()); - - wrapper.resetReaderIndex(); - - assertEquals(i, wrapper.readInt()); - } - - public void testRemaining() throws Exception - { - int capacity = wrapper.capacity(); - - // fill 1/3 of the buffer - int fill = capacity / 3; - byte[] bytes = randomBytes(fill); - wrapper.writeBytes(bytes); - - // check the remaining is 2/3 - assertEquals(capacity - fill, wrapper.writableBytes()); - } - - public void testPosition() throws Exception - { - assertEquals(0, wrapper.writerIndex()); - - byte[] bytes = randomBytes(128); - wrapper.writeBytes(bytes); - - assertEquals(bytes.length, wrapper.writerIndex()); - - wrapper.writerIndex(0); - assertEquals(0, wrapper.writerIndex()); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - private String putAndGetNullableString(String nullableString) throws Exception - { - wrapper.writeNullableString(nullableString); - - return wrapper.readNullableString(); - } - - private SimpleString putAndGetNullableSimpleString(SimpleString nullableSimpleString) throws Exception - { - wrapper.writeNullableSimpleString(nullableSimpleString); - - return wrapper.readNullableSimpleString(); - } - - // Inner classes ------------------------------------------------- -} Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/ByteBufferWrapperTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/ByteBufferWrapperTest.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/ByteBufferWrapperTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -17,7 +17,7 @@ import org.hornetq.core.buffers.ChannelBuffers; import org.hornetq.core.remoting.spi.HornetQBuffer; -import org.hornetq.tests.unit.core.remoting.MessagingBufferTestBase; +import org.hornetq.tests.unit.core.remoting.HornetQBufferTestBase; /** * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> @@ -25,7 +25,7 @@ * @version <tt>$Revision$</tt> * */ -public class ByteBufferWrapperTest extends MessagingBufferTestBase +public class ByteBufferWrapperTest extends HornetQBufferTestBase { // Constants ----------------------------------------------------- @@ -38,7 +38,7 @@ // Public -------------------------------------------------------- - // MessagingBufferTestBase overrides ----------------------------- + // HornetQBufferTestBase overrides ----------------------------- @Override protected HornetQBuffer createBuffer() Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -15,7 +15,7 @@ import org.hornetq.core.buffers.ChannelBuffers; import org.hornetq.core.remoting.spi.HornetQBuffer; -import org.hornetq.tests.unit.core.remoting.MessagingBufferTestBase; +import org.hornetq.tests.unit.core.remoting.HornetQBufferTestBase; /** * Same as ChannelBufferWrapperTest, but using a different constructor @@ -25,7 +25,7 @@ * @version <tt>$Revision$</tt> * */ -public class ChannelBufferWrapper2Test extends MessagingBufferTestBase +public class ChannelBufferWrapper2Test extends HornetQBufferTestBase { // Constants ----------------------------------------------------- Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -15,7 +15,7 @@ import org.hornetq.core.remoting.spi.HornetQBuffer; import org.hornetq.integration.transports.netty.ChannelBufferWrapper; -import org.hornetq.tests.unit.core.remoting.MessagingBufferTestBase; +import org.hornetq.tests.unit.core.remoting.HornetQBufferTestBase; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; @@ -25,7 +25,7 @@ * @version <tt>$Revision$</tt> * */ -public class ChannelBufferWrapperTest extends MessagingBufferTestBase +public class ChannelBufferWrapperTest extends HornetQBufferTestBase { // Constants ----------------------------------------------------- Modified: trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakePostOffice.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakePostOffice.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakePostOffice.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -127,7 +127,7 @@ } /* (non-Javadoc) - * @see org.hornetq.core.server.MessagingComponent#isStarted() + * @see org.hornetq.core.server.HornetQComponent#isStarted() */ public boolean isStarted() { @@ -135,7 +135,7 @@ } /* (non-Javadoc) - * @see org.hornetq.core.server.MessagingComponent#start() + * @see org.hornetq.core.server.HornetQComponent#start() */ public void start() throws Exception { @@ -143,7 +143,7 @@ } /* (non-Javadoc) - * @see org.hornetq.core.server.MessagingComponent#stop() + * @see org.hornetq.core.server.HornetQComponent#stop() */ public void stop() throws Exception { Copied: trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/HornetQXAResourceRecoveryTest.java (from rev 7829, trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/MessagingXAResourceRecoveryTest.java) =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/HornetQXAResourceRecoveryTest.java (rev 0) +++ trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/HornetQXAResourceRecoveryTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -0,0 +1,122 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.tests.unit.jms.server.recovery; + +import junit.framework.TestCase; + +import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; +import org.hornetq.core.remoting.impl.invm.TransportConstants; +import org.hornetq.jms.server.recovery.HornetQXAResourceRecovery; + +/** + * A HornetQXAResourceRecoveryTest + * + * @author jmesnil + * + * + */ +public class HornetQXAResourceRecoveryTest extends TestCase +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + public void testConfigWithOnlyConnectorFactoryClassName() throws Exception + { + String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"; + HornetQXAResourceRecovery.ConfigParser parser = new HornetQXAResourceRecovery.ConfigParser(config); + + assertEquals(InVMConnectorFactory.class.getName(), parser.getConnectorFactoryClassName()); + assertEquals(0, parser.getConnectorParameters().size()); + assertNull(parser.getUsername()); + assertNull(parser.getPassword()); + } + + public void testConfigWithConnectorFactoryClassNameAndParamsWithoutUserCredentials() throws Exception + { + String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, , , hornetq.remoting.invm.serverid=99"; + HornetQXAResourceRecovery.ConfigParser parser = new HornetQXAResourceRecovery.ConfigParser(config); + + assertEquals(InVMConnectorFactory.class.getName(), parser.getConnectorFactoryClassName()); + assertEquals(1, parser.getConnectorParameters().size()); + assertEquals("99", parser.getConnectorParameters().get(TransportConstants.SERVER_ID_PROP_NAME)); + assertNull(parser.getUsername()); + assertNull(parser.getPassword()); + } + + public void testConfigWithConnectorFactoryClassNameAndParamsAndUserCredentials() throws Exception + { + String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, foo, bar, hornetq.remoting.invm.serverid=99, key=val"; + HornetQXAResourceRecovery.ConfigParser parser = new HornetQXAResourceRecovery.ConfigParser(config); + + assertEquals(InVMConnectorFactory.class.getName(), parser.getConnectorFactoryClassName()); + assertEquals(2, parser.getConnectorParameters().size()); + assertEquals("99", parser.getConnectorParameters().get(TransportConstants.SERVER_ID_PROP_NAME)); + assertEquals("val", parser.getConnectorParameters().get("key")); + assertEquals("foo", parser.getUsername()); + assertEquals("bar", parser.getPassword()); + } + + public void testConfigWithConnectorFactoryClassNameAndUserCredentialsWithoutParams() throws Exception + { + String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, foo, bar"; + HornetQXAResourceRecovery.ConfigParser parser = new HornetQXAResourceRecovery.ConfigParser(config); + + assertEquals(InVMConnectorFactory.class.getName(), parser.getConnectorFactoryClassName()); + assertEquals(0, parser.getConnectorParameters().size()); + assertEquals("foo", parser.getUsername()); + assertEquals("bar", parser.getPassword()); + } + + public void testEmptyString() throws Exception + { + try + { + String config = ""; + new HornetQXAResourceRecovery.ConfigParser(config); + fail(); + } + catch (IllegalArgumentException e) + { + } + } + + public void testUserNameWithoutPassword() throws Exception + { + try + { + String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, foo"; + new HornetQXAResourceRecovery.ConfigParser(config); + fail(); + } + catch (IllegalArgumentException e) + { + } + } + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Deleted: trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/MessagingXAResourceRecoveryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/MessagingXAResourceRecoveryTest.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/unit/jms/server/recovery/MessagingXAResourceRecoveryTest.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -1,122 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.tests.unit.jms.server.recovery; - -import junit.framework.TestCase; - -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.jms.server.recovery.MessagingXAResourceRecovery; - -/** - * A MessagingXAResourceRecoveryTest - * - * @author jmesnil - * - * - */ -public class MessagingXAResourceRecoveryTest extends TestCase -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - public void testConfigWithOnlyConnectorFactoryClassName() throws Exception - { - String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"; - MessagingXAResourceRecovery.ConfigParser parser = new MessagingXAResourceRecovery.ConfigParser(config); - - assertEquals(InVMConnectorFactory.class.getName(), parser.getConnectorFactoryClassName()); - assertEquals(0, parser.getConnectorParameters().size()); - assertNull(parser.getUsername()); - assertNull(parser.getPassword()); - } - - public void testConfigWithConnectorFactoryClassNameAndParamsWithoutUserCredentials() throws Exception - { - String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, , , hornetq.remoting.invm.serverid=99"; - MessagingXAResourceRecovery.ConfigParser parser = new MessagingXAResourceRecovery.ConfigParser(config); - - assertEquals(InVMConnectorFactory.class.getName(), parser.getConnectorFactoryClassName()); - assertEquals(1, parser.getConnectorParameters().size()); - assertEquals("99", parser.getConnectorParameters().get(TransportConstants.SERVER_ID_PROP_NAME)); - assertNull(parser.getUsername()); - assertNull(parser.getPassword()); - } - - public void testConfigWithConnectorFactoryClassNameAndParamsAndUserCredentials() throws Exception - { - String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, foo, bar, hornetq.remoting.invm.serverid=99, key=val"; - MessagingXAResourceRecovery.ConfigParser parser = new MessagingXAResourceRecovery.ConfigParser(config); - - assertEquals(InVMConnectorFactory.class.getName(), parser.getConnectorFactoryClassName()); - assertEquals(2, parser.getConnectorParameters().size()); - assertEquals("99", parser.getConnectorParameters().get(TransportConstants.SERVER_ID_PROP_NAME)); - assertEquals("val", parser.getConnectorParameters().get("key")); - assertEquals("foo", parser.getUsername()); - assertEquals("bar", parser.getPassword()); - } - - public void testConfigWithConnectorFactoryClassNameAndUserCredentialsWithoutParams() throws Exception - { - String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, foo, bar"; - MessagingXAResourceRecovery.ConfigParser parser = new MessagingXAResourceRecovery.ConfigParser(config); - - assertEquals(InVMConnectorFactory.class.getName(), parser.getConnectorFactoryClassName()); - assertEquals(0, parser.getConnectorParameters().size()); - assertEquals("foo", parser.getUsername()); - assertEquals("bar", parser.getPassword()); - } - - public void testEmptyString() throws Exception - { - try - { - String config = ""; - new MessagingXAResourceRecovery.ConfigParser(config); - fail(); - } - catch (IllegalArgumentException e) - { - } - } - - public void testUserNameWithoutPassword() throws Exception - { - try - { - String config = "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory, foo"; - new MessagingXAResourceRecovery.ConfigParser(config); - fail(); - } - catch (IllegalArgumentException e) - { - } - } - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Modified: trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2009-08-20 17:08:06 UTC (rev 7838) +++ trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2009-08-20 17:26:39 UTC (rev 7839) @@ -405,7 +405,7 @@ return testDir + "/temp"; } - protected static void expectHornetQException(String message, int errorCode, MessagingAction action) + protected static void expectHornetQException(String message, int errorCode, HornetQAction action) { try { @@ -419,12 +419,12 @@ } } - protected static void expectHornetQException(int errorCode, MessagingAction action) + protected static void expectHornetQException(int errorCode, HornetQAction action) { expectHornetQException("must throw a HornetQException with the expected errorCode: " + errorCode, errorCode, action); } - protected static void expectXAException(int errorCode, MessagingAction action) + protected static void expectXAException(int errorCode, HornetQAction action) { try { @@ -844,7 +844,7 @@ // Inner classes ------------------------------------------------- - protected static interface MessagingAction + protected static interface HornetQAction { void run() throws Exception; }

15 years, 4 months

1
0
0 / 0

JBoss hornetq SVN: r7838 - trunk/native/src.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2009-08-20 13:08:06 -0400 (Thu, 20 Aug 2009) New Revision: 7838 Modified: trunk/native/src/Makefile.am Log: Lib name change Modified: trunk/native/src/Makefile.am =================================================================== --- trunk/native/src/Makefile.am 2009-08-20 16:50:33 UTC (rev 7837) +++ trunk/native/src/Makefile.am 2009-08-20 17:08:06 UTC (rev 7838) @@ -1,8 +1,8 @@ #AM_CXXFLAGS = $(JVM_CXXFLAGS) -lib_LTLIBRARIES = libHornetQnative.la +lib_LTLIBRARIES = libHornetQAIO.la bin_PROGRAMS = disktest -libHornetQnative_la_SOURCES = JNI_AsynchronousFileImpl.cpp AIOController.cpp AIOController.h AIOException.h AsyncFile.cpp \ +libHornetQAIO_la_SOURCES = JNI_AsynchronousFileImpl.cpp AIOController.cpp AIOController.h AIOException.h AsyncFile.cpp \ AsyncFile.h CallbackAdapter.h JAIODatatypes.h JavaUtilities.cpp \ JavaUtilities.h JNICallbackAdapter.cpp JNICallbackAdapter.h \ LockClass.h org_hornetq_core_persistence_impl_libaio_jni_impl_AsynchronousFileImpl.h \

15 years, 4 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

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

15 years, 4 months

1
0
0 / 0

JBoss hornetq SVN: r7836 - in trunk: native/bin and 3 other directories.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2009-08-20 12:45:14 -0400 (Thu, 20 Aug 2009) New Revision: 7836 Added: trunk/native/bin/libHornetQAIO32.so trunk/native/bin/libHornetQAIO64.so Removed: trunk/native/bin/libHornetQnative32.so trunk/native/bin/libHornetQnative64.so Modified: trunk/docs/user-manual/en/appserver-integration.xml trunk/docs/user-manual/en/libaio.xml trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java Log: A few tweaks + renaming native libraries Modified: trunk/docs/user-manual/en/appserver-integration.xml =================================================================== --- trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 16:43:27 UTC (rev 7835) +++ trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 16:45:14 UTC (rev 7836) @@ -1,25 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <chapter id="appserver-integration"> <title>Application Server Integration and Java EE</title> - <para>HornetQ can be easily installed in JBoss Application Server 5.1 or later. For - details on installing HornetQ in the JBoss Application Server refer to quick-start - guide.</para> - <para>Since HornetQ also provides a JCA adaptor, it should also be possible to integrate - HornetQ as a JMS provider in other JEE compliant app servers. For instructions on - how to integrate a remote JCA adaptor into another application sever, please consult that - application server's instructions.</para> + <para>HornetQ can be easily installed in JBoss Application Server 5.1 or later. For details on + installing HornetQ in the JBoss Application Server refer to quick-start guide.</para> + <para>Since HornetQ also provides a JCA adaptor, it should also be possible to integrate HornetQ + as a JMS provider in other JEE compliant app servers. For instructions on how to integrate a + remote JCA adaptor into another application sever, please consult that application server's + instructions.</para> <para>A JCA Adapter basically controls the incoming of messages to Message Driven Beans and the outgoing of messages from other JEE components.</para> <para>This section explains the basics behind configuring the different JEE components in the AS.</para> <section> <title>Configuring Message Driven Beans</title> - <para>The delivery of messages to an MDB using HornetQ is configured on the JCA - Adapter via a configuration file <literal>ra.xml</literal> which can be found under in - the <literal>jms-ra.rar</literal> archive of directory. By default this is configured to - consume messages using an InVM connector from the instance of HornetQ running - within the application server. A full list of what is configurable is found later in - this chapter. </para> + <para>The delivery of messages to an MDB using HornetQ is configured on the JCA Adapter via + a configuration file <literal>ra.xml</literal> which can be found under in the <literal + >jms-ra.rar</literal> archive of directory. By default this is configured to consume + messages using an InVM connector from the instance of HornetQ running within the + application server. A full list of what is configurable is found later in this chapter. </para> <para>All MDB's however need to have the destination type and the destination configured. The following example shows how this can be done via annotations.</para> <programlisting>@MessageDriven(name = "MDBExample", @@ -244,7 +242,7 @@ configuration of the Adapter is found in this archive under <literal >META-INF/ra.xml</literal>.</para> <para>The configuration will look something like the following:</para> - <programlisting><![CDATA[<![CDATA[<![CDATA[<![CDATA[<![CDATA[<resourceadapter> + <programlisting><resourceadapter> <resourceadapter-class>org.hornetq.ra.HornetQResourceAdapter</resourceadapter-class> <config-property> <description>The transport type</description> @@ -312,7 +310,7 @@ </messageadapter> </inbound-resourceadapter> - </resourceadapter>]]>]]>]]>]]>]]></programlisting> + </resourceadapter></programlisting> <para>There are 3 main parts to this configuration.</para> <orderedlist> <listitem> @@ -616,13 +614,13 @@ <para>A bridge is deployed inside a JBoss AS instance. The instance can be the same instance as either the source or target server. Or could be on a third, separate JBoss AS instance.</para> - <para>The bridge can also be used to bridge messages from other non HornetQ JMS - servers, as long as they are JMS 1.1 compliant.<note> + <para>The bridge can also be used to bridge messages from other non HornetQ JMS servers, as + long as they are JMS 1.1 compliant.<note> <para>Don't confuse a JMS bridge with a core bridge. A JMS bridge can be used to bridge any two JMS 1.1 compliant JMS providers and uses the JMS API. A core bridge (described in <xref linkend="core-bridges"/>) is used to bridge any two - HornetQ instances and uses the core API. Always use a core bridge if you - can in preference to a JMS bridge. The core bridge will typically provide better + HornetQ instances and uses the core API. Always use a core bridge if you can in + preference to a JMS bridge. The core bridge will typically provide better performance than a JMS bridge. Also the core bridge can provide <emphasis>once and only once</emphasis> delivery guarantees without using XA.</para> </note></para> @@ -899,8 +897,8 @@ <para>Add MessageID In Header</para> <para>If <literal>true</literal>, then the original message's message ID will be appended in the message sent to the destination in the header <literal - >HORNETQ_BRIDGE_MSG_ID_LIST</literal>. If the message is bridged more than - once, each message ID will be appended. This enables a distributed + >HORNETQ_BRIDGE_MSG_ID_LIST</literal>. If the message is bridged more + than once, each message ID will be appended. This enables a distributed request-response pattern to be used</para> <note> <para>when you receive the message you can send back a response using the @@ -956,8 +954,8 @@ <title>ONCE_AND_ONLY_ONCE</title> <para>This QoS mode ensures messages will reach the destination from the source once and only once. (Sometimes this mode is known as "exactly once"). If both the - source and the destination are on the same HornetQ server instance then - this can be achieved by sending and acknowledging the messages in the same local + source and the destination are on the same HornetQ server instance then this can + be achieved by sending and acknowledging the messages in the same local transaction. If the source and destination are on different servers this is achieved by enlisting the sending and consuming sessions in a JTA transaction. The JTA transaction is controlled by JBoss Transactions JTA * implementation @@ -995,17 +993,17 @@ or lose network connectivity. For more information on XA Recovery,please refer to <ulink url="http://www.jboss.org/community/wiki/JBossTransactions">JBoss Transactions</ulink>.</para> - <para>When HornetQ is integrated with JBoss AS, it can take advantage of JBoss - Transactions to provide recovery of messaging resources. If messages are involved in a - XA transaction, in the event of a server crash, the recovery manager will ensure that - the transactions are recovered and the messages will either be committed or rolled back + <para>When HornetQ is integrated with JBoss AS, it can take advantage of JBoss Transactions + to provide recovery of messaging resources. If messages are involved in a XA + transaction, in the event of a server crash, the recovery manager will ensure that the + transactions are recovered and the messages will either be committed or rolled back (depending on the transaction outcome) when the server is restarted.</para> <section> <title>XA Recovery Configuration</title> - <para>To enable HornetQs XA Recovery, the Recovery Manager must be configured to - connect to HornetQ to recover its resources. The following property must be - added to the <literal>jta</literal> section of <literal - >conf/jbossts-properties.xml</literal> of JBoss AS profiles:</para> + <para>To enable HornetQs XA Recovery, the Recovery Manager must be configured to connect + to HornetQ to recover its resources. The following property must be added to the + <literal>jta</literal> section of <literal>conf/jbossts-properties.xml</literal> + of JBoss AS profiles:</para> <programlisting> <properties depends="arjuna" name="jta"> ... @@ -1015,15 +1013,15 @@ </properties> </programlisting> <para>The <literal>[connection configuration]</literal> contains all the information - required to connect to HornetQ node under the form <literal>[connector - factory class name],[user name], [password], [connector parameters]</literal>. </para> + required to connect to HornetQ node under the form <literal>[connector factory class + name],[user name], [password], [connector parameters]</literal>. </para> <itemizedlist> <listitem> <para><literal>[connector factory class name]</literal> corresponds to the name of the <literal>ConnectorFactory</literal> used to connect to JBoss Messaging. Values can be <literal - >org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</literal> - or <literal + >org.hornetq.core.remoting.impl.invm.InVMConnectorFactory</literal> or + <literal >org.hornetq.integration.transports.netty.NettyConnectorFactory</literal></para> </listitem> <listitem> @@ -1082,9 +1080,8 @@ <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1" value="org.hornetq.jms.server.recovery.MessagingXAResourceRecovery;org.hornetq.integration.transports.netty.NettyConnectorFactory, admin, adminpass, hornetq.remoting.netty.port=8888"/> </programlisting> - <para>Configuring HornetQ with an invm acceptor and configuring the Recovery - Manager with an invm connector is the recommended way to enable XA - Recovery.</para> + <para>Configuring HornetQ with an invm acceptor and configuring the Recovery Manager + with an invm connector is the recommended way to enable XA Recovery.</para> </section> </section> <section> Modified: trunk/docs/user-manual/en/libaio.xml =================================================================== --- trunk/docs/user-manual/en/libaio.xml 2009-08-20 16:43:27 UTC (rev 7835) +++ trunk/docs/user-manual/en/libaio.xml 2009-08-20 16:45:14 UTC (rev 7836) @@ -10,13 +10,13 @@ <para>These are the native libraries distributed by HornetQ:</para> <itemizedlist> <listitem> - <para>libHornetQLibAIO32.so - x86 32 bits</para> + <para>libHornetQAIO32.so - x86 32 bits</para> </listitem> <listitem> - <para>libHornetQLibAIO64.so - x86 64 bits</para> + <para>libHornetQAIO64.so - x86 64 bits</para> </listitem> <listitem> - <para>libHornetQLibAIO_ia64.so - Itanium 64 bits</para> + <para>libHornetQAIO_ia64.so - Itanium 64 bits</para> </listitem> </itemizedlist> <para>When using libaio, HornetQ will aways try loading these files as long as they are Copied: trunk/native/bin/libHornetQAIO32.so (from rev 7829, trunk/native/bin/libHornetQnative32.so) =================================================================== (Binary files differ) Copied: trunk/native/bin/libHornetQAIO64.so (from rev 7829, trunk/native/bin/libHornetQnative64.so) =================================================================== (Binary files differ) Deleted: trunk/native/bin/libHornetQnative32.so =================================================================== (Binary files differ) Deleted: trunk/native/bin/libHornetQnative64.so =================================================================== (Binary files differ) Modified: trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java 2009-08-20 16:43:27 UTC (rev 7835) +++ trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java 2009-08-20 16:45:14 UTC (rev 7836) @@ -92,7 +92,7 @@ static { - String libraries[] = new String[] { "HornetQnative", "HornetQnative64", "HornetQnative32", "HornetQnative_ia64" }; + String libraries[] = new String[] { "HornetQAIO", "HornetQAIO64", "HornetQAIO32", "HornetQAIO_ia64" }; for (String library : libraries) { Modified: trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java 2009-08-20 16:43:27 UTC (rev 7835) +++ trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java 2009-08-20 16:45:14 UTC (rev 7836) @@ -40,9 +40,6 @@ { super.setUp(); - //reset - AsynchronousFileImpl.resetMaxAIO(); - factory = createFactory(); } @@ -200,185 +197,199 @@ } - // TODO: RE-ENABLE THIS -// public void testWriteandRead() throws Exception -// { -// SequentialFile sf = factory.createSequentialFile("write.hq", 1); -// -// sf.open(); -// -// String s1 = "aardvark"; -// byte[] bytes1 = s1.getBytes("UTF-8"); -// ByteBuffer bb1 = factory.wrapBuffer(bytes1); -// -// String s2 = "hippopotamus"; -// byte[] bytes2 = s2.getBytes("UTF-8"); -// ByteBuffer bb2 = factory.wrapBuffer(bytes2); -// -// String s3 = "echidna"; -// byte[] bytes3 = s3.getBytes("UTF-8"); -// ByteBuffer bb3 = factory.wrapBuffer(bytes3); -// -// int bytesWritten = sf.write(bb1, true); -// -// assertEquals(calculateRecordSize(bytes1.length, sf.getAlignment()), bytesWritten); -// -// bytesWritten = sf.write(bb2, true); -// -// assertEquals(calculateRecordSize(bytes2.length, sf.getAlignment()), bytesWritten); -// -// bytesWritten = sf.write(bb3, true); -// -// assertEquals(calculateRecordSize(bytes3.length, sf.getAlignment()), bytesWritten); -// -// sf.position(0); -// -// ByteBuffer rb1 = factory.newBuffer(bytes1.length); -// ByteBuffer rb2 = factory.newBuffer(bytes2.length); -// ByteBuffer rb3 = factory.newBuffer(bytes3.length); -// -// int bytesRead = sf.read(rb1); -// assertEquals(calculateRecordSize(bytes1.length, sf.getAlignment()), bytesRead); -// -// for (int i = 0; i < bytes1.length; i++) -// { -// assertEquals(bytes1[i], rb1.get(i)); -// } -// -// bytesRead = sf.read(rb2); -// assertEquals(calculateRecordSize(bytes2.length, sf.getAlignment()), bytesRead); -// for (int i = 0; i < bytes2.length; i++) -// { -// assertEquals(bytes2[i], rb2.get(i)); -// } -// -// bytesRead = sf.read(rb3); -// assertEquals(calculateRecordSize(bytes3.length, sf.getAlignment()), bytesRead); -// for (int i = 0; i < bytes3.length; i++) -// { -// assertEquals(bytes3[i], rb3.get(i)); -// } -// -// sf.close(); -// -// } -// -// public void testPosition() throws Exception -// { -// SequentialFile sf = factory.createSequentialFile("position.hq", 1); -// -// sf.open(); -// -// try -// { -// -// sf.fill(0, 3 * 512, (byte)0); -// -// String s1 = "orange"; -// byte[] bytes1 = s1.getBytes("UTF-8"); -// ByteBuffer bb1 = factory.wrapBuffer(bytes1); -// -// byte[] bytes2 = s1.getBytes("UTF-8"); -// ByteBuffer bb2 = factory.wrapBuffer(bytes2); -// -// String s3 = "lemon"; -// byte[] bytes3 = s3.getBytes("UTF-8"); -// ByteBuffer bb3 = factory.wrapBuffer(bytes3); -// -// int bytesWritten = sf.write(bb1, true); -// -// assertEquals(bb1.limit(), bytesWritten); -// -// bytesWritten = sf.write(bb2, true); -// -// assertEquals(bb2.limit(), bytesWritten); -// -// bytesWritten = sf.write(bb3, true); -// -// assertEquals(bb3.limit(), bytesWritten); -// -// byte[] rbytes1 = new byte[bytes1.length]; -// -// byte[] rbytes2 = new byte[bytes2.length]; -// -// byte[] rbytes3 = new byte[bytes3.length]; -// -// ByteBuffer rb1 = factory.newBuffer(rbytes1.length); -// ByteBuffer rb2 = factory.newBuffer(rbytes2.length); -// ByteBuffer rb3 = factory.newBuffer(rbytes3.length); -// -// sf.position(bb1.limit() + bb2.limit()); -// -// int bytesRead = sf.read(rb3); -// assertEquals(rb3.limit(), bytesRead); -// rb3.rewind(); -// rb3.get(rbytes3); -// assertEqualsByteArrays(bytes3, rbytes3); -// -// sf.position(rb1.limit()); -// -// bytesRead = sf.read(rb2); -// assertEquals(rb2.limit(), bytesRead); -// rb2.get(rbytes2); -// assertEqualsByteArrays(bytes2, rbytes2); -// -// sf.position(0); -// -// bytesRead = sf.read(rb1); -// assertEquals(rb1.limit(), bytesRead); -// rb1.get(rbytes1); -// -// assertEqualsByteArrays(bytes1, rbytes1); -// -// } -// finally -// { -// try -// { -// sf.close(); -// } -// catch (Exception ignored) -// { -// } -// } -// } -// -// public void testOpenClose() throws Exception -// { -// SequentialFile sf = factory.createSequentialFile("openclose.hq", 1); -// -// sf.open(); -// -// sf.fill(0, 512, (byte)0); -// -// String s1 = "cheesecake"; -// byte[] bytes1 = s1.getBytes("UTF-8"); -// ByteBuffer bb1 = factory.wrapBuffer(bytes1); -// -// int bytesWritten = sf.write(bb1, true); -// -// assertEquals(bb1.limit(), bytesWritten); -// -// sf.close(); -// -// try -// { -// sf.write(bb1, true); -// -// fail("Should throw exception"); -// } -// catch (Exception e) -// { -// // OK -// } -// -// sf.open(); -// -// sf.write(bb1, true); -// -// sf.close(); -// } + public void testWriteandRead() throws Exception + { + SequentialFile sf = factory.createSequentialFile("write.hq", 1); + sf.open(); + + String s1 = "aardvark"; + byte[] bytes1 = s1.getBytes("UTF-8"); + ByteBuffer bb1 = factory.wrapBuffer(bytes1); + + String s2 = "hippopotamus"; + byte[] bytes2 = s2.getBytes("UTF-8"); + ByteBuffer bb2 = factory.wrapBuffer(bytes2); + + String s3 = "echidna"; + byte[] bytes3 = s3.getBytes("UTF-8"); + ByteBuffer bb3 = factory.wrapBuffer(bytes3); + + long initialPos = sf.position(); + sf.write(bb1, true); + long bytesWritten = sf.position() - initialPos; + + assertEquals(calculateRecordSize(bytes1.length, sf.getAlignment()), bytesWritten); + + initialPos = sf.position(); + sf.write(bb2, true); + bytesWritten = sf.position() - initialPos; + + assertEquals(calculateRecordSize(bytes2.length, sf.getAlignment()), bytesWritten); + + initialPos = sf.position(); + sf.write(bb3, true); + bytesWritten = sf.position() - initialPos; + + assertEquals(calculateRecordSize(bytes3.length, sf.getAlignment()), bytesWritten); + + sf.position(0); + + ByteBuffer rb1 = factory.newBuffer(bytes1.length); + ByteBuffer rb2 = factory.newBuffer(bytes2.length); + ByteBuffer rb3 = factory.newBuffer(bytes3.length); + + int bytesRead = sf.read(rb1); + assertEquals(calculateRecordSize(bytes1.length, sf.getAlignment()), bytesRead); + + for (int i = 0; i < bytes1.length; i++) + { + assertEquals(bytes1[i], rb1.get(i)); + } + + bytesRead = sf.read(rb2); + assertEquals(calculateRecordSize(bytes2.length, sf.getAlignment()), bytesRead); + for (int i = 0; i < bytes2.length; i++) + { + assertEquals(bytes2[i], rb2.get(i)); + } + + bytesRead = sf.read(rb3); + assertEquals(calculateRecordSize(bytes3.length, sf.getAlignment()), bytesRead); + for (int i = 0; i < bytes3.length; i++) + { + assertEquals(bytes3[i], rb3.get(i)); + } + + sf.close(); + + } + + public void testPosition() throws Exception + { + SequentialFile sf = factory.createSequentialFile("position.hq", 1); + + sf.open(); + + try + { + + sf.fill(0, 3 * 512, (byte)0); + + String s1 = "orange"; + byte[] bytes1 = s1.getBytes("UTF-8"); + ByteBuffer bb1 = factory.wrapBuffer(bytes1); + + byte[] bytes2 = s1.getBytes("UTF-8"); + ByteBuffer bb2 = factory.wrapBuffer(bytes2); + + String s3 = "lemon"; + byte[] bytes3 = s3.getBytes("UTF-8"); + ByteBuffer bb3 = factory.wrapBuffer(bytes3); + + long initialPos = sf.position(); + sf.write(bb1, true); + long bytesWritten = sf.position() - initialPos; + + assertEquals(bb1.limit(), bytesWritten); + + initialPos = sf.position(); + sf.write(bb2, true); + bytesWritten = sf.position() - initialPos; + + + assertEquals(bb2.limit(), bytesWritten); + + initialPos = sf.position(); + sf.write(bb3, true); + bytesWritten = sf.position() - initialPos; + + assertEquals(bb3.limit(), bytesWritten); + + byte[] rbytes1 = new byte[bytes1.length]; + + byte[] rbytes2 = new byte[bytes2.length]; + + byte[] rbytes3 = new byte[bytes3.length]; + + ByteBuffer rb1 = factory.newBuffer(rbytes1.length); + ByteBuffer rb2 = factory.newBuffer(rbytes2.length); + ByteBuffer rb3 = factory.newBuffer(rbytes3.length); + + sf.position(bb1.limit() + bb2.limit()); + + int bytesRead = sf.read(rb3); + assertEquals(rb3.limit(), bytesRead); + rb3.rewind(); + rb3.get(rbytes3); + assertEqualsByteArrays(bytes3, rbytes3); + + sf.position(rb1.limit()); + + bytesRead = sf.read(rb2); + assertEquals(rb2.limit(), bytesRead); + rb2.get(rbytes2); + assertEqualsByteArrays(bytes2, rbytes2); + + sf.position(0); + + bytesRead = sf.read(rb1); + assertEquals(rb1.limit(), bytesRead); + rb1.get(rbytes1); + + assertEqualsByteArrays(bytes1, rbytes1); + + } + finally + { + try + { + sf.close(); + } + catch (Exception ignored) + { + } + } + } + + public void testOpenClose() throws Exception + { + SequentialFile sf = factory.createSequentialFile("openclose.hq", 1); + + sf.open(); + + sf.fill(0, 512, (byte)0); + + String s1 = "cheesecake"; + byte[] bytes1 = s1.getBytes("UTF-8"); + ByteBuffer bb1 = factory.wrapBuffer(bytes1); + + long initialPos = sf.position(); + sf.write(bb1, true); + long bytesWritten = sf.position() - initialPos; + + assertEquals(bb1.limit(), bytesWritten); + + sf.close(); + + try + { + sf.write(bb1, true); + + fail("Should throw exception"); + } + catch (Exception e) + { + // OK + } + + sf.open(); + + sf.write(bb1, true); + + sf.close(); + } + // Private --------------------------------- protected void checkFill(final SequentialFile file, final int pos, final int size, final byte fillChar) throws Exception Modified: trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2009-08-20 16:43:27 UTC (rev 7835) +++ trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2009-08-20 16:45:14 UTC (rev 7836) @@ -566,7 +566,8 @@ if (AsynchronousFileImpl.getTotalMaxIO() != 0) { - log.warn("test did not close all its files " + AsynchronousFileImpl.getTotalMaxIO()); + AsynchronousFileImpl.resetMaxAIO(); + fail("test did not close all its files " + AsynchronousFileImpl.getTotalMaxIO()); } super.tearDown();

15 years, 4 months

1
0
0 / 0

JBoss hornetq SVN: r7835 - in trunk: src/config/jboss-as/non-clustered and 2 other directories.

by do-not-reply＠jboss.org

Author: timfox Date: 2009-08-20 12:43:27 -0400 (Thu, 20 Aug 2009) New Revision: 7835 Modified: trunk/src/config/jboss-as/clustered/jms-ds.xml trunk/src/config/jboss-as/non-clustered/jms-ds.xml trunk/tests/smoke/artifacts/smoketest-clustered-queue-service.xml trunk/tests/smoke/artifacts/smoketest-clustered-topic-service.xml trunk/tests/smoke/artifacts/smoketest-queue-service.xml trunk/tests/smoke/artifacts/smoketest-topic-service.xml trunk/tests/smoke/build.xml Log: changed old jboss.messaging object names Modified: trunk/src/config/jboss-as/clustered/jms-ds.xml =================================================================== --- trunk/src/config/jboss-as/clustered/jms-ds.xml 2009-08-20 16:38:52 UTC (rev 7834) +++ trunk/src/config/jboss-as/clustered/jms-ds.xml 2009-08-20 16:43:27 UTC (rev 7835) @@ -3,7 +3,7 @@ JMS Stuff --> - <mbean code="org.jboss.jms.jndi.JMSProviderLoader" name="jboss.messaging:service=JMSProviderLoader,name=JMSProvider"> + <mbean code="org.jboss.jms.jndi.JMSProviderLoader" name="hornetq:service=JMSProviderLoader,name=JMSProvider"> <attribute name="ProviderName">DefaultJMSProvider</attribute> <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute> <attribute name="FactoryRef">java:/XAConnectionFactory</attribute> Modified: trunk/src/config/jboss-as/non-clustered/jms-ds.xml =================================================================== --- trunk/src/config/jboss-as/non-clustered/jms-ds.xml 2009-08-20 16:38:52 UTC (rev 7834) +++ trunk/src/config/jboss-as/non-clustered/jms-ds.xml 2009-08-20 16:43:27 UTC (rev 7835) @@ -3,7 +3,7 @@ JMS Stuff --> - <mbean code="org.jboss.jms.jndi.JMSProviderLoader" name="jboss.messaging:service=JMSProviderLoader,name=JMSProvider"> + <mbean code="org.jboss.jms.jndi.JMSProviderLoader" name="hornetq:service=JMSProviderLoader,name=JMSProvider"> <attribute name="ProviderName">DefaultJMSProvider</attribute> <attribute name="ProviderAdapterClass">org.jboss.jms.jndi.JNDIProviderAdapter</attribute> <attribute name="FactoryRef">java:/XAConnectionFactory</attribute> Modified: trunk/tests/smoke/artifacts/smoketest-clustered-queue-service.xml =================================================================== --- trunk/tests/smoke/artifacts/smoketest-clustered-queue-service.xml 2009-08-20 16:38:52 UTC (rev 7834) +++ trunk/tests/smoke/artifacts/smoketest-clustered-queue-service.xml 2009-08-20 16:43:27 UTC (rev 7835) @@ -6,8 +6,8 @@ name="jboss.messaging.destination:service=Queue,name=DistributedSmokeTestQueue" xmbean-dd="xmdesc/Queue-xmbean.xml"> <attribute name="Clustered">true</attribute> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> + <depends optional-attribute-name="ServerPeer">hornetq:service=ServerPeer</depends> + <depends>hornetq:service=PostOffice</depends> </mbean> </server> Modified: trunk/tests/smoke/artifacts/smoketest-clustered-topic-service.xml =================================================================== --- trunk/tests/smoke/artifacts/smoketest-clustered-topic-service.xml 2009-08-20 16:38:52 UTC (rev 7834) +++ trunk/tests/smoke/artifacts/smoketest-clustered-topic-service.xml 2009-08-20 16:43:27 UTC (rev 7835) @@ -6,8 +6,8 @@ name="jboss.messaging.destination:service=Topic,name=DistributedSmokeTestTopic" xmbean-dd="xmdesc/Topic-xmbean.xml"> <attribute name="Clustered">true</attribute> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> + <depends optional-attribute-name="ServerPeer">hornetq:service=ServerPeer</depends> + <depends>hornetq:service=PostOffice</depends> </mbean> </server> Modified: trunk/tests/smoke/artifacts/smoketest-queue-service.xml =================================================================== --- trunk/tests/smoke/artifacts/smoketest-queue-service.xml 2009-08-20 16:38:52 UTC (rev 7834) +++ trunk/tests/smoke/artifacts/smoketest-queue-service.xml 2009-08-20 16:43:27 UTC (rev 7835) @@ -5,7 +5,7 @@ <mbean code="org.hornetq.jms.server.destination.QueueService" name="jboss.messaging.destination:service=Queue,name=SmokeTestQueue" xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends optional-attribute-name="ServerPeer">hornetq:service=ServerPeer</depends> </mbean> </server> Modified: trunk/tests/smoke/artifacts/smoketest-topic-service.xml =================================================================== --- trunk/tests/smoke/artifacts/smoketest-topic-service.xml 2009-08-20 16:38:52 UTC (rev 7834) +++ trunk/tests/smoke/artifacts/smoketest-topic-service.xml 2009-08-20 16:43:27 UTC (rev 7835) @@ -5,7 +5,7 @@ <mbean code="org.hornetq.jms.server.destination.TopicService" name="jboss.messaging.destination:service=Topic,name=SmokeTestTopic" xmbean-dd="xmdesc/Topic-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends optional-attribute-name="ServerPeer">hornetq:service=ServerPeer</depends> </mbean> </server> Modified: trunk/tests/smoke/build.xml =================================================================== --- trunk/tests/smoke/build.xml 2009-08-20 16:38:52 UTC (rev 7834) +++ trunk/tests/smoke/build.xml 2009-08-20 16:43:27 UTC (rev 7835) @@ -633,7 +633,7 @@ <java classname="org.jboss.console.twiddle.Twiddle" fork="yes" failonerror="yes" dir="${jboss.home}/bin"> - <arg line="-s jnp://localhost:${jnpPort} get jboss.messaging:service=ServerPeer ServerPeerID"/> + <arg line="-s jnp://localhost:${jnpPort} get hornetq:service=ServerPeer ServerPeerID"/> <classpath> <path refid="twiddle.classpath"/> </classpath>

15 years, 4 months

1
0
0 / 0

JBoss hornetq SVN: r7834 - in trunk/src/config/jboss-as: clustered and 1 other directories.

by do-not-reply＠jboss.org

Author: timfox Date: 2009-08-20 12:38:52 -0400 (Thu, 20 Aug 2009) New Revision: 7834 Added: trunk/src/config/jboss-as/clustered/hornetq-roles.properties trunk/src/config/jboss-as/clustered/hornetq-users.properties trunk/src/config/jboss-as/non-clustered/hornetq-roles.properties trunk/src/config/jboss-as/non-clustered/hornetq-users.properties Removed: trunk/src/config/jboss-as/clustered/messaging-roles.properties trunk/src/config/jboss-as/clustered/messaging-users.properties trunk/src/config/jboss-as/non-clustered/messaging-roles.properties trunk/src/config/jboss-as/non-clustered/messaging-users.properties Modified: trunk/src/config/jboss-as/build.xml trunk/src/config/jboss-as/clustered/login-config.xml trunk/src/config/jboss-as/non-clustered/login-config.xml Log: renamed messaging-users and messaging-roles.properties Modified: trunk/src/config/jboss-as/build.xml =================================================================== --- trunk/src/config/jboss-as/build.xml 2009-08-20 16:35:13 UTC (rev 7833) +++ trunk/src/config/jboss-as/build.xml 2009-08-20 16:38:52 UTC (rev 7834) @@ -63,8 +63,8 @@ </copy> <copy todir="${dest.dir}/conf/props"> <fileset dir="${messaging.config.dir}"> - <include name="messaging-users.properties"/> - <include name="messaging-roles.properties"/> + <include name="hornetq-users.properties"/> + <include name="hornetq-roles.properties"/> </fileset> </copy> <copy todir="${dest.dir}/lib"> Copied: trunk/src/config/jboss-as/clustered/hornetq-roles.properties (from rev 7828, trunk/src/config/jboss-as/clustered/messaging-roles.properties) =================================================================== --- trunk/src/config/jboss-as/clustered/hornetq-roles.properties (rev 0) +++ trunk/src/config/jboss-as/clustered/hornetq-roles.properties 2009-08-20 16:38:52 UTC (rev 7834) @@ -0,0 +1,4 @@ +# +# user=role1,role2,... +# +guest=guest Copied: trunk/src/config/jboss-as/clustered/hornetq-users.properties (from rev 7828, trunk/src/config/jboss-as/clustered/messaging-users.properties) =================================================================== --- trunk/src/config/jboss-as/clustered/hornetq-users.properties (rev 0) +++ trunk/src/config/jboss-as/clustered/hornetq-users.properties 2009-08-20 16:38:52 UTC (rev 7834) @@ -0,0 +1,4 @@ +# +# user=password +# +guest=guest Modified: trunk/src/config/jboss-as/clustered/login-config.xml =================================================================== --- trunk/src/config/jboss-as/clustered/login-config.xml 2009-08-20 16:35:13 UTC (rev 7833) +++ trunk/src/config/jboss-as/clustered/login-config.xml 2009-08-20 16:38:52 UTC (rev 7834) @@ -72,8 +72,8 @@ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"> <module-option name = "unauthenticatedIdentity">guest</module-option> - <module-option name="usersProperties">props/messaging-users.properties</module-option> - <module-option name="rolesProperties">props/messaging-roles.properties</module-option> + <module-option name="usersProperties">props/hornetq-users.properties</module-option> + <module-option name="rolesProperties">props/hornetq-roles.properties</module-option> </login-module> </authentication> </application-policy> Deleted: trunk/src/config/jboss-as/clustered/messaging-roles.properties =================================================================== --- trunk/src/config/jboss-as/clustered/messaging-roles.properties 2009-08-20 16:35:13 UTC (rev 7833) +++ trunk/src/config/jboss-as/clustered/messaging-roles.properties 2009-08-20 16:38:52 UTC (rev 7834) @@ -1,4 +0,0 @@ -# -# user=role1,role2,... -# -guest=guest Deleted: trunk/src/config/jboss-as/clustered/messaging-users.properties =================================================================== --- trunk/src/config/jboss-as/clustered/messaging-users.properties 2009-08-20 16:35:13 UTC (rev 7833) +++ trunk/src/config/jboss-as/clustered/messaging-users.properties 2009-08-20 16:38:52 UTC (rev 7834) @@ -1,4 +0,0 @@ -# -# user=password -# -guest=guest Copied: trunk/src/config/jboss-as/non-clustered/hornetq-roles.properties (from rev 7828, trunk/src/config/jboss-as/non-clustered/messaging-roles.properties) =================================================================== --- trunk/src/config/jboss-as/non-clustered/hornetq-roles.properties (rev 0) +++ trunk/src/config/jboss-as/non-clustered/hornetq-roles.properties 2009-08-20 16:38:52 UTC (rev 7834) @@ -0,0 +1,4 @@ +# +# user=role1,role2,... +# +guest=guest Copied: trunk/src/config/jboss-as/non-clustered/hornetq-users.properties (from rev 7828, trunk/src/config/jboss-as/non-clustered/messaging-users.properties) =================================================================== --- trunk/src/config/jboss-as/non-clustered/hornetq-users.properties (rev 0) +++ trunk/src/config/jboss-as/non-clustered/hornetq-users.properties 2009-08-20 16:38:52 UTC (rev 7834) @@ -0,0 +1,4 @@ +# +# user=password +# +guest=guest Modified: trunk/src/config/jboss-as/non-clustered/login-config.xml =================================================================== --- trunk/src/config/jboss-as/non-clustered/login-config.xml 2009-08-20 16:35:13 UTC (rev 7833) +++ trunk/src/config/jboss-as/non-clustered/login-config.xml 2009-08-20 16:38:52 UTC (rev 7834) @@ -72,8 +72,8 @@ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"> <module-option name = "unauthenticatedIdentity">guest</module-option> - <module-option name="usersProperties">props/messaging-users.properties</module-option> - <module-option name="rolesProperties">props/messaging-roles.properties</module-option> + <module-option name="usersProperties">props/hornetq-users.properties</module-option> + <module-option name="rolesProperties">props/hornetq-roles.properties</module-option> </login-module> </authentication> </application-policy> Deleted: trunk/src/config/jboss-as/non-clustered/messaging-roles.properties =================================================================== --- trunk/src/config/jboss-as/non-clustered/messaging-roles.properties 2009-08-20 16:35:13 UTC (rev 7833) +++ trunk/src/config/jboss-as/non-clustered/messaging-roles.properties 2009-08-20 16:38:52 UTC (rev 7834) @@ -1,4 +0,0 @@ -# -# user=role1,role2,... -# -guest=guest Deleted: trunk/src/config/jboss-as/non-clustered/messaging-users.properties =================================================================== --- trunk/src/config/jboss-as/non-clustered/messaging-users.properties 2009-08-20 16:35:13 UTC (rev 7833) +++ trunk/src/config/jboss-as/non-clustered/messaging-users.properties 2009-08-20 16:38:52 UTC (rev 7834) @@ -1,4 +0,0 @@ -# -# user=password -# -guest=guest

15 years, 4 months

1
0
0 / 0

JBoss hornetq SVN: r7833 - in trunk/docs/quickstart-guide: en and 1 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-08-20 12:35:13 -0400 (Thu, 20 Aug 2009) New Revision: 7833 Added: trunk/docs/quickstart-guide/en/images/hornetQ_logo_600px.png Modified: trunk/docs/quickstart-guide/build.xml trunk/docs/quickstart-guide/en/about.xml trunk/docs/quickstart-guide/en/download.xml trunk/docs/quickstart-guide/en/examples.xml trunk/docs/quickstart-guide/en/installation.xml trunk/docs/quickstart-guide/en/introduction.xml trunk/docs/quickstart-guide/en/master.xml trunk/docs/quickstart-guide/en/running.xml Log: updated user manual for HornetQ Modified: trunk/docs/quickstart-guide/build.xml =================================================================== --- trunk/docs/quickstart-guide/build.xml 2009-08-20 16:30:30 UTC (rev 7832) +++ trunk/docs/quickstart-guide/build.xml 2009-08-20 16:35:13 UTC (rev 7833) @@ -1,7 +1,7 @@ -<project name="hornetq.quickstart.documentation" default="all" basedir="."> +<project name="HornetQ QuickStart Guide" default="all" basedir="."> <property name="build.dir" value="build"/> - <property name="pdf.name" value="JBossMessaging_QuickStartGuide.pdf"/> + <property name="pdf.name" value="HornetQ_QuickStartGuide.pdf"/> <import file="${basedir}/../../lib/docbook-support/support.xml"/> <target name="all" depends="clean"> Modified: trunk/docs/quickstart-guide/en/about.xml =================================================================== --- trunk/docs/quickstart-guide/en/about.xml 2009-08-20 16:30:30 UTC (rev 7832) +++ trunk/docs/quickstart-guide/en/about.xml 2009-08-20 16:35:13 UTC (rev 7833) @@ -1,4 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> + + + <chapter id="about"> <title>About HornetQ</title> <para>The goal of HornetQ is simple and uncompromising: to bring unrivaled levels of @@ -22,8 +41,8 @@ and others you won't find anywhere else.</para> </listitem> <listitem> - <para>Elegant POJO based design with minimal third party dependencies. Run JBoss - Messaging stand-alone, run it in integrated in your favourite Java EE Application + <para>Elegant POJO based design with minimal third party dependencies. Run HornetQ + stand-alone, run it in integrated in your favourite Java EE Application Server or IoC container, or run it embedded inside your own product.</para> </listitem> <listitem> Modified: trunk/docs/quickstart-guide/en/download.xml =================================================================== --- trunk/docs/quickstart-guide/en/download.xml 2009-08-20 16:30:30 UTC (rev 7832) +++ trunk/docs/quickstart-guide/en/download.xml 2009-08-20 16:35:13 UTC (rev 7833) @@ -1,26 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> + + + <chapter id="download"> <title>Download</title> <para>The official HornetQ project page is <ulink - url="http://www.jboss.org/jbossmessaging/">http://www.jboss.org/jbossmessaging/</ulink>.</para> + url="http://hornetq.org/">http://hornetq.org/</ulink>.</para> <section id="download.software"> <title>Software Download</title> - <para>The download location is the JBoss Labs Messaging Project download - zone: <ulink - url="http://www.jboss.org/jbossmessaging/downloads/">http://www.jboss.org/jbossmessaging/downloads/</ulink></para> + <para>The software can be download from the Download page:<ulink + url="http://hornetq.org/downloads.html/">http://hornetq.org/downloads.html</ulink></para> </section> <section id="download.svn"> <title>Project Information</title> <para>If you have any user questions please use our <ulink - url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=238">user + url="http://n2.nabble.com/hornetq-users-f3404100.html">user forum</ulink></para> <para>If you have development related questions, please use our <ulink - url="http://www.jboss.org/index.html?module=bb&op=viewforum&f=153">development + url="http://n2.nabble.com/hornetq-dev-f3404069.html">development forum</ulink></para> - <para>Pop in and chat to us in our <ulink url="irc://irc.freenode.net:6667/jbossmessaging">IRC channel</ulink></para> - <para>HornetQ Subversion TRUNK is <ulink url="http://anonsvn.jboss.org/repos/messaging/trunk">here</ulink></para> - <para>All our release tags are <ulink url="http://anonsvn.jboss.org/repos/messaging/tags">here</ulink></para> + <para>Pop in and chat to us in our <ulink url="irc://irc.freenode.net:6667/hornetq">IRC channel</ulink></para> + <para>HornetQ Subversion trunk is <ulink url="http://anonsvn.jboss.org/repos/hornetq/trunk">http://anonsvn.jboss.org/repos/hornetq/trunk</ulink></para> + <para>All release tags are available from <ulink url="http://anonsvn.jboss.org/repos/hornetq/tags">http://anonsvn.jboss.org/repos/hornetq/tags</ulink></para> </section> </chapter> \ No newline at end of file Modified: trunk/docs/quickstart-guide/en/examples.xml =================================================================== --- trunk/docs/quickstart-guide/en/examples.xml 2009-08-20 16:30:30 UTC (rev 7832) +++ trunk/docs/quickstart-guide/en/examples.xml 2009-08-20 16:35:13 UTC (rev 7833) @@ -1,4 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> + + + <chapter id="examples"> <title>Running the Examples</title> <para>In the directory <literal>examples</literal> there are 2 sets of examples, these are </para> @@ -48,8 +67,8 @@ init: compile: - [echo] src.example.dir=/home/andy/projects/HornetQTrunk/examples/jms/queue/src - [javac] Compiling 5 source files to /home/andy/projects/HornetQTrunk/examples/jms/queue + [echo] src.example.dir=/home/andy/projects/hornetq/trunk/examples/jms/queue/src + [javac] Compiling 5 source files to /home/andy/projects/hornetq/trunk/examples/jms/queue /build/classes runExample: @@ -58,7 +77,7 @@ logServerOutput true [java] 10:41:04,149 INFO @main [JMSExample] and vm args: -Xms512M,-Xmx512M,-XX:+U seParallelGC,-XX:+AggressiveOpts,-XX:+UseFastAccessorMethods,-Djava.util.logging.config. -file=/home/andy/projects/HornetQTrunk/examples/jms/common/../../../src/config/stand-alone/no +file=/home/andy/projects/hornetq/trunk/examples/jms/common/../../../src/config/stand-alone/no n-clustered/logging.properties [java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:08,437 INFO @main [Journal StorageManager] AIO journal selected @@ -81,7 +100,7 @@ [java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:10,991 WARN @main [JMSServ erManagerImpl] Binding for java:/XAConnectionFactory already exists [java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:11,241 INFO @main [Messagi -ngServerImpl] HornetQ Server version 2.0.0.BETA1-SNAPSHOT (Stilton, 101) started +ngServerImpl] HornetQ Server version 2.0.0.BETA5 (buzz-buzz, 107) started [java] org.hornetq.jms.example.SpawnedJMSServer out:10:41:11,241 INFO @main [HornetQBoot strapServer] HornetQ server started [java] org.hornetq.jms.example.SpawnedJMSServer out:STARTED:: @@ -97,7 +116,7 @@ BUILD SUCCESSFUL Total time: 13 seconds </programlisting> - <para>Congratulations! You have succesfully run your first HornetQ example. Try some + <para>Congratulations! You have successfully run your first HornetQ example. Try some of the others.</para> </section> <section id="examples.messaging"> @@ -136,11 +155,11 @@ compile: jar: - [jar] Building jar: /home/andy/projects/HornetQTrunk/examples/javaee/mdb/build/mdb-exa + [jar] Building jar: /home/andy/projects/hornetq/trunk/examples/javaee/mdb/build/mdb-exa mple.jar ear: - [jar] Building jar: /home/andy/projects/HornetQTrunk/examples/javaee/mdb/build/mdb-exa + [jar] Building jar: /home/andy/projects/hornetq/trunk/examples/javaee/mdb/build/mdb-exa mple.ear deploy-ear: @@ -209,10 +228,10 @@ Total time: 1 second </programlisting> <para>You can verify that the application has been undeployed by checking the output from the - JBoss Application Server, in this isntance it will be something like:</para> - <programlisting>16:36:45,277 INFO [EJBContainer] STOPPED EJB: org.hornetq.javaee.example.server.MDBExample + JBoss Application Server, in this instance it will be something like:</para> + <programlisting>16:36:45,277 INFO [EJBContainer] STOPPED EJB: org.jboss.javaee.example.server.MDBExample ejbName: MessageMDBExample </programlisting> - <para>Congratulations! you have sucessfully deployed and run a Java EE example.</para> + <para>Congratulations! you have successfully deployed and run a Java EE example.</para> </section> </chapter> Added: trunk/docs/quickstart-guide/en/images/hornetQ_logo_600px.png =================================================================== (Binary files differ) Property changes on: trunk/docs/quickstart-guide/en/images/hornetQ_logo_600px.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/docs/quickstart-guide/en/installation.xml =================================================================== --- trunk/docs/quickstart-guide/en/installation.xml 2009-08-20 16:30:30 UTC (rev 7832) +++ trunk/docs/quickstart-guide/en/installation.xml 2009-08-20 16:35:13 UTC (rev 7833) @@ -1,4 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> + + + <chapter id="installation"> <title>Installation</title> <para>This section describes how to install HornetQ. </para> @@ -76,7 +95,7 @@ </section> <section id="installation.jboss"> <title>HornetQ In JBoss AS 5</title> - <para>HornetQ 2.0 can be deployed in <ulink url="http://www.jboss.org/jbossas/">JBoss + <para>HornetQ can be deployed in <ulink url="http://www.jboss.org/jbossas/">JBoss AS 5</ulink>. It is not shipped by default with the application server and you need to create new AS 5 profiles to run AS 5 with HornetQ.</para> <para>To create AS 5 profiles:</para> @@ -97,12 +116,12 @@ <itemizedlist> <listitem> <para><literal>default-with-hornetq</literal> -- it corresponds to AS 5 <literal - >default</literal> profile with HornetQ 2 as its JMS provider. In this + >default</literal> profile with HornetQ as its JMS provider. In this profile, HornetQ is <emphasis>non-clustered</emphasis></para> </listitem> <listitem> <para><literal>all-with-hornetq</literal> -- it corresponds to AS 5 <literal>all</literal> - profile with HornetQ 2 as its JMS provider. In this profile, HornetQ + profile with HornetQ as its JMS provider. In this profile, HornetQ is <emphasis>clustered</emphasis></para> </listitem> </itemizedlist> Modified: trunk/docs/quickstart-guide/en/introduction.xml =================================================================== --- trunk/docs/quickstart-guide/en/introduction.xml 2009-08-20 16:30:30 UTC (rev 7832) +++ trunk/docs/quickstart-guide/en/introduction.xml 2009-08-20 16:35:13 UTC (rev 7833) @@ -1,8 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> + + + <chapter id="introduction"> <title>Getting Started</title> - <para>This short guide explains how to download, install and quickly get started with JBoss - Messaging.</para> + <para>This short guide explains how to download, install and quickly get started with HornetQ.</para> <para>After downloading and installing we highly recommend you run the examples to get acquainted with HornetQ. We ship with over 50 examples demonstrating most of the features.</para> Modified: trunk/docs/quickstart-guide/en/master.xml =================================================================== --- trunk/docs/quickstart-guide/en/master.xml 2009-08-20 16:30:30 UTC (rev 7832) +++ trunk/docs/quickstart-guide/en/master.xml 2009-08-20 16:35:13 UTC (rev 7833) @@ -1,4 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> + + + <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN" "../../../lib/docbook-support/support/docbook-dtd/docbookx.dtd" [ <!ENTITY about SYSTEM "about.xml"> @@ -10,8 +29,28 @@ ]> <book lang="en"> <bookinfo> - <title>HornetQ 2.0 Quickstart Guide</title> - <subtitle>Setting the Standard for High Performance Messaging</subtitle> + <title>HornetQ Quickstart Guide</title> + <subtitle>Putting the buzz in messaging</subtitle> + <legalnotice> + <para>Copyright © 2009 Red Hat, Inc. and others.</para> + <para>The text of and illustrations in this document are licensed by Red Hat under + a Creative Commons Attribution–Share Alike 3.0 Unported license ("CC-BY-SA").</para> + <para>An explanation of CC-BY-SA is available at + <ulink url="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</ulink>. + In accordance with CC-BY-SA, if you distribute this document or an adaptation + of it, you must provide the URL for the original version.</para> + <para>Red Hat, as the licensor of this document, waives the right to enforce, + and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent + permitted by applicable law.</para> + </legalnotice> + <mediaobject> + <imageobject> + <imagedata fileref="images/hornetQ_logo_600px.png" format="PNG"/> + </imageobject> + <textobject> + <phrase>HornetQ - Putting the buzz in messaging</phrase> + </textobject> + </mediaobject> </bookinfo> <toc></toc> Modified: trunk/docs/quickstart-guide/en/running.xml =================================================================== --- trunk/docs/quickstart-guide/en/running.xml 2009-08-20 16:30:30 UTC (rev 7832) +++ trunk/docs/quickstart-guide/en/running.xml 2009-08-20 16:35:13 UTC (rev 7833) @@ -1,4 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> + + + <chapter id="running"> <title>Starting The Server</title> <section id="running.standalone"> @@ -12,7 +31,7 @@ 15:05:54,108 INFO @main [HornetQBootstrapServer] Starting HornetQ server ... 15:06:02,566 INFO @main [MessagingServerImpl] HornetQ Server version - 2.0.0.BETA1-SNAPSHOT (Stilton, 101) started + 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 started properly, please refer to the troubleshooting guide for help</para> @@ -36,7 +55,7 @@ SVNTag=JBoss_5_1_0_CR1 date=200904091504) ... 15:19:30,305 INFO [MessagingServerImpl] HornetQ Server version - 2.0.0.BETA1-SNAPSHOT (Stilton, 101) started + 2.0.0.BETA5 (buzz-buzz, 107) started ... 15:19:43,601 INFO [ServerImpl] JBoss (Microcontainer) [5.1.0.CR1 (build: SVNTag=JBoss_5_1_0_CR1 date=200904091504)] Started in 1m:8s:121ms

15 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits August 2009