[hornetq-commits] JBoss hornetq SVN: r9990 - in trunk: src/main/org/hornetq/api/core and 22 other directories.

Author: clebert.suconic(a)jboss.com Date: 2010-12-03 14:17:35 -0500 (Fri, 03 Dec 2010) New Revision: 9990 Added: trunk/src/main/org/hornetq/api/core/DiscoveryGroupConfiguration.java Removed: trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java Modified: trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java trunk/src/main/org/hornetq/api/core/client/HornetQClient.java trunk/src/main/org/hornetq/api/core/client/ServerLocator.java trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java trunk/src/main/org/hornetq/api/jms/management/ConnectionFactoryControl.java trunk/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.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/impl/FileConfigurationParser.java trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java trunk/src/main/org/hornetq/core/server/management/ManagementService.java trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java trunk/src/main/org/hornetq/jms/client/HornetQJMSConnectionFactory.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/JMSConnectionFactoryControlImpl.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/src/org/hornetq/tests/integration/client/SessionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java Log: Moving DiscoveryGroupConfiguration into core.api 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-03 03:48:16 UTC (rev 9989) +++ trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -21,9 +21,9 @@ import javax.jms.TextMessage; import javax.jms.Topic; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.common.example.HornetQExample; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.jms.server.impl.JMSFactoryType; /** Copied: trunk/src/main/org/hornetq/api/core/DiscoveryGroupConfiguration.java (from rev 9986, trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/DiscoveryGroupConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/DiscoveryGroupConfiguration.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -0,0 +1,182 @@ +/* + * 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.api.core; + +import java.io.Serializable; + +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.core.logging.Logger; +import org.hornetq.utils.UUIDGenerator; + +/** + * A DiscoveryGroupConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 18 Nov 2008 08:47:30 + * + * + */ +public class DiscoveryGroupConfiguration implements Serializable +{ + private static final long serialVersionUID = 8657206421727863400L; + + private static final Logger log = Logger.getLogger(DiscoveryGroupConfiguration.class); + + + private String name; + + private String localBindAddress; + + private String groupAddress; + + private int groupPort; + + private long refreshTimeout; + + private long discoveryInitialWaitTimeout; + + public DiscoveryGroupConfiguration(final String name, + final String localBindAddress, + final String groupAddress, + final int groupPort, + final long refreshTimeout, + final long discoveryInitialWaitTimeout) + { + this.name = name; + this.groupAddress = groupAddress; + this.localBindAddress = localBindAddress; + this.groupPort = groupPort; + this.refreshTimeout = refreshTimeout; + this.discoveryInitialWaitTimeout = discoveryInitialWaitTimeout; + } + + public DiscoveryGroupConfiguration(final String groupAddress, + final int groupPort) + { + this(UUIDGenerator.getInstance().generateStringUUID(), null, groupAddress, groupPort, HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT); + } + + public String getName() + { + return name; + } + + public String getLocalBindAddress() + { + return localBindAddress; + } + + public String getGroupAddress() + { + return groupAddress; + } + + public int getGroupPort() + { + return groupPort; + } + + public long getRefreshTimeout() + { + return refreshTimeout; + } + + /** + * @param name the name to set + */ + public void setName(final String name) + { + this.name = name; + } + + /** + * @param localBindAddress the localBindAddress to set + */ + public void setLocalBindAdress(final String localBindAddress) + { + this.localBindAddress = localBindAddress; + } + + /** + * @param groupAddress the groupAddress to set + */ + public void setGroupAddress(final String groupAddress) + { + this.groupAddress = groupAddress; + } + + /** + * @param groupPort the groupPort to set + */ + public void setGroupPort(final int groupPort) + { + this.groupPort = groupPort; + } + + /** + * @param refreshTimeout the refreshTimeout to set + */ + public void setRefreshTimeout(final long refreshTimeout) + { + this.refreshTimeout = refreshTimeout; + } + + /** + * @return the discoveryInitialWaitTimeout + */ + public long getDiscoveryInitialWaitTimeout() + { + return discoveryInitialWaitTimeout; + } + + /** + * @param discoveryInitialWaitTimeout the discoveryInitialWaitTimeout to set + */ + public void setDiscoveryInitialWaitTimeout(long discoveryInitialWaitTimeout) + { + this.discoveryInitialWaitTimeout = discoveryInitialWaitTimeout; + } + + @Override + public boolean equals(Object o) + { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + DiscoveryGroupConfiguration that = (DiscoveryGroupConfiguration) o; + + if (discoveryInitialWaitTimeout != that.discoveryInitialWaitTimeout) return false; + if (groupPort != that.groupPort) return false; + if (refreshTimeout != that.refreshTimeout) return false; + if (groupAddress != null ? !groupAddress.equals(that.groupAddress) : that.groupAddress != null) return false; + if (localBindAddress != null ? !localBindAddress.equals(that.localBindAddress) : that.localBindAddress != null) + return false; + if (name != null ? !name.equals(that.name) : that.name != null) return false; + + return true; + } + + @Override + public int hashCode() + { + int result = name != null ? name.hashCode() : 0; + result = 31 * result + (localBindAddress != null ? localBindAddress.hashCode() : 0); + result = 31 * result + (groupAddress != null ? groupAddress.hashCode() : 0); + result = 31 * result + groupPort; + result = 31 * result + (int) (refreshTimeout ^ (refreshTimeout >>> 32)); + result = 31 * result + (int) (discoveryInitialWaitTimeout ^ (discoveryInitialWaitTimeout >>> 32)); + return result; + } +} Modified: trunk/src/main/org/hornetq/api/core/client/HornetQClient.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/HornetQClient.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/api/core/client/HornetQClient.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -12,12 +12,12 @@ */ package org.hornetq.api.core.client; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy; import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import java.util.List; Modified: trunk/src/main/org/hornetq/api/core/client/ServerLocator.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ServerLocator.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/api/core/client/ServerLocator.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -13,11 +13,11 @@ package org.hornetq.api.core.client; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy; -import org.hornetq.core.config.DiscoveryGroupConfiguration; /** * A ServerLocator Modified: trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -15,8 +15,8 @@ import javax.jms.Queue; import javax.jms.Topic; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQDestination; Modified: trunk/src/main/org/hornetq/api/jms/management/ConnectionFactoryControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/ConnectionFactoryControl.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/api/jms/management/ConnectionFactoryControl.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -13,11 +13,11 @@ package org.hornetq.api.jms.management; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.management.Operation; import org.hornetq.api.core.management.Parameter; -import org.hornetq.core.config.DiscoveryGroupConfiguration; /** * A ConnectionFactoryControl is used to manage a JMS ConnectionFactory. Modified: trunk/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -21,6 +21,7 @@ import java.util.*; import java.util.concurrent.*; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.Pair; @@ -33,7 +34,6 @@ import org.hornetq.core.cluster.DiscoveryGroup; import org.hornetq.core.cluster.DiscoveryListener; import org.hornetq.core.cluster.impl.DiscoveryGroupImpl; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.utils.HornetQThreadFactory; import org.hornetq.utils.UUIDGenerator; Modified: trunk/src/main/org/hornetq/core/config/Configuration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/Configuration.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/core/config/Configuration.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -18,6 +18,7 @@ import java.util.Map; import java.util.Set; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; Deleted: trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -1,182 +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.core.config; - -import java.io.Serializable; - -import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.logging.Logger; -import org.hornetq.utils.UUIDGenerator; - -/** - * A DiscoveryGroupConfiguration - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * Created 18 Nov 2008 08:47:30 - * - * - */ -public class DiscoveryGroupConfiguration implements Serializable -{ - private static final long serialVersionUID = 8657206421727863400L; - - private static final Logger log = Logger.getLogger(DiscoveryGroupConfiguration.class); - - - private String name; - - private String localBindAddress; - - private String groupAddress; - - private int groupPort; - - private long refreshTimeout; - - private long discoveryInitialWaitTimeout; - - public DiscoveryGroupConfiguration(final String name, - final String localBindAddress, - final String groupAddress, - final int groupPort, - final long refreshTimeout, - final long discoveryInitialWaitTimeout) - { - this.name = name; - this.groupAddress = groupAddress; - this.localBindAddress = localBindAddress; - this.groupPort = groupPort; - this.refreshTimeout = refreshTimeout; - this.discoveryInitialWaitTimeout = discoveryInitialWaitTimeout; - } - - public DiscoveryGroupConfiguration(final String groupAddress, - final int groupPort) - { - this(UUIDGenerator.getInstance().generateStringUUID(), null, groupAddress, groupPort, HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT); - } - - public String getName() - { - return name; - } - - public String getLocalBindAddress() - { - return localBindAddress; - } - - public String getGroupAddress() - { - return groupAddress; - } - - public int getGroupPort() - { - return groupPort; - } - - public long getRefreshTimeout() - { - return refreshTimeout; - } - - /** - * @param name the name to set - */ - public void setName(final String name) - { - this.name = name; - } - - /** - * @param localBindAddress the localBindAddress to set - */ - public void setLocalBindAdress(final String localBindAddress) - { - this.localBindAddress = localBindAddress; - } - - /** - * @param groupAddress the groupAddress to set - */ - public void setGroupAddress(final String groupAddress) - { - this.groupAddress = groupAddress; - } - - /** - * @param groupPort the groupPort to set - */ - public void setGroupPort(final int groupPort) - { - this.groupPort = groupPort; - } - - /** - * @param refreshTimeout the refreshTimeout to set - */ - public void setRefreshTimeout(final long refreshTimeout) - { - this.refreshTimeout = refreshTimeout; - } - - /** - * @return the discoveryInitialWaitTimeout - */ - public long getDiscoveryInitialWaitTimeout() - { - return discoveryInitialWaitTimeout; - } - - /** - * @param discoveryInitialWaitTimeout the discoveryInitialWaitTimeout to set - */ - public void setDiscoveryInitialWaitTimeout(long discoveryInitialWaitTimeout) - { - this.discoveryInitialWaitTimeout = discoveryInitialWaitTimeout; - } - - @Override - public boolean equals(Object o) - { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - DiscoveryGroupConfiguration that = (DiscoveryGroupConfiguration) o; - - if (discoveryInitialWaitTimeout != that.discoveryInitialWaitTimeout) return false; - if (groupPort != that.groupPort) return false; - if (refreshTimeout != that.refreshTimeout) return false; - if (groupAddress != null ? !groupAddress.equals(that.groupAddress) : that.groupAddress != null) return false; - if (localBindAddress != null ? !localBindAddress.equals(that.localBindAddress) : that.localBindAddress != null) - return false; - if (name != null ? !name.equals(that.name) : that.name != null) return false; - - return true; - } - - @Override - public int hashCode() - { - int result = name != null ? name.hashCode() : 0; - result = 31 * result + (localBindAddress != null ? localBindAddress.hashCode() : 0); - result = 31 * result + (groupAddress != null ? groupAddress.hashCode() : 0); - result = 31 * result + groupPort; - result = 31 * result + (int) (refreshTimeout ^ (refreshTimeout >>> 32)); - result = 31 * result + (int) (discoveryInitialWaitTimeout ^ (discoveryInitialWaitTimeout >>> 32)); - return result; - } -} Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Set; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.BridgeConfiguration; @@ -29,7 +30,6 @@ import org.hornetq.core.config.Configuration; import org.hornetq.core.config.ConnectorServiceConfiguration; import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.DivertConfiguration; import org.hornetq.core.logging.impl.JULLogDelegateFactory; import org.hornetq.core.security.Role; Modified: trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java =================================================================== --- trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -23,12 +23,12 @@ import java.util.Map; import java.util.Set; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.Pair; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.config.*; -import org.hornetq.core.config.ConnectorServiceConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.config.impl.Validators; Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -22,6 +22,7 @@ import java.util.concurrent.ScheduledFuture; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.Pair; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; Modified: trunk/src/main/org/hornetq/core/server/management/ManagementService.java =================================================================== --- trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -18,6 +18,7 @@ import javax.management.ObjectName; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; @@ -26,7 +27,6 @@ import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.DivertConfiguration; import org.hornetq.core.management.impl.HornetQServerControlImpl; import org.hornetq.core.messagecounter.MessageCounterManager; Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -26,11 +26,11 @@ import javax.naming.Reference; import javax.naming.Referenceable; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory; import org.hornetq.jms.referenceable.SerializableObjectRefAddr; Modified: trunk/src/main/org/hornetq/jms/client/HornetQJMSConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQJMSConnectionFactory.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/jms/client/HornetQJMSConnectionFactory.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -17,9 +17,9 @@ import javax.jms.QueueConnectionFactory; import javax.jms.TopicConnectionFactory; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.DiscoveryGroupConfiguration; /** Modified: trunk/src/main/org/hornetq/jms/client/HornetQQueueConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQQueueConnectionFactory.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/jms/client/HornetQQueueConnectionFactory.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -15,9 +15,9 @@ import javax.jms.QueueConnectionFactory; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.DiscoveryGroupConfiguration; /** * 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-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/jms/client/HornetQTopicConnectionFactory.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -15,9 +15,9 @@ import javax.jms.TopicConnectionFactory; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.DiscoveryGroupConfiguration; /** * 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-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/jms/client/HornetQXAConnectionFactory.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -20,9 +20,9 @@ import javax.jms.XAQueueConnectionFactory; import javax.jms.XATopicConnectionFactory; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.DiscoveryGroupConfiguration; /** * 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-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/jms/client/HornetQXAQueueConnectionFactory.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -15,9 +15,9 @@ import javax.jms.XAQueueConnectionFactory; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.DiscoveryGroupConfiguration; /** * 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-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/jms/client/HornetQXATopicConnectionFactory.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -15,9 +15,9 @@ import javax.jms.XATopicConnectionFactory; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.DiscoveryGroupConfiguration; /** * A class that represents a XATopicConnectionFactory. Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -17,10 +17,10 @@ import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.Parameter; import org.hornetq.api.jms.management.ConnectionFactoryControl; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.management.impl.MBeanInfoHelper; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.JMSServerManager; Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -19,11 +19,11 @@ import java.util.ArrayList; import java.util.List; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.impl.Validators; import org.hornetq.core.logging.Logger; import org.hornetq.jms.server.JMSServerConfigParser; Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -22,6 +22,7 @@ import javax.naming.NamingException; import javax.transaction.xa.Xid; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; @@ -29,7 +30,6 @@ import org.hornetq.api.core.management.ResourceNames; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.FileDeploymentManager; import org.hornetq.core.deployers.impl.XmlDeployer; Modified: trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -29,13 +29,13 @@ import javax.transaction.TransactionManager; import javax.transaction.xa.XAResource; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.impl.JMSFactoryType; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -22,6 +22,7 @@ import junit.framework.Assert; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; @@ -29,7 +30,6 @@ import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -20,6 +20,7 @@ import junit.framework.Assert; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientConsumer; @@ -32,7 +33,6 @@ import org.hornetq.core.config.BridgeConfiguration; import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -24,6 +24,7 @@ import junit.framework.Assert; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; @@ -37,7 +38,6 @@ import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Binding; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/topology/HAClientTopologyWithDiscoveryTest.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -13,9 +13,9 @@ package org.hornetq.tests.integration.cluster.topology; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.client.ServerLocator; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.logging.Logger; /** Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -23,9 +23,9 @@ import junit.framework.Assert; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.BroadcastGroupConfiguration; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -21,9 +21,9 @@ import junit.framework.Assert; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.FileDeploymentManager; 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 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -34,6 +34,7 @@ import junit.framework.Assert; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.AddressControl; @@ -41,7 +42,6 @@ import org.hornetq.api.core.management.ResourceNames; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.QueueBinding; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -23,6 +23,7 @@ import junit.framework.Assert; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; @@ -30,7 +31,6 @@ import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.CoreQueueConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -23,6 +23,7 @@ import junit.framework.Assert; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.Pair; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; @@ -32,7 +33,6 @@ import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.CoreQueueConfiguration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2010-12-03 03:48:16 UTC (rev 9989) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2010-12-03 19:17:35 UTC (rev 9990) @@ -15,13 +15,13 @@ import junit.framework.Assert; +import org.hornetq.api.core.DiscoveryGroupConfiguration; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.BridgeConfiguration; import org.hornetq.core.config.BroadcastGroupConfiguration; import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.DivertConfiguration; import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.security.Role;