[hornetq-commits] JBoss hornetq SVN: r10038 - in trunk: examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example and 24 other directories.

Author: clebert.suconic(a)jboss.com Date: 2010-12-13 13:10:21 -0500 (Mon, 13 Dec 2010) New Revision: 10038 Added: trunk/src/main/org/hornetq/api/jms/JMSFactoryType.java Removed: trunk/src/main/org/hornetq/jms/server/impl/JMSFactoryType.java Modified: trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java trunk/src/main/org/hornetq/jms/client/HornetQQueueConnectionFactory.java trunk/src/main/org/hornetq/jms/client/HornetQTopicConnectionFactory.java trunk/src/main/org/hornetq/jms/client/HornetQXAConnectionFactory.java trunk/src/main/org/hornetq/jms/client/HornetQXAQueueConnectionFactory.java trunk/src/main/org/hornetq/jms/client/HornetQXATopicConnectionFactory.java trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java trunk/src/main/org/hornetq/jms/server/JMSServerManager.java trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.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/bridge/BridgeTestBase.java trunk/tests/src/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/GroupIDTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/ConcurrentSessionCloseTest.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/divert/DivertAndACKClientTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlRestartTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/opt/SendTest.java trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java trunk/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java Log: JBPAPP-5564 - Moving JMSFactoryType enum as raised by JBPAPP-5564 Modified: trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java =================================================================== --- trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -45,8 +45,8 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; -import org.hornetq.jms.server.impl.JMSFactoryType; /** * A AppletExample Modified: trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java =================================================================== --- trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -25,10 +25,10 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.common.example.HornetQExample; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.remoting.impl.netty.TransportConstants; -import org.hornetq.jms.server.impl.JMSFactoryType; /** * Modified: trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java =================================================================== --- trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -23,8 +23,8 @@ import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.common.example.HornetQExample; -import org.hornetq.jms.server.impl.JMSFactoryType; /** * This example demonstrates a cluster of three nodes set up in a symmetric topology - i.e. each node Modified: trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -26,7 +26,6 @@ import org.hornetq.jms.client.HornetQXAConnectionFactory; import org.hornetq.jms.client.HornetQXAQueueConnectionFactory; import org.hornetq.jms.client.HornetQXATopicConnectionFactory; -import org.hornetq.jms.server.impl.JMSFactoryType; /** * A utility class for creating HornetQ client-side JMS managed resources. Copied: trunk/src/main/org/hornetq/api/jms/JMSFactoryType.java (from rev 10037, trunk/src/main/org/hornetq/jms/server/impl/JMSFactoryType.java) =================================================================== --- trunk/src/main/org/hornetq/api/jms/JMSFactoryType.java (rev 0) +++ trunk/src/main/org/hornetq/api/jms/JMSFactoryType.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -0,0 +1,83 @@ +/* + * Copyright 2010 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.api.jms; + +/** + * A JMSFactoryType + * + * @author howard + * + * + */ +public enum JMSFactoryType +{ + CF, QUEUE_CF, TOPIC_CF, XA_CF, QUEUE_XA_CF, TOPIC_XA_CF; + + public int intValue() + { + int val = 0; + switch (this) + { + case CF: + val = 0; + break; + case QUEUE_CF: + val = 1; + break; + case TOPIC_CF: + val = 2; + break; + case XA_CF: + val = 3; + break; + case QUEUE_XA_CF: + val = 4; + break; + case TOPIC_XA_CF: + val = 5; + break; + } + return val; + } + + public static JMSFactoryType valueOf(int val) + { + JMSFactoryType type; + switch (val) + { + case 0: + type = CF; + break; + case 1: + type = QUEUE_CF; + break; + case 2: + type = TOPIC_CF; + break; + case 3: + type = XA_CF; + break; + case 4: + type = QUEUE_XA_CF; + break; + case 5: + type = TOPIC_XA_CF; + break; + default: + type = XA_CF; + break; + } + return type; + } +} Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -31,10 +31,10 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.client.ServerLocator; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.logging.Logger; import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory; import org.hornetq.jms.referenceable.SerializableObjectRefAddr; -import org.hornetq.jms.server.impl.JMSFactoryType; /** * HornetQ implementation of a JMS ConnectionFactory. Modified: trunk/src/main/org/hornetq/jms/client/HornetQQueueConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQQueueConnectionFactory.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/client/HornetQQueueConnectionFactory.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -18,7 +18,7 @@ import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.jms.server.impl.JMSFactoryType; +import org.hornetq.api.jms.JMSFactoryType; /** * A class that represents a QueueConnectionFactory. Modified: trunk/src/main/org/hornetq/jms/client/HornetQTopicConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQTopicConnectionFactory.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/client/HornetQTopicConnectionFactory.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -18,7 +18,7 @@ import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.jms.server.impl.JMSFactoryType; +import org.hornetq.api.jms.JMSFactoryType; /** * A class that represents a TopicConnectionFactory. Modified: trunk/src/main/org/hornetq/jms/client/HornetQXAConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQXAConnectionFactory.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/client/HornetQXAConnectionFactory.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -23,7 +23,7 @@ import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.jms.server.impl.JMSFactoryType; +import org.hornetq.api.jms.JMSFactoryType; /** * A class that represents a XAConnectionFactory. Modified: trunk/src/main/org/hornetq/jms/client/HornetQXAQueueConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQXAQueueConnectionFactory.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/client/HornetQXAQueueConnectionFactory.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -18,7 +18,7 @@ import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.jms.server.impl.JMSFactoryType; +import org.hornetq.api.jms.JMSFactoryType; /** * A class that represents a XAQueueConnectionFactory. Modified: trunk/src/main/org/hornetq/jms/client/HornetQXATopicConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQXATopicConnectionFactory.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/client/HornetQXATopicConnectionFactory.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -18,7 +18,7 @@ import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.jms.server.impl.JMSFactoryType; +import org.hornetq.api.jms.JMSFactoryType; /** * A class that represents a XATopicConnectionFactory. Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -31,6 +31,7 @@ import javax.management.StandardMBean; import org.hornetq.api.core.management.Parameter; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.api.jms.management.ConnectionFactoryControl; import org.hornetq.api.jms.management.DestinationControl; import org.hornetq.api.jms.management.JMSQueueControl; @@ -43,7 +44,6 @@ import org.hornetq.jms.client.HornetQDestination; import org.hornetq.jms.client.HornetQQueue; import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.utils.json.JSONArray; import org.hornetq.utils.json.JSONObject; Modified: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -19,12 +19,12 @@ import javax.naming.Context; import org.hornetq.api.core.TransportConfiguration; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.security.Role; import org.hornetq.core.server.HornetQComponent; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.spi.core.naming.BindingRegistry; /** Modified: trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -16,8 +16,8 @@ import java.util.List; import org.hornetq.api.core.TransportConfiguration; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.journal.EncodingSupport; -import org.hornetq.jms.server.impl.JMSFactoryType; /** * A ConnectionFactoryConfiguration Modified: trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -19,8 +19,8 @@ import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.utils.BufferHelper; import org.hornetq.utils.DataConstants; Deleted: trunk/src/main/org/hornetq/jms/server/impl/JMSFactoryType.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSFactoryType.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSFactoryType.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -1,83 +0,0 @@ -/* - * Copyright 2010 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.jms.server.impl; - -/** - * A JMSFactoryType - * - * @author howard - * - * - */ -public enum JMSFactoryType -{ - CF, QUEUE_CF, TOPIC_CF, XA_CF, QUEUE_XA_CF, TOPIC_XA_CF; - - public int intValue() - { - int val = 0; - switch (this) - { - case CF: - val = 0; - break; - case QUEUE_CF: - val = 1; - break; - case TOPIC_CF: - val = 2; - break; - case XA_CF: - val = 3; - break; - case QUEUE_XA_CF: - val = 4; - break; - case TOPIC_XA_CF: - val = 5; - break; - } - return val; - } - - public static JMSFactoryType valueOf(int val) - { - JMSFactoryType type; - switch (val) - { - case 0: - type = CF; - break; - case 1: - type = QUEUE_CF; - break; - case 2: - type = TOPIC_CF; - break; - case 3: - type = XA_CF; - break; - case 4: - type = QUEUE_XA_CF; - break; - case 5: - type = TOPIC_XA_CF; - break; - default: - type = XA_CF; - break; - } - return type; - } -} Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -23,6 +23,7 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.Validators; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -28,6 +28,7 @@ import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.config.Configuration; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.FileDeploymentManager; Modified: trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -36,9 +36,9 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.ra.inflow.HornetQActivation; import org.hornetq.ra.inflow.HornetQActivationSpec; Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -23,9 +23,9 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.impl.JMSFactoryType; /** * Safeguards for previously detected TCK failures. Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -18,10 +18,10 @@ import javax.naming.InitialContext; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.jms.client.HornetQJMSConnectionFactory; import org.hornetq.jms.client.HornetQQueueConnectionFactory; import org.hornetq.jms.client.HornetQTopicConnectionFactory; -import org.hornetq.jms.server.impl.JMSFactoryType; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -31,6 +31,7 @@ import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.ResourceNames; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.api.jms.management.TopicControl; import org.hornetq.core.logging.Logger; @@ -39,7 +40,6 @@ import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.bootstrap.HornetQBootstrapServer; import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.jboss.kernel.plugins.config.property.PropertyKernelConfig; /** Modified: trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -20,6 +20,7 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -28,7 +29,6 @@ import org.hornetq.core.server.HornetQServers; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.integration.jms.server.management.NullInitialContext; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -27,6 +27,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; @@ -34,7 +35,6 @@ import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -26,8 +26,8 @@ import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -38,6 +38,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.api.jms.management.TopicControl; import org.hornetq.core.config.Configuration; @@ -56,7 +57,6 @@ import org.hornetq.jms.client.HornetQMessage; import org.hornetq.jms.client.HornetQXAConnectionFactory; import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/AutoGroupingTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -18,9 +18,9 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.jms.server.impl.JMSFactoryType; /** * A AutoGroupingTest Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/GroupIDTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/GroupIDTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/GroupIDTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -18,9 +18,9 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.jms.server.impl.JMSFactoryType; /** * A GroupIDTest Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -29,8 +29,8 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.server.HornetQServer; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.tests.util.JMSTestBase; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -34,7 +34,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.HornetQJMSConstants; -import org.hornetq.jms.server.impl.JMSFactoryType; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.tests.util.JMSTestBase; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -30,11 +30,11 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.JMSTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -26,7 +26,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.jms.server.impl.JMSFactoryType; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.tests.util.JMSTestBase; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -36,6 +36,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; @@ -51,7 +52,6 @@ import org.hornetq.jms.client.HornetQDestination; import org.hornetq.jms.client.HornetQSession; import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.spi.core.security.HornetQSecurityManager; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -33,6 +33,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -43,7 +44,6 @@ import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQDestination; import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -24,8 +24,8 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.CloseListener; import org.hornetq.spi.core.protocol.RemotingConnection; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -24,11 +24,11 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.JMSTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/ConcurrentSessionCloseTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -20,9 +20,9 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQConnectionFactory; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.tests.util.JMSTestBase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -25,6 +25,7 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -33,7 +34,6 @@ import org.hornetq.jms.client.HornetQConnection; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.jms.server.management.NullInitialContext; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -28,11 +28,11 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.HornetQJMSConstants; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.Queue; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQDestination; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.tests.util.JMSTestBase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -28,9 +28,9 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.DivertConfiguration; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.tests.util.JMSTestBase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -24,6 +24,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; @@ -31,7 +32,6 @@ import org.hornetq.core.server.impl.HornetQServerImpl; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.spi.core.security.HornetQSecurityManager; import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; 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 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -30,6 +30,7 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -41,7 +42,6 @@ import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQDestination; import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementControlHelper; import org.hornetq.tests.integration.management.ManagementTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -23,12 +23,12 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQDestination; import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.server.impl.JMSFactoryType; /** * Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlRestartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlRestartTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlRestartTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -27,6 +27,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.api.jms.management.JMSManagementHelper; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.core.config.Configuration; @@ -37,7 +38,6 @@ import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.JournalType; import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementControlHelper; import org.hornetq.tests.integration.management.ManagementTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -22,12 +22,12 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.security.Role; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQQueue; -import org.hornetq.jms.server.impl.JMSFactoryType; /** * A JMSServerControlUsingCoreTest Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -39,8 +39,8 @@ import org.hornetq.jms.client.HornetQConnection; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQJMSConnectionFactory; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.RandomUtil; 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 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -29,6 +29,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.api.jms.management.TopicControl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -39,7 +40,6 @@ import org.hornetq.jms.client.HornetQDestination; import org.hornetq.jms.client.HornetQQueue; import org.hornetq.jms.client.HornetQTopic; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementTestBase; import org.hornetq.tests.unit.util.InVMContext; Modified: trunk/tests/src/org/hornetq/tests/opt/SendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -30,6 +30,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; @@ -43,7 +44,6 @@ import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQMessage; import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.tests.util.RandomUtil; /** 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 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -42,6 +42,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; @@ -55,7 +56,6 @@ import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQJMSConnectionFactory; import org.hornetq.jms.server.JMSServerManager; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -25,6 +25,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; @@ -34,7 +35,6 @@ import org.hornetq.core.server.HornetQServers; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; import org.hornetq.tests.unit.util.InVMContext; Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-12-13 13:03:21 UTC (rev 10037) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-12-13 18:10:21 UTC (rev 10038) @@ -24,12 +24,12 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.config.Configuration; import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext;