[hornetq-commits] JBoss hornetq SVN: r8869 - in trunk: examples/jms/embedded/src/org/hornetq/jms/example and 25 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Feb 10 15:04:03 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-02-10 15:03:59 -0500 (Wed, 10 Feb 2010)
New Revision: 8869
Added:
trunk/src/main/org/hornetq/core/config/BridgeConfiguration.java
trunk/src/main/org/hornetq/core/config/BroadcastGroupConfiguration.java
trunk/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java
trunk/src/main/org/hornetq/core/config/CoreQueueConfiguration.java
trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java
trunk/src/main/org/hornetq/core/config/DivertConfiguration.java
trunk/src/main/org/hornetq/jms/server/config/JMSQueueConfiguration.java
Removed:
trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java
trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java
trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java
trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java
trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java
trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java
trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java
Modified:
trunk/build-hornetq.xml
trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.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/deployers/impl/QueueDeployer.java
trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java
trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java
trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java
trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java
trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java
trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
trunk/src/main/org/hornetq/core/server/management/ManagementService.java
trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java
trunk/src/main/org/hornetq/jms/server/JMSServerConfigParser.java
trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java
trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java
trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java
trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java
trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.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/divert/DivertTest.java
trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java
trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java
trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java
trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java
trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java
trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java
trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java
Log:
Moving Configuration objects
Modified: trunk/build-hornetq.xml
===================================================================
--- trunk/build-hornetq.xml 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/build-hornetq.xml 2010-02-10 20:03:59 UTC (rev 8869)
@@ -1504,6 +1504,7 @@
<target name="runServer" depends="jar">
<mkdir dir="logs"/>
+ <property name="server.config" value="${src.config.trunk.non-clustered.dir}"/>
<java classname="org.hornetq.integration.bootstrap.HornetQBootstrapServer" fork="true">
<jvmarg value="-XX:+UseParallelGC"/>
<jvmarg value="-Xms512M"/>
@@ -1515,7 +1516,7 @@
<jvmarg value="-Djava.library.path=${native.bin.dir}"/>
<!--<jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>-->
<arg line="hornetq-beans.xml"/>
- <classpath path="${src.config.trunk.non-clustered.dir}" />
+ <classpath path="${server.config}" />
<classpath refid="jms.standalone.server.classpath"/>
</java>
</target>
@@ -1542,6 +1543,7 @@
</target>
<target name="debugServer" depends="jar">
+ <property name="server.config" value="${src.config.trunk.non-clustered.dir}"/>
<mkdir dir="logs"/>
<java classname="org.hornetq.integration.bootstrap.HornetQBootstrapServer" fork="true">
<jvmarg value="-XX:+UseParallelGC"/>
@@ -1554,7 +1556,7 @@
<jvmarg value="-Djava.library.path=${native.bin.dir}"/>
<jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>
<arg line="hornetq-beans.xml"/>
- <classpath path="${src.config.trunk.non-clustered.dir}" />
+ <classpath path="${server.config}" />
<classpath refid="jms.standalone.server.classpath"/>
</java>
</target>
Modified: trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java
===================================================================
--- trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -35,7 +35,7 @@
import org.hornetq.jms.server.JMSServerManager;
import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
import org.hornetq.jms.server.config.JMSConfiguration;
-import org.hornetq.jms.server.config.QueueConfiguration;
+import org.hornetq.jms.server.config.JMSQueueConfiguration;
import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
import org.hornetq.jms.server.config.impl.JMSConfigurationImpl;
import org.hornetq.jms.server.config.impl.QueueConfigurationImpl;
@@ -96,7 +96,7 @@
jmsConfig.getConnectionFactoryConfigurations().add(cfConfig);
// Step 7. Configure the JMS Queue
- QueueConfiguration queueConfig = new QueueConfigurationImpl("queue1", null, false, "/queue/queue1");
+ JMSQueueConfiguration queueConfig = new QueueConfigurationImpl("queue1", null, false, "/queue/queue1");
jmsConfig.getQueueConfigurations().add(queueConfig);
// Step 8. Start the JMS Server using the HornetQ core server and the JMS configuration
Copied: trunk/src/main/org/hornetq/core/config/BridgeConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java)
===================================================================
--- trunk/src/main/org/hornetq/core/config/BridgeConfiguration.java (rev 0)
+++ trunk/src/main/org/hornetq/core/config/BridgeConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -0,0 +1,326 @@
+/*
+ * 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.Pair;
+
+/**
+ * A BridgeConfiguration
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ * Created 13 Jan 2009 09:32:43
+ *
+ *
+ */
+public class BridgeConfiguration implements Serializable
+{
+ private static final long serialVersionUID = -1057244274380572226L;
+
+ private String name;
+
+ private String queueName;
+
+ private String forwardingAddress;
+
+ private String filterString;
+
+ private Pair<String, String> connectorPair;
+
+ private String discoveryGroupName;
+
+ private String transformerClassName;
+
+ private long retryInterval;
+
+ private double retryIntervalMultiplier;
+
+ private int reconnectAttempts;
+
+ private boolean failoverOnServerShutdown;
+
+ private boolean useDuplicateDetection;
+
+ private int confirmationWindowSize;
+
+ private final long clientFailureCheckPeriod;
+
+ private String user;
+
+ private String password;
+
+ public BridgeConfiguration(final String name,
+ final String queueName,
+ final String forwardingAddress,
+ final String filterString,
+ final String transformerClassName,
+ final long retryInterval,
+ final double retryIntervalMultiplier,
+ final int reconnectAttempts,
+ final boolean failoverOnServerShutdown,
+ final boolean useDuplicateDetection,
+ final int confirmationWindowSize,
+ final long clientFailureCheckPeriod,
+ final Pair<String, String> connectorPair,
+ final String user,
+ final String password)
+ {
+ this.name = name;
+ this.queueName = queueName;
+ this.forwardingAddress = forwardingAddress;
+ this.filterString = filterString;
+ this.transformerClassName = transformerClassName;
+ this.retryInterval = retryInterval;
+ this.retryIntervalMultiplier = retryIntervalMultiplier;
+ this.reconnectAttempts = reconnectAttempts;
+ this.failoverOnServerShutdown = failoverOnServerShutdown;
+ this.useDuplicateDetection = useDuplicateDetection;
+ this.confirmationWindowSize = confirmationWindowSize;
+ this.clientFailureCheckPeriod = clientFailureCheckPeriod;
+ this.connectorPair = connectorPair;
+ this.user = user;
+ this.password = password;
+ discoveryGroupName = null;
+ }
+
+ public BridgeConfiguration(final String name,
+ final String queueName,
+ final String forwardingAddress,
+ final String filterString,
+ final String transformerClassName,
+ final long retryInterval,
+ final double retryIntervalMultiplier,
+ final int reconnectAttempts,
+ final boolean failoverOnServerShutdown,
+ final boolean useDuplicateDetection,
+ final int confirmationWindowSize,
+ final long clientFailureCheckPeriod,
+ final String discoveryGroupName,
+ final String user,
+ final String password)
+ {
+ this.name = name;
+ this.queueName = queueName;
+ this.forwardingAddress = forwardingAddress;
+ this.filterString = filterString;
+ this.transformerClassName = transformerClassName;
+ this.retryInterval = retryInterval;
+ this.retryIntervalMultiplier = retryIntervalMultiplier;
+ this.reconnectAttempts = reconnectAttempts;
+ this.failoverOnServerShutdown = failoverOnServerShutdown;
+ this.useDuplicateDetection = useDuplicateDetection;
+ this.confirmationWindowSize = confirmationWindowSize;
+ this.clientFailureCheckPeriod = clientFailureCheckPeriod;
+ connectorPair = null;
+ this.discoveryGroupName = discoveryGroupName;
+ this.user = user;
+ this.password = password;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getQueueName()
+ {
+ return queueName;
+ }
+
+ public String getForwardingAddress()
+ {
+ return forwardingAddress;
+ }
+
+ public String getFilterString()
+ {
+ return filterString;
+ }
+
+ public String getTransformerClassName()
+ {
+ return transformerClassName;
+ }
+
+ public Pair<String, String> getConnectorPair()
+ {
+ return connectorPair;
+ }
+
+ public String getDiscoveryGroupName()
+ {
+ return discoveryGroupName;
+ }
+
+ public long getRetryInterval()
+ {
+ return retryInterval;
+ }
+
+ public double getRetryIntervalMultiplier()
+ {
+ return retryIntervalMultiplier;
+ }
+
+ public int getReconnectAttempts()
+ {
+ return reconnectAttempts;
+ }
+
+ public boolean isFailoverOnServerShutdown()
+ {
+ return failoverOnServerShutdown;
+ }
+
+ public boolean isUseDuplicateDetection()
+ {
+ return useDuplicateDetection;
+ }
+
+ public int getConfirmationWindowSize()
+ {
+ return confirmationWindowSize;
+ }
+
+ public long getClientFailureCheckPeriod()
+ {
+ return clientFailureCheckPeriod;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(final String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * @param queueName the queueName to set
+ */
+ public void setQueueName(final String queueName)
+ {
+ this.queueName = queueName;
+ }
+
+ /**
+ * @param forwardingAddress the forwardingAddress to set
+ */
+ public void setForwardingAddress(final String forwardingAddress)
+ {
+ this.forwardingAddress = forwardingAddress;
+ }
+
+ /**
+ * @param filterString the filterString to set
+ */
+ public void setFilterString(final String filterString)
+ {
+ this.filterString = filterString;
+ }
+
+ /**
+ * @param connectorPair the connectorPair to set
+ */
+ public void setConnectorPair(final Pair<String, String> connectorPair)
+ {
+ this.connectorPair = connectorPair;
+ }
+
+ /**
+ * @param discoveryGroupName the discoveryGroupName to set
+ */
+ public void setDiscoveryGroupName(final String discoveryGroupName)
+ {
+ this.discoveryGroupName = discoveryGroupName;
+ }
+
+ /**
+ * @param transformerClassName the transformerClassName to set
+ */
+ public void setTransformerClassName(final String transformerClassName)
+ {
+ this.transformerClassName = transformerClassName;
+ }
+
+ /**
+ * @param retryInterval the retryInterval to set
+ */
+ public void setRetryInterval(final long retryInterval)
+ {
+ this.retryInterval = retryInterval;
+ }
+
+ /**
+ * @param retryIntervalMultiplier the retryIntervalMultiplier to set
+ */
+ public void setRetryIntervalMultiplier(final double retryIntervalMultiplier)
+ {
+ this.retryIntervalMultiplier = retryIntervalMultiplier;
+ }
+
+ /**
+ * @param reconnectAttempts the reconnectAttempts to set
+ */
+ public void setReconnectAttempts(final int reconnectAttempts)
+ {
+ this.reconnectAttempts = reconnectAttempts;
+ }
+
+ /**
+ * @param failoverOnServerShutdown the failoverOnServerShutdown to set
+ */
+ public void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown)
+ {
+ this.failoverOnServerShutdown = failoverOnServerShutdown;
+ }
+
+ /**
+ * @param useDuplicateDetection the useDuplicateDetection to set
+ */
+ public void setUseDuplicateDetection(final boolean useDuplicateDetection)
+ {
+ this.useDuplicateDetection = useDuplicateDetection;
+ }
+
+ /**
+ * @param confirmationWindowSize the confirmationWindowSize to set
+ */
+ public void setConfirmationWindowSize(final int confirmationWindowSize)
+ {
+ this.confirmationWindowSize = confirmationWindowSize;
+ }
+
+ public String getUser()
+ {
+ return user;
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
+
+ public void setUser(String user)
+ {
+ this.user = user;
+ }
+
+ public void setPassword(String password)
+ {
+ this.password = password;
+ }
+}
Copied: trunk/src/main/org/hornetq/core/config/BroadcastGroupConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java)
===================================================================
--- trunk/src/main/org/hornetq/core/config/BroadcastGroupConfiguration.java (rev 0)
+++ trunk/src/main/org/hornetq/core/config/BroadcastGroupConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -0,0 +1,159 @@
+/*
+ * 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 java.util.List;
+
+import org.hornetq.api.core.Pair;
+import org.hornetq.core.logging.Logger;
+
+/**
+ * A BroadcastGroupConfiguration
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ * Created 18 Nov 2008 08:44:30
+ *
+ */
+public class BroadcastGroupConfiguration implements Serializable
+{
+ private static final long serialVersionUID = 1052413739064253955L;
+
+ private static final Logger log = Logger.getLogger(BroadcastGroupConfiguration.class);
+
+ private String name;
+
+ private String localBindAddress;
+
+ private int localBindPort;
+
+ private String groupAddress;
+
+ private int groupPort;
+
+ private long broadcastPeriod;
+
+ private List<Pair<String, String>> connectorInfos;
+
+ public BroadcastGroupConfiguration(final String name,
+ final String localBindAddress,
+ final int localBindPort,
+ final String groupAddress,
+ final int groupPort,
+ final long broadcastPeriod,
+ final List<Pair<String, String>> connectorInfos)
+ {
+ super();
+ this.name = name;
+ this.localBindAddress = localBindAddress;
+ this.localBindPort = localBindPort;
+ this.groupAddress = groupAddress;
+ this.groupPort = groupPort;
+ this.broadcastPeriod = broadcastPeriod;
+ this.connectorInfos = connectorInfos;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getLocalBindAddress()
+ {
+ return localBindAddress;
+ }
+
+ public int getLocalBindPort()
+ {
+ return localBindPort;
+ }
+
+ public String getGroupAddress()
+ {
+ return groupAddress;
+ }
+
+ public int getGroupPort()
+ {
+ return groupPort;
+ }
+
+ public long getBroadcastPeriod()
+ {
+ return broadcastPeriod;
+ }
+
+ public List<Pair<String, String>> getConnectorInfos()
+ {
+ return connectorInfos;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(final String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * @param localBindAddress the localBindAddress to set
+ */
+ public void setLocalBindAddress(final String localBindAddress)
+ {
+ this.localBindAddress = localBindAddress;
+ }
+
+ /**
+ * @param localBindPort the localBindPort to set
+ */
+ public void setLocalBindPort(final int localBindPort)
+ {
+ this.localBindPort = localBindPort;
+ }
+
+ /**
+ * @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 broadcastPeriod the broadcastPeriod to set
+ */
+ public void setBroadcastPeriod(final long broadcastPeriod)
+ {
+ this.broadcastPeriod = broadcastPeriod;
+ }
+
+ /**
+ * @param connectorInfos the connectorInfos to set
+ */
+ public void setConnectorInfos(final List<Pair<String, String>> connectorInfos)
+ {
+ this.connectorInfos = connectorInfos;
+ }
+
+}
Copied: trunk/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java)
===================================================================
--- trunk/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java (rev 0)
+++ trunk/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -0,0 +1,136 @@
+/*
+ * 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 java.util.List;
+
+import org.hornetq.api.core.Pair;
+
+/**
+ * A ClusterConnectionConfiguration
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ * Created 13 Jan 2009 09:42:17
+ *
+ *
+ */
+public class ClusterConnectionConfiguration implements Serializable
+{
+ private static final long serialVersionUID = 8948303813427795935L;
+
+ private final String name;
+
+ private final String address;
+
+ private final long retryInterval;
+
+ private final boolean duplicateDetection;
+
+ private final boolean forwardWhenNoConsumers;
+
+ private final List<Pair<String, String>> staticConnectorNamePairs;
+
+ private final String discoveryGroupName;
+
+ private final int maxHops;
+
+ private final int confirmationWindowSize;
+
+ public ClusterConnectionConfiguration(final String name,
+ final String address,
+ final long retryInterval,
+ final boolean duplicateDetection,
+ final boolean forwardWhenNoConsumers,
+ final int maxHops,
+ final int confirmationWindowSize,
+ final List<Pair<String, String>> staticConnectorNamePairs)
+ {
+ this.name = name;
+ this.address = address;
+ this.retryInterval = retryInterval;
+ this.staticConnectorNamePairs = staticConnectorNamePairs;
+ this.duplicateDetection = duplicateDetection;
+ this.forwardWhenNoConsumers = forwardWhenNoConsumers;
+ discoveryGroupName = null;
+ this.maxHops = maxHops;
+ this.confirmationWindowSize = confirmationWindowSize;
+ }
+
+ public ClusterConnectionConfiguration(final String name,
+ final String address,
+ final long retryInterval,
+ final boolean duplicateDetection,
+ final boolean forwardWhenNoConsumers,
+ final int maxHops,
+ final int confirmationWindowSize,
+ final String discoveryGroupName)
+ {
+ this.name = name;
+ this.address = address;
+ this.retryInterval = retryInterval;
+ this.duplicateDetection = duplicateDetection;
+ this.forwardWhenNoConsumers = forwardWhenNoConsumers;
+ this.discoveryGroupName = discoveryGroupName;
+ staticConnectorNamePairs = null;
+ this.maxHops = maxHops;
+ this.confirmationWindowSize = confirmationWindowSize;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getAddress()
+ {
+ return address;
+ }
+
+ public boolean isDuplicateDetection()
+ {
+ return duplicateDetection;
+ }
+
+ public boolean isForwardWhenNoConsumers()
+ {
+ return forwardWhenNoConsumers;
+ }
+
+ public int getMaxHops()
+ {
+ return maxHops;
+ }
+
+ public int getConfirmationWindowSize()
+ {
+ return confirmationWindowSize;
+ }
+
+ public List<Pair<String, String>> getStaticConnectorNamePairs()
+ {
+ return staticConnectorNamePairs;
+ }
+
+ public String getDiscoveryGroupName()
+ {
+ return discoveryGroupName;
+ }
+
+ public long getRetryInterval()
+ {
+ return retryInterval;
+ }
+}
Modified: trunk/src/main/org/hornetq/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/Configuration.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/config/Configuration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -23,12 +23,6 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.core.security.Role;
import org.hornetq.core.server.JournalType;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
-import org.hornetq.core.server.cluster.ClusterConnectionConfiguration;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
-import org.hornetq.core.server.cluster.DivertConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.spi.core.logging.LogDelegateFactory;
@@ -338,12 +332,12 @@
/**
* Returns the queues configured for this server.
*/
- List<QueueConfiguration> getQueueConfigurations();
+ List<CoreQueueConfiguration> getQueueConfigurations();
/**
* Sets the queues configured for this server.
*/
- void setQueueConfigurations(final List<QueueConfiguration> configs);
+ void setQueueConfigurations(final List<CoreQueueConfiguration> configs);
/**
* Returns the management address of this server.
Copied: trunk/src/main/org/hornetq/core/config/CoreQueueConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java)
===================================================================
--- trunk/src/main/org/hornetq/core/config/CoreQueueConfiguration.java (rev 0)
+++ trunk/src/main/org/hornetq/core/config/CoreQueueConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -0,0 +1,98 @@
+/*
+ * 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;
+
+/**
+ * A QueueConfiguration
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ * Created 13 Jan 2009 09:39:21
+ *
+ *
+ */
+public class CoreQueueConfiguration implements Serializable
+{
+ private static final long serialVersionUID = 650404974977490254L;
+
+ private String address;
+
+ private String name;
+
+ private String filterString;
+
+ private boolean durable;
+
+ public CoreQueueConfiguration(final String address, final String name, final String filterString, final boolean durable)
+ {
+ this.address = address;
+ this.name = name;
+ this.filterString = filterString;
+ this.durable = durable;
+ }
+
+ public String getAddress()
+ {
+ return address;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getFilterString()
+ {
+ return filterString;
+ }
+
+ public boolean isDurable()
+ {
+ return durable;
+ }
+
+ /**
+ * @param address the address to set
+ */
+ public void setAddress(final String address)
+ {
+ this.address = address;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(final String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * @param filterString the filterString to set
+ */
+ public void setFilterString(final String filterString)
+ {
+ this.filterString = filterString;
+ }
+
+ /**
+ * @param durable the durable to set
+ */
+ public void setDurable(final boolean durable)
+ {
+ this.durable = durable;
+ }
+}
Copied: trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java)
===================================================================
--- trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java (rev 0)
+++ trunk/src/main/org/hornetq/core/config/DiscoveryGroupConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -0,0 +1,101 @@
+/*
+ * 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;
+
+/**
+ * A DiscoveryGroupConfiguration
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ * Created 18 Nov 2008 08:47:30
+ *
+ *
+ */
+public class DiscoveryGroupConfiguration implements Serializable
+{
+ private static final long serialVersionUID = 8657206421727863400L;
+
+ private String name;
+
+ private String groupAddress;
+
+ private int groupPort;
+
+ private long refreshTimeout;
+
+ public DiscoveryGroupConfiguration(final String name,
+ final String groupAddress,
+ final int groupPort,
+ final long refreshTimeout)
+ {
+ this.name = name;
+ this.groupAddress = groupAddress;
+ this.groupPort = groupPort;
+ this.refreshTimeout = refreshTimeout;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ 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 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;
+ }
+}
Copied: trunk/src/main/org/hornetq/core/config/DivertConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java)
===================================================================
--- trunk/src/main/org/hornetq/core/config/DivertConfiguration.java (rev 0)
+++ trunk/src/main/org/hornetq/core/config/DivertConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -0,0 +1,164 @@
+/*
+ * 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.core.logging.Logger;
+import org.hornetq.utils.UUIDGenerator;
+
+/**
+ * A DivertConfiguration
+ *
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ *
+ * Created 13 Jan 2009 09:36:19
+ *
+ *
+ */
+public class DivertConfiguration implements Serializable
+{
+ private static final long serialVersionUID = 6910543740464269629L;
+
+ private static final Logger log = Logger.getLogger(DivertConfiguration.class);
+
+ private String name;
+
+ private String routingName;
+
+ private String address;
+
+ private String forwardingAddress;
+
+ private boolean exclusive;
+
+ private String filterString;
+
+ private String transformerClassName;
+
+ public DivertConfiguration(final String name,
+ final String routingName,
+ final String address,
+ final String forwardingAddress,
+ final boolean exclusive,
+ final String filterString,
+ final String transformerClassName)
+ {
+ this.name = name;
+ if (routingName == null)
+ {
+ this.routingName = UUIDGenerator.getInstance().generateStringUUID();
+ }
+ else
+ {
+ this.routingName = routingName;
+ }
+ this.address = address;
+ this.forwardingAddress = forwardingAddress;
+ this.exclusive = exclusive;
+ this.filterString = filterString;
+ this.transformerClassName = transformerClassName;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public String getRoutingName()
+ {
+ return routingName;
+ }
+
+ public String getAddress()
+ {
+ return address;
+ }
+
+ public String getForwardingAddress()
+ {
+ return forwardingAddress;
+ }
+
+ public boolean isExclusive()
+ {
+ return exclusive;
+ }
+
+ public String getFilterString()
+ {
+ return filterString;
+ }
+
+ public String getTransformerClassName()
+ {
+ return transformerClassName;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(final String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * @param routingName the routingName to set
+ */
+ public void setRoutingName(final String routingName)
+ {
+ this.routingName = routingName;
+ }
+
+ /**
+ * @param address the address to set
+ */
+ public void setAddress(final String address)
+ {
+ this.address = address;
+ }
+
+ /**
+ * @param forwardingAddress the forwardingAddress to set
+ */
+ public void setForwardingAddress(final String forwardingAddress)
+ {
+ this.forwardingAddress = forwardingAddress;
+ }
+
+ /**
+ * @param exclusive the exclusive to set
+ */
+ public void setExclusive(final boolean exclusive)
+ {
+ this.exclusive = exclusive;
+ }
+
+ /**
+ * @param filterString the filterString to set
+ */
+ public void setFilterString(final String filterString)
+ {
+ this.filterString = filterString;
+ }
+
+ /**
+ * @param transformerClassName the transformerClassName to set
+ */
+ public void setTransformerClassName(final String transformerClassName)
+ {
+ this.transformerClassName = transformerClassName;
+ }
+}
Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -23,16 +23,16 @@
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.CoreQueueConfiguration;
import org.hornetq.core.logging.impl.JULLogDelegateFactory;
import org.hornetq.core.security.Role;
import org.hornetq.core.server.JournalType;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
-import org.hornetq.core.server.cluster.ClusterConnectionConfiguration;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
-import org.hornetq.core.server.cluster.DivertConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration;
import org.hornetq.core.settings.impl.AddressSettings;
@@ -233,7 +233,7 @@
protected List<ClusterConnectionConfiguration> clusterConfigurations = new ArrayList<ClusterConnectionConfiguration>();
- protected List<QueueConfiguration> queueConfigurations = new ArrayList<QueueConfiguration>();
+ protected List<CoreQueueConfiguration> queueConfigurations = new ArrayList<CoreQueueConfiguration>();
protected List<BroadcastGroupConfiguration> broadcastGroupConfigurations = new ArrayList<BroadcastGroupConfiguration>();
@@ -537,12 +537,12 @@
divertConfigurations = configs;
}
- public List<QueueConfiguration> getQueueConfigurations()
+ public List<CoreQueueConfiguration> getQueueConfigurations()
{
return queueConfigurations;
}
- public void setQueueConfigurations(final List<QueueConfiguration> configs)
+ public void setQueueConfigurations(final List<CoreQueueConfiguration> configs)
{
queueConfigurations = configs;
}
Modified: trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -27,19 +27,19 @@
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.HornetQClient;
+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.CoreQueueConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.config.impl.FileConfiguration;
import org.hornetq.core.config.impl.Validators;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.security.Role;
import org.hornetq.core.server.JournalType;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
-import org.hornetq.core.server.cluster.ClusterConnectionConfiguration;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
-import org.hornetq.core.server.cluster.DivertConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration;
import org.hornetq.core.settings.impl.AddressFullMessagePolicy;
import org.hornetq.core.settings.impl.AddressSettings;
@@ -561,7 +561,7 @@
NodeList list = node.getElementsByTagName("queue");
for (int i = 0 ; i < list.getLength(); i++)
{
- QueueConfiguration queueConfig = parseQueueConfiguration(list.item(i));
+ CoreQueueConfiguration queueConfig = parseQueueConfiguration(list.item(i));
config.getQueueConfigurations().add(queueConfig);
}
}
@@ -757,7 +757,7 @@
return setting;
}
- public QueueConfiguration parseQueueConfiguration(final Node node)
+ public CoreQueueConfiguration parseQueueConfiguration(final Node node)
{
String name = node.getAttributes().getNamedItem("name").getNodeValue();
String address = null;
@@ -784,7 +784,7 @@
}
}
- return new QueueConfiguration(address, name, filterString, durable);
+ return new CoreQueueConfiguration(address, name, filterString, durable);
}
// Package protected ---------------------------------------------
Modified: trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -14,8 +14,8 @@
package org.hornetq.core.deployers.impl;
import org.hornetq.api.core.management.HornetQServerControl;
+import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.deployers.DeploymentManager;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.w3c.dom.Node;
/**
@@ -62,7 +62,7 @@
@Override
public void deploy(final Node node) throws Exception
{
- QueueConfiguration queueConfig = parser.parseQueueConfiguration(node);
+ CoreQueueConfiguration queueConfig = parser.parseQueueConfiguration(node);
serverControl.deployQueue(queueConfig.getAddress(),
queueConfig.getName(),
Modified: trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -17,9 +17,9 @@
import org.hornetq.api.core.management.AddressControl;
import org.hornetq.api.core.management.BridgeControl;
+import org.hornetq.core.config.BridgeConfiguration;
import org.hornetq.core.persistence.StorageManager;
import org.hornetq.core.server.cluster.Bridge;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
/**
* A BridgeControl
Modified: trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -18,9 +18,9 @@
import org.hornetq.api.core.Pair;
import org.hornetq.api.core.management.AddressControl;
import org.hornetq.api.core.management.BroadcastGroupControl;
+import org.hornetq.core.config.BroadcastGroupConfiguration;
import org.hornetq.core.persistence.StorageManager;
import org.hornetq.core.server.cluster.BroadcastGroup;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
Modified: trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -21,9 +21,9 @@
import org.hornetq.api.core.Pair;
import org.hornetq.api.core.management.AddressControl;
import org.hornetq.api.core.management.ClusterConnectionControl;
+import org.hornetq.core.config.ClusterConnectionConfiguration;
import org.hornetq.core.persistence.StorageManager;
import org.hornetq.core.server.cluster.ClusterConnection;
-import org.hornetq.core.server.cluster.ClusterConnectionConfiguration;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
Modified: trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -18,8 +18,8 @@
import org.hornetq.api.core.management.AddressControl;
import org.hornetq.api.core.management.DiscoveryGroupControl;
import org.hornetq.core.cluster.DiscoveryGroup;
+import org.hornetq.core.config.DiscoveryGroupConfiguration;
import org.hornetq.core.persistence.StorageManager;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
/**
* A AcceptorControl
Modified: trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -16,9 +16,9 @@
import javax.management.MBeanOperationInfo;
import org.hornetq.api.core.management.DivertControl;
+import org.hornetq.core.config.DivertConfiguration;
import org.hornetq.core.persistence.StorageManager;
import org.hornetq.core.server.Divert;
-import org.hornetq.core.server.cluster.DivertConfiguration;
/**
* A DivertControl
Deleted: trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -1,326 +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.server.cluster;
-
-import java.io.Serializable;
-
-import org.hornetq.api.core.Pair;
-
-/**
- * A BridgeConfiguration
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- * Created 13 Jan 2009 09:32:43
- *
- *
- */
-public class BridgeConfiguration implements Serializable
-{
- private static final long serialVersionUID = -1057244274380572226L;
-
- private String name;
-
- private String queueName;
-
- private String forwardingAddress;
-
- private String filterString;
-
- private Pair<String, String> connectorPair;
-
- private String discoveryGroupName;
-
- private String transformerClassName;
-
- private long retryInterval;
-
- private double retryIntervalMultiplier;
-
- private int reconnectAttempts;
-
- private boolean failoverOnServerShutdown;
-
- private boolean useDuplicateDetection;
-
- private int confirmationWindowSize;
-
- private final long clientFailureCheckPeriod;
-
- private String user;
-
- private String password;
-
- public BridgeConfiguration(final String name,
- final String queueName,
- final String forwardingAddress,
- final String filterString,
- final String transformerClassName,
- final long retryInterval,
- final double retryIntervalMultiplier,
- final int reconnectAttempts,
- final boolean failoverOnServerShutdown,
- final boolean useDuplicateDetection,
- final int confirmationWindowSize,
- final long clientFailureCheckPeriod,
- final Pair<String, String> connectorPair,
- final String user,
- final String password)
- {
- this.name = name;
- this.queueName = queueName;
- this.forwardingAddress = forwardingAddress;
- this.filterString = filterString;
- this.transformerClassName = transformerClassName;
- this.retryInterval = retryInterval;
- this.retryIntervalMultiplier = retryIntervalMultiplier;
- this.reconnectAttempts = reconnectAttempts;
- this.failoverOnServerShutdown = failoverOnServerShutdown;
- this.useDuplicateDetection = useDuplicateDetection;
- this.confirmationWindowSize = confirmationWindowSize;
- this.clientFailureCheckPeriod = clientFailureCheckPeriod;
- this.connectorPair = connectorPair;
- this.user = user;
- this.password = password;
- discoveryGroupName = null;
- }
-
- public BridgeConfiguration(final String name,
- final String queueName,
- final String forwardingAddress,
- final String filterString,
- final String transformerClassName,
- final long retryInterval,
- final double retryIntervalMultiplier,
- final int reconnectAttempts,
- final boolean failoverOnServerShutdown,
- final boolean useDuplicateDetection,
- final int confirmationWindowSize,
- final long clientFailureCheckPeriod,
- final String discoveryGroupName,
- final String user,
- final String password)
- {
- this.name = name;
- this.queueName = queueName;
- this.forwardingAddress = forwardingAddress;
- this.filterString = filterString;
- this.transformerClassName = transformerClassName;
- this.retryInterval = retryInterval;
- this.retryIntervalMultiplier = retryIntervalMultiplier;
- this.reconnectAttempts = reconnectAttempts;
- this.failoverOnServerShutdown = failoverOnServerShutdown;
- this.useDuplicateDetection = useDuplicateDetection;
- this.confirmationWindowSize = confirmationWindowSize;
- this.clientFailureCheckPeriod = clientFailureCheckPeriod;
- connectorPair = null;
- this.discoveryGroupName = discoveryGroupName;
- this.user = user;
- this.password = password;
- }
-
- public String getName()
- {
- return name;
- }
-
- public String getQueueName()
- {
- return queueName;
- }
-
- public String getForwardingAddress()
- {
- return forwardingAddress;
- }
-
- public String getFilterString()
- {
- return filterString;
- }
-
- public String getTransformerClassName()
- {
- return transformerClassName;
- }
-
- public Pair<String, String> getConnectorPair()
- {
- return connectorPair;
- }
-
- public String getDiscoveryGroupName()
- {
- return discoveryGroupName;
- }
-
- public long getRetryInterval()
- {
- return retryInterval;
- }
-
- public double getRetryIntervalMultiplier()
- {
- return retryIntervalMultiplier;
- }
-
- public int getReconnectAttempts()
- {
- return reconnectAttempts;
- }
-
- public boolean isFailoverOnServerShutdown()
- {
- return failoverOnServerShutdown;
- }
-
- public boolean isUseDuplicateDetection()
- {
- return useDuplicateDetection;
- }
-
- public int getConfirmationWindowSize()
- {
- return confirmationWindowSize;
- }
-
- public long getClientFailureCheckPeriod()
- {
- return clientFailureCheckPeriod;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(final String name)
- {
- this.name = name;
- }
-
- /**
- * @param queueName the queueName to set
- */
- public void setQueueName(final String queueName)
- {
- this.queueName = queueName;
- }
-
- /**
- * @param forwardingAddress the forwardingAddress to set
- */
- public void setForwardingAddress(final String forwardingAddress)
- {
- this.forwardingAddress = forwardingAddress;
- }
-
- /**
- * @param filterString the filterString to set
- */
- public void setFilterString(final String filterString)
- {
- this.filterString = filterString;
- }
-
- /**
- * @param connectorPair the connectorPair to set
- */
- public void setConnectorPair(final Pair<String, String> connectorPair)
- {
- this.connectorPair = connectorPair;
- }
-
- /**
- * @param discoveryGroupName the discoveryGroupName to set
- */
- public void setDiscoveryGroupName(final String discoveryGroupName)
- {
- this.discoveryGroupName = discoveryGroupName;
- }
-
- /**
- * @param transformerClassName the transformerClassName to set
- */
- public void setTransformerClassName(final String transformerClassName)
- {
- this.transformerClassName = transformerClassName;
- }
-
- /**
- * @param retryInterval the retryInterval to set
- */
- public void setRetryInterval(final long retryInterval)
- {
- this.retryInterval = retryInterval;
- }
-
- /**
- * @param retryIntervalMultiplier the retryIntervalMultiplier to set
- */
- public void setRetryIntervalMultiplier(final double retryIntervalMultiplier)
- {
- this.retryIntervalMultiplier = retryIntervalMultiplier;
- }
-
- /**
- * @param reconnectAttempts the reconnectAttempts to set
- */
- public void setReconnectAttempts(final int reconnectAttempts)
- {
- this.reconnectAttempts = reconnectAttempts;
- }
-
- /**
- * @param failoverOnServerShutdown the failoverOnServerShutdown to set
- */
- public void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown)
- {
- this.failoverOnServerShutdown = failoverOnServerShutdown;
- }
-
- /**
- * @param useDuplicateDetection the useDuplicateDetection to set
- */
- public void setUseDuplicateDetection(final boolean useDuplicateDetection)
- {
- this.useDuplicateDetection = useDuplicateDetection;
- }
-
- /**
- * @param confirmationWindowSize the confirmationWindowSize to set
- */
- public void setConfirmationWindowSize(final int confirmationWindowSize)
- {
- this.confirmationWindowSize = confirmationWindowSize;
- }
-
- public String getUser()
- {
- return user;
- }
-
- public String getPassword()
- {
- return password;
- }
-
- public void setUser(String user)
- {
- this.user = user;
- }
-
- public void setPassword(String password)
- {
- this.password = password;
- }
-}
Deleted: trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -1,159 +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.server.cluster;
-
-import java.io.Serializable;
-import java.util.List;
-
-import org.hornetq.api.core.Pair;
-import org.hornetq.core.logging.Logger;
-
-/**
- * A BroadcastGroupConfiguration
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- * Created 18 Nov 2008 08:44:30
- *
- */
-public class BroadcastGroupConfiguration implements Serializable
-{
- private static final long serialVersionUID = 1052413739064253955L;
-
- private static final Logger log = Logger.getLogger(BroadcastGroupConfiguration.class);
-
- private String name;
-
- private String localBindAddress;
-
- private int localBindPort;
-
- private String groupAddress;
-
- private int groupPort;
-
- private long broadcastPeriod;
-
- private List<Pair<String, String>> connectorInfos;
-
- public BroadcastGroupConfiguration(final String name,
- final String localBindAddress,
- final int localBindPort,
- final String groupAddress,
- final int groupPort,
- final long broadcastPeriod,
- final List<Pair<String, String>> connectorInfos)
- {
- super();
- this.name = name;
- this.localBindAddress = localBindAddress;
- this.localBindPort = localBindPort;
- this.groupAddress = groupAddress;
- this.groupPort = groupPort;
- this.broadcastPeriod = broadcastPeriod;
- this.connectorInfos = connectorInfos;
- }
-
- public String getName()
- {
- return name;
- }
-
- public String getLocalBindAddress()
- {
- return localBindAddress;
- }
-
- public int getLocalBindPort()
- {
- return localBindPort;
- }
-
- public String getGroupAddress()
- {
- return groupAddress;
- }
-
- public int getGroupPort()
- {
- return groupPort;
- }
-
- public long getBroadcastPeriod()
- {
- return broadcastPeriod;
- }
-
- public List<Pair<String, String>> getConnectorInfos()
- {
- return connectorInfos;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(final String name)
- {
- this.name = name;
- }
-
- /**
- * @param localBindAddress the localBindAddress to set
- */
- public void setLocalBindAddress(final String localBindAddress)
- {
- this.localBindAddress = localBindAddress;
- }
-
- /**
- * @param localBindPort the localBindPort to set
- */
- public void setLocalBindPort(final int localBindPort)
- {
- this.localBindPort = localBindPort;
- }
-
- /**
- * @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 broadcastPeriod the broadcastPeriod to set
- */
- public void setBroadcastPeriod(final long broadcastPeriod)
- {
- this.broadcastPeriod = broadcastPeriod;
- }
-
- /**
- * @param connectorInfos the connectorInfos to set
- */
- public void setConnectorInfos(final List<Pair<String, String>> connectorInfos)
- {
- this.connectorInfos = connectorInfos;
- }
-
-}
Deleted: trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -1,136 +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.server.cluster;
-
-import java.io.Serializable;
-import java.util.List;
-
-import org.hornetq.api.core.Pair;
-
-/**
- * A ClusterConnectionConfiguration
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- * Created 13 Jan 2009 09:42:17
- *
- *
- */
-public class ClusterConnectionConfiguration implements Serializable
-{
- private static final long serialVersionUID = 8948303813427795935L;
-
- private final String name;
-
- private final String address;
-
- private final long retryInterval;
-
- private final boolean duplicateDetection;
-
- private final boolean forwardWhenNoConsumers;
-
- private final List<Pair<String, String>> staticConnectorNamePairs;
-
- private final String discoveryGroupName;
-
- private final int maxHops;
-
- private final int confirmationWindowSize;
-
- public ClusterConnectionConfiguration(final String name,
- final String address,
- final long retryInterval,
- final boolean duplicateDetection,
- final boolean forwardWhenNoConsumers,
- final int maxHops,
- final int confirmationWindowSize,
- final List<Pair<String, String>> staticConnectorNamePairs)
- {
- this.name = name;
- this.address = address;
- this.retryInterval = retryInterval;
- this.staticConnectorNamePairs = staticConnectorNamePairs;
- this.duplicateDetection = duplicateDetection;
- this.forwardWhenNoConsumers = forwardWhenNoConsumers;
- discoveryGroupName = null;
- this.maxHops = maxHops;
- this.confirmationWindowSize = confirmationWindowSize;
- }
-
- public ClusterConnectionConfiguration(final String name,
- final String address,
- final long retryInterval,
- final boolean duplicateDetection,
- final boolean forwardWhenNoConsumers,
- final int maxHops,
- final int confirmationWindowSize,
- final String discoveryGroupName)
- {
- this.name = name;
- this.address = address;
- this.retryInterval = retryInterval;
- this.duplicateDetection = duplicateDetection;
- this.forwardWhenNoConsumers = forwardWhenNoConsumers;
- this.discoveryGroupName = discoveryGroupName;
- staticConnectorNamePairs = null;
- this.maxHops = maxHops;
- this.confirmationWindowSize = confirmationWindowSize;
- }
-
- public String getName()
- {
- return name;
- }
-
- public String getAddress()
- {
- return address;
- }
-
- public boolean isDuplicateDetection()
- {
- return duplicateDetection;
- }
-
- public boolean isForwardWhenNoConsumers()
- {
- return forwardWhenNoConsumers;
- }
-
- public int getMaxHops()
- {
- return maxHops;
- }
-
- public int getConfirmationWindowSize()
- {
- return confirmationWindowSize;
- }
-
- public List<Pair<String, String>> getStaticConnectorNamePairs()
- {
- return staticConnectorNamePairs;
- }
-
- public String getDiscoveryGroupName()
- {
- return discoveryGroupName;
- }
-
- public long getRetryInterval()
- {
- return retryInterval;
- }
-}
Deleted: trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -1,101 +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.server.cluster;
-
-import java.io.Serializable;
-
-/**
- * A DiscoveryGroupConfiguration
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- * Created 18 Nov 2008 08:47:30
- *
- *
- */
-public class DiscoveryGroupConfiguration implements Serializable
-{
- private static final long serialVersionUID = 8657206421727863400L;
-
- private String name;
-
- private String groupAddress;
-
- private int groupPort;
-
- private long refreshTimeout;
-
- public DiscoveryGroupConfiguration(final String name,
- final String groupAddress,
- final int groupPort,
- final long refreshTimeout)
- {
- this.name = name;
- this.groupAddress = groupAddress;
- this.groupPort = groupPort;
- this.refreshTimeout = refreshTimeout;
- }
-
- public String getName()
- {
- return name;
- }
-
- 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 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;
- }
-}
Deleted: trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -1,164 +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.server.cluster;
-
-import java.io.Serializable;
-
-import org.hornetq.core.logging.Logger;
-import org.hornetq.utils.UUIDGenerator;
-
-/**
- * A DivertConfiguration
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- * Created 13 Jan 2009 09:36:19
- *
- *
- */
-public class DivertConfiguration implements Serializable
-{
- private static final long serialVersionUID = 6910543740464269629L;
-
- private static final Logger log = Logger.getLogger(DivertConfiguration.class);
-
- private String name;
-
- private String routingName;
-
- private String address;
-
- private String forwardingAddress;
-
- private boolean exclusive;
-
- private String filterString;
-
- private String transformerClassName;
-
- public DivertConfiguration(final String name,
- final String routingName,
- final String address,
- final String forwardingAddress,
- final boolean exclusive,
- final String filterString,
- final String transformerClassName)
- {
- this.name = name;
- if (routingName == null)
- {
- this.routingName = UUIDGenerator.getInstance().generateStringUUID();
- }
- else
- {
- this.routingName = routingName;
- }
- this.address = address;
- this.forwardingAddress = forwardingAddress;
- this.exclusive = exclusive;
- this.filterString = filterString;
- this.transformerClassName = transformerClassName;
- }
-
- public String getName()
- {
- return name;
- }
-
- public String getRoutingName()
- {
- return routingName;
- }
-
- public String getAddress()
- {
- return address;
- }
-
- public String getForwardingAddress()
- {
- return forwardingAddress;
- }
-
- public boolean isExclusive()
- {
- return exclusive;
- }
-
- public String getFilterString()
- {
- return filterString;
- }
-
- public String getTransformerClassName()
- {
- return transformerClassName;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(final String name)
- {
- this.name = name;
- }
-
- /**
- * @param routingName the routingName to set
- */
- public void setRoutingName(final String routingName)
- {
- this.routingName = routingName;
- }
-
- /**
- * @param address the address to set
- */
- public void setAddress(final String address)
- {
- this.address = address;
- }
-
- /**
- * @param forwardingAddress the forwardingAddress to set
- */
- public void setForwardingAddress(final String forwardingAddress)
- {
- this.forwardingAddress = forwardingAddress;
- }
-
- /**
- * @param exclusive the exclusive to set
- */
- public void setExclusive(final boolean exclusive)
- {
- this.exclusive = exclusive;
- }
-
- /**
- * @param filterString the filterString to set
- */
- public void setFilterString(final String filterString)
- {
- this.filterString = filterString;
- }
-
- /**
- * @param transformerClassName the transformerClassName to set
- */
- public void setTransformerClassName(final String transformerClassName)
- {
- this.transformerClassName = transformerClassName;
- }
-}
Deleted: trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -1,98 +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.server.cluster;
-
-import java.io.Serializable;
-
-/**
- * A QueueConfiguration
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
- * Created 13 Jan 2009 09:39:21
- *
- *
- */
-public class QueueConfiguration implements Serializable
-{
- private static final long serialVersionUID = 650404974977490254L;
-
- private String address;
-
- private String name;
-
- private String filterString;
-
- private boolean durable;
-
- public QueueConfiguration(final String address, final String name, final String filterString, final boolean durable)
- {
- this.address = address;
- this.name = name;
- this.filterString = filterString;
- this.durable = durable;
- }
-
- public String getAddress()
- {
- return address;
- }
-
- public String getName()
- {
- return name;
- }
-
- public String getFilterString()
- {
- return filterString;
- }
-
- public boolean isDurable()
- {
- return durable;
- }
-
- /**
- * @param address the address to set
- */
- public void setAddress(final String address)
- {
- this.address = address;
- }
-
- /**
- * @param name the name to set
- */
- public void setName(final String name)
- {
- this.name = name;
- }
-
- /**
- * @param filterString the filterString to set
- */
- public void setFilterString(final String filterString)
- {
- this.filterString = filterString;
- }
-
- /**
- * @param durable the durable to set
- */
- public void setDurable(final boolean durable)
- {
- this.durable = durable;
- }
-}
Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -30,20 +30,20 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.core.cluster.DiscoveryGroup;
import org.hornetq.core.cluster.impl.DiscoveryGroupImpl;
+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.logging.Logger;
import org.hornetq.core.postoffice.Binding;
import org.hornetq.core.postoffice.PostOffice;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
import org.hornetq.core.server.cluster.Bridge;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
import org.hornetq.core.server.cluster.BroadcastGroup;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
import org.hornetq.core.server.cluster.ClusterConnection;
-import org.hornetq.core.server.cluster.ClusterConnectionConfiguration;
import org.hornetq.core.server.cluster.ClusterManager;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
import org.hornetq.core.server.cluster.Transformer;
import org.hornetq.core.server.management.ManagementService;
import org.hornetq.utils.UUID;
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -40,6 +40,8 @@
import org.hornetq.core.client.impl.FailoverManager;
import org.hornetq.core.client.impl.FailoverManagerImpl;
import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.DivertConfiguration;
+import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.deployers.Deployer;
import org.hornetq.core.deployers.DeploymentManager;
@@ -87,8 +89,6 @@
import org.hornetq.core.server.QueueFactory;
import org.hornetq.core.server.ServerSession;
import org.hornetq.core.server.cluster.ClusterManager;
-import org.hornetq.core.server.cluster.DivertConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.core.server.cluster.Transformer;
import org.hornetq.core.server.cluster.impl.ClusterManagerImpl;
import org.hornetq.core.server.group.GroupingHandler;
@@ -1102,7 +1102,7 @@
private void deployQueuesFromConfiguration() throws Exception
{
- for (QueueConfiguration config : configuration.getQueueConfigurations())
+ for (CoreQueueConfiguration config : configuration.getQueueConfigurations())
{
messagingServerControl.deployQueue(config.getAddress(),
config.getName(),
Modified: trunk/src/main/org/hornetq/core/server/management/ManagementService.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -22,7 +22,12 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.management.ObjectNameBuilder;
import org.hornetq.core.cluster.DiscoveryGroup;
+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.management.impl.HornetQServerControlImpl;
import org.hornetq.core.messagecounter.MessageCounterManager;
import org.hornetq.core.paging.PagingManager;
@@ -37,13 +42,8 @@
import org.hornetq.core.server.QueueFactory;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.server.cluster.Bridge;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
import org.hornetq.core.server.cluster.BroadcastGroup;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
import org.hornetq.core.server.cluster.ClusterConnection;
-import org.hornetq.core.server.cluster.ClusterConnectionConfiguration;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
-import org.hornetq.core.server.cluster.DivertConfiguration;
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.core.transaction.ResourceManager;
Modified: trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -40,7 +40,12 @@
import org.hornetq.api.core.management.ObjectNameBuilder;
import org.hornetq.api.core.management.ResourceNames;
import org.hornetq.core.cluster.DiscoveryGroup;
+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.logging.Logger;
import org.hornetq.core.management.impl.AcceptorControlImpl;
import org.hornetq.core.management.impl.AddressControlImpl;
@@ -65,13 +70,8 @@
import org.hornetq.core.server.QueueFactory;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.server.cluster.Bridge;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
import org.hornetq.core.server.cluster.BroadcastGroup;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
import org.hornetq.core.server.cluster.ClusterConnection;
-import org.hornetq.core.server.cluster.ClusterConnectionConfiguration;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
-import org.hornetq.core.server.cluster.DivertConfiguration;
import org.hornetq.core.server.impl.ServerMessageImpl;
import org.hornetq.core.server.management.ManagementService;
import org.hornetq.core.server.management.Notification;
Modified: trunk/src/main/org/hornetq/jms/server/JMSServerConfigParser.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/JMSServerConfigParser.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/jms/server/JMSServerConfigParser.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -17,7 +17,7 @@
import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
import org.hornetq.jms.server.config.JMSConfiguration;
-import org.hornetq.jms.server.config.QueueConfiguration;
+import org.hornetq.jms.server.config.JMSQueueConfiguration;
import org.hornetq.jms.server.config.TopicConfiguration;
import org.w3c.dom.Node;
@@ -54,7 +54,7 @@
* @return
* @throws Exception
*/
- QueueConfiguration parseQueueConfiguration(final Node node) throws Exception;
+ JMSQueueConfiguration parseQueueConfiguration(final Node node) throws Exception;
/**
* Parse the Connection Configuration node as a ConnectionFactoryConfiguration object
Modified: trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -30,7 +30,7 @@
Context getContext();
- List<QueueConfiguration> getQueueConfigurations();
+ List<JMSQueueConfiguration> getQueueConfigurations();
List<TopicConfiguration> getTopicConfigurations();
Copied: trunk/src/main/org/hornetq/jms/server/config/JMSQueueConfiguration.java (from rev 8868, trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java)
===================================================================
--- trunk/src/main/org/hornetq/jms/server/config/JMSQueueConfiguration.java (rev 0)
+++ trunk/src/main/org/hornetq/jms/server/config/JMSQueueConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -0,0 +1,32 @@
+/*
+ * 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.jms.server.config;
+
+/**
+ * A QeueConfiguration
+ *
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ *
+ */
+public interface JMSQueueConfiguration
+{
+ String getName();
+
+ String getSelector();
+
+ boolean isDurable();
+
+ String[] getBindings();
+}
Deleted: trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -1,32 +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.jms.server.config;
-
-/**
- * A QeueConfiguration
- *
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- *
- */
-public interface QueueConfiguration
-{
- String getName();
-
- String getSelector();
-
- boolean isDurable();
-
- String[] getBindings();
-}
Modified: trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -20,7 +20,7 @@
import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
import org.hornetq.jms.server.config.JMSConfiguration;
-import org.hornetq.jms.server.config.QueueConfiguration;
+import org.hornetq.jms.server.config.JMSQueueConfiguration;
import org.hornetq.jms.server.config.TopicConfiguration;
@@ -36,7 +36,7 @@
private final List<ConnectionFactoryConfiguration> connectionFactoryConfigurations = new ArrayList<ConnectionFactoryConfiguration>();
- private final List<QueueConfiguration> queueConfigurations = new ArrayList<QueueConfiguration>();
+ private final List<JMSQueueConfiguration> queueConfigurations = new ArrayList<JMSQueueConfiguration>();
private final List<TopicConfiguration> topicConfigurations = new ArrayList<TopicConfiguration>();
@@ -55,7 +55,7 @@
}
public JMSConfigurationImpl(final List<ConnectionFactoryConfiguration> connectionFactoryConfigurations,
- final List<QueueConfiguration> queueConfigurations,
+ final List<JMSQueueConfiguration> queueConfigurations,
final List<TopicConfiguration> topicConfigurations)
{
this.connectionFactoryConfigurations.addAll(connectionFactoryConfigurations);
@@ -70,7 +70,7 @@
return connectionFactoryConfigurations;
}
- public List<QueueConfiguration> getQueueConfigurations()
+ public List<JMSQueueConfiguration> getQueueConfigurations()
{
return queueConfigurations;
}
Modified: trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -13,7 +13,7 @@
package org.hornetq.jms.server.config.impl;
-import org.hornetq.jms.server.config.QueueConfiguration;
+import org.hornetq.jms.server.config.JMSQueueConfiguration;
/**
@@ -23,7 +23,7 @@
*
*
*/
-public class QueueConfigurationImpl implements QueueConfiguration
+public class QueueConfigurationImpl implements JMSQueueConfiguration
{
// Constants -----------------------------------------------------
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -27,7 +27,7 @@
import org.hornetq.jms.server.JMSServerConfigParser;
import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
import org.hornetq.jms.server.config.JMSConfiguration;
-import org.hornetq.jms.server.config.QueueConfiguration;
+import org.hornetq.jms.server.config.JMSQueueConfiguration;
import org.hornetq.jms.server.config.TopicConfiguration;
import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
import org.hornetq.jms.server.config.impl.JMSConfigurationImpl;
@@ -80,7 +80,7 @@
public JMSConfiguration parseConfiguration(final Node rootnode) throws Exception
{
- ArrayList<QueueConfiguration> queues = new ArrayList<QueueConfiguration>();
+ ArrayList<JMSQueueConfiguration> queues = new ArrayList<JMSQueueConfiguration>();
ArrayList<TopicConfiguration> topics = new ArrayList<TopicConfiguration>();
ArrayList<ConnectionFactoryConfiguration> cfs = new ArrayList<ConnectionFactoryConfiguration>();
@@ -158,7 +158,7 @@
* @return
* @throws Exception
*/
- public QueueConfiguration parseQueueConfiguration(final Node node) throws Exception
+ public JMSQueueConfiguration parseQueueConfiguration(final Node node) throws Exception
{
Element e = (Element)node;
NamedNodeMap atts = node.getAttributes();
@@ -431,7 +431,7 @@
* @param jndiArray
* @return
*/
- protected QueueConfiguration newQueue(final String queueName,
+ protected JMSQueueConfiguration newQueue(final String queueName,
final String selectorString,
final boolean durable,
final String[] jndiArray)
@@ -446,7 +446,7 @@
* @param cfs
* @return
*/
- protected JMSConfiguration newConfig(final ArrayList<QueueConfiguration> queues,
+ protected JMSConfiguration newConfig(final ArrayList<JMSQueueConfiguration> queues,
final ArrayList<TopicConfiguration> topics,
final ArrayList<ConnectionFactoryConfiguration> cfs)
{
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -22,7 +22,7 @@
import org.hornetq.jms.server.JMSServerConfigParser;
import org.hornetq.jms.server.JMSServerManager;
import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
-import org.hornetq.jms.server.config.QueueConfiguration;
+import org.hornetq.jms.server.config.JMSQueueConfiguration;
import org.hornetq.jms.server.config.TopicConfiguration;
import org.w3c.dom.Node;
@@ -181,7 +181,7 @@
*/
private void deployQueue(final Node node) throws Exception
{
- QueueConfiguration queueconfig = parser.parseQueueConfiguration(node);
+ JMSQueueConfiguration queueconfig = parser.parseQueueConfiguration(node);
for (String jndiName : queueconfig.getBindings())
{
jmsServerControl.createQueue(queueconfig.getName(), jndiName, queueconfig.getSelector(), queueconfig.isDurable());
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -30,20 +30,20 @@
import org.hornetq.api.core.TransportConfiguration;
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;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.ActivateCallback;
import org.hornetq.core.server.HornetQServer;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
import org.hornetq.jms.client.HornetQConnectionFactory;
import org.hornetq.jms.client.HornetQDestination;
import org.hornetq.jms.client.SelectorTranslator;
import org.hornetq.jms.server.JMSServerManager;
import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
import org.hornetq.jms.server.config.JMSConfiguration;
-import org.hornetq.jms.server.config.QueueConfiguration;
+import org.hornetq.jms.server.config.JMSQueueConfiguration;
import org.hornetq.jms.server.config.TopicConfiguration;
import org.hornetq.jms.server.management.JMSManagementService;
import org.hornetq.jms.server.management.impl.JMSManagementServiceImpl;
@@ -887,8 +887,8 @@
createConnectionFactory(config);
}
- List<QueueConfiguration> queueConfigs = config.getQueueConfigurations();
- for (QueueConfiguration config : queueConfigs)
+ List<JMSQueueConfiguration> queueConfigs = config.getQueueConfigurations();
+ for (JMSQueueConfiguration config : queueConfigs)
{
String[] bindings = config.getBindings();
for (String binding : bindings)
@@ -919,7 +919,7 @@
{
return cfConfig.getConnectorConfigs();
}
- else
+ else if (cfConfig.getConnectorNames() != null)
{
Configuration configuration = server.getConfiguration();
List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>();
@@ -959,6 +959,10 @@
return connectorConfigs;
}
+ else
+ {
+ return null;
+ }
}
}
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -30,13 +30,13 @@
import org.hornetq.api.core.client.ClientSessionFactory;
import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
+import org.hornetq.core.config.BroadcastGroupConfiguration;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.impl.invm.TransportConstants;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.ServiceTestBase;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -25,14 +25,14 @@
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.*;
+import org.hornetq.core.config.BridgeConfiguration;
+import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.impl.invm.InVMConnector;
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.cluster.Bridge;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.core.server.cluster.impl.BridgeImpl;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.spi.core.protocol.RemotingConnection;
@@ -131,13 +131,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
service2.getConfiguration().setQueueConfigurations(queueConfigs1);
@@ -256,13 +256,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
service2.getConfiguration().setQueueConfigurations(queueConfigs1);
@@ -376,13 +376,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
@@ -504,13 +504,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
@@ -625,13 +625,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -24,13 +24,13 @@
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.*;
+import org.hornetq.core.config.BridgeConfiguration;
+import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.impl.invm.TransportConstants;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.cluster.Bridge;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.tests.util.ServiceTestBase;
@@ -116,13 +116,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
@@ -268,13 +268,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
@@ -467,13 +467,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
@@ -604,13 +604,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -24,12 +24,12 @@
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.*;
+import org.hornetq.core.config.BridgeConfiguration;
+import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.impl.invm.TransportConstants;
import org.hornetq.core.server.HornetQServer;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
@@ -139,13 +139,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
@@ -333,13 +333,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
@@ -502,13 +502,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
@@ -631,13 +631,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -24,14 +24,14 @@
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.*;
+import org.hornetq.core.config.BridgeConfiguration;
+import org.hornetq.core.config.BroadcastGroupConfiguration;
+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.InVMConnectorFactory;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.cluster.Bridge;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.integration.transports.netty.TransportConstants;
import org.hornetq.tests.util.ServiceTestBase;
@@ -122,13 +122,13 @@
bridgeConfigs.add(bridgeConfiguration);
server0.getConfiguration().setBridgeConfigurations(bridgeConfigs);
- QueueConfiguration queueConfig0 = new QueueConfiguration(testAddress, queueName0, null, true);
- List<QueueConfiguration> queueConfigs0 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig0 = new CoreQueueConfiguration(testAddress, queueName0, null, true);
+ List<CoreQueueConfiguration> queueConfigs0 = new ArrayList<CoreQueueConfiguration>();
queueConfigs0.add(queueConfig0);
server0.getConfiguration().setQueueConfigurations(queueConfigs0);
- QueueConfiguration queueConfig1 = new QueueConfiguration(forwardAddress, queueName1, null, true);
- List<QueueConfiguration> queueConfigs1 = new ArrayList<QueueConfiguration>();
+ CoreQueueConfiguration queueConfig1 = new CoreQueueConfiguration(forwardAddress, queueName1, null, true);
+ List<CoreQueueConfiguration> queueConfigs1 = new ArrayList<CoreQueueConfiguration>();
queueConfigs1.add(queueConfig1);
server1.getConfiguration().setQueueConfigurations(queueConfigs1);
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -34,7 +34,10 @@
import org.hornetq.api.core.client.ClientSession;
import org.hornetq.api.core.client.ClientSessionFactory;
import org.hornetq.api.core.client.HornetQClient;
+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;
@@ -45,10 +48,7 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
import org.hornetq.core.server.JournalType;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
import org.hornetq.core.server.cluster.ClusterConnection;
-import org.hornetq.core.server.cluster.ClusterConnectionConfiguration;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
import org.hornetq.core.server.cluster.RemoteQueueBinding;
import org.hornetq.core.server.group.GroupingHandler;
import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -22,10 +22,10 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.*;
import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.DivertConfiguration;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.DivertConfiguration;
import org.hornetq.tests.util.ServiceTestBase;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -22,10 +22,10 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.*;
import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.DivertConfiguration;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.DivertConfiguration;
import org.hornetq.tests.util.ServiceTestBase;
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-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -29,13 +29,13 @@
import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.jms.client.HornetQConnectionFactory;
import org.hornetq.api.jms.HornetQJMSClient;
+import org.hornetq.core.config.BroadcastGroupConfiguration;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.impl.invm.TransportConstants;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -29,7 +29,7 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.core.config.Configuration;
-import org.hornetq.core.server.cluster.DivertConfiguration;
+import org.hornetq.core.config.DivertConfiguration;
import org.hornetq.tests.util.JMSTestBase;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -21,7 +21,7 @@
import org.hornetq.jms.server.JMSServerConfigParser;
import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
import org.hornetq.jms.server.config.JMSConfiguration;
-import org.hornetq.jms.server.config.QueueConfiguration;
+import org.hornetq.jms.server.config.JMSQueueConfiguration;
import org.hornetq.jms.server.config.TopicConfiguration;
import org.hornetq.jms.server.impl.JMSServerConfigParserImpl;
import org.hornetq.tests.util.ServiceTestBase;
@@ -95,7 +95,7 @@
assertEquals(1, jmsconfig.getQueueConfigurations().size());
- QueueConfiguration queueConfig = jmsconfig.getQueueConfigurations().get(0);
+ JMSQueueConfiguration queueConfig = jmsconfig.getQueueConfigurations().get(0);
assertEquals("fullConfigurationQueue", queueConfig.getName());
assertEquals(2, queueConfig.getBindings().length);
assertEquals("/fullConfigurationQueue", queueConfig.getBindings()[0]);
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-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -27,6 +27,7 @@
import org.hornetq.api.core.management.ObjectNameBuilder;
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.remoting.impl.invm.InVMAcceptorFactory;
@@ -34,7 +35,6 @@
import org.hornetq.core.remoting.impl.invm.TransportConstants;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
import org.hornetq.jms.server.JMSServerManager;
import org.hornetq.jms.server.impl.JMSServerManagerImpl;
import org.hornetq.tests.integration.management.ManagementControlHelper;
Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -28,15 +28,15 @@
import org.hornetq.api.core.management.BridgeControl;
import org.hornetq.api.core.management.NotificationType;
import org.hornetq.api.core.management.ObjectNameBuilder;
+import org.hornetq.core.config.BridgeConfiguration;
import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
import org.hornetq.core.remoting.impl.invm.TransportConstants;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.core.server.management.Notification;
import org.hornetq.tests.integration.SimpleNotificationService;
import org.hornetq.tests.util.RandomUtil;
@@ -151,11 +151,11 @@
acceptorParams,
RandomUtil.randomString());
- QueueConfiguration sourceQueueConfig = new QueueConfiguration(RandomUtil.randomString(),
+ CoreQueueConfiguration sourceQueueConfig = new CoreQueueConfiguration(RandomUtil.randomString(),
RandomUtil.randomString(),
null,
false);
- QueueConfiguration targetQueueConfig = new QueueConfiguration(RandomUtil.randomString(),
+ CoreQueueConfiguration targetQueueConfig = new CoreQueueConfiguration(RandomUtil.randomString(),
RandomUtil.randomString(),
null,
false);
Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -27,15 +27,15 @@
import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.api.core.management.ObjectNameBuilder;
import org.hornetq.api.core.management.ResourceNames;
+import org.hornetq.core.config.BridgeConfiguration;
import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
import org.hornetq.core.remoting.impl.invm.TransportConstants;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.tests.util.RandomUtil;
/**
@@ -129,11 +129,11 @@
acceptorParams,
RandomUtil.randomString());
- QueueConfiguration sourceQueueConfig = new QueueConfiguration(RandomUtil.randomString(),
+ CoreQueueConfiguration sourceQueueConfig = new CoreQueueConfiguration(RandomUtil.randomString(),
RandomUtil.randomString(),
null,
false);
- QueueConfiguration targetQueueConfig = new QueueConfiguration(RandomUtil.randomString(),
+ CoreQueueConfiguration targetQueueConfig = new CoreQueueConfiguration(RandomUtil.randomString(),
RandomUtil.randomString(),
null,
false);
Modified: trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -21,12 +21,12 @@
import org.hornetq.api.core.Pair;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.management.BroadcastGroupControl;
+import org.hornetq.core.config.BroadcastGroupConfiguration;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.utils.json.JSONArray;
Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -27,15 +27,15 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.api.core.management.ClusterConnectionControl;
+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;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
-import org.hornetq.core.server.cluster.ClusterConnectionConfiguration;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.integration.transports.netty.NettyAcceptorFactory;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.integration.transports.netty.TransportConstants;
@@ -125,7 +125,7 @@
TransportConfiguration connectorConfig_0 = new TransportConfiguration(NettyConnectorFactory.class.getName());
- QueueConfiguration queueConfig = new QueueConfiguration(RandomUtil.randomString(),
+ CoreQueueConfiguration queueConfig = new CoreQueueConfiguration(RandomUtil.randomString(),
RandomUtil.randomString(),
null,
false);
Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -29,15 +29,15 @@
import org.hornetq.api.core.management.ClusterConnectionControl;
import org.hornetq.api.core.management.NotificationType;
import org.hornetq.api.core.management.ObjectNameBuilder;
+import org.hornetq.core.config.ClusterConnectionConfiguration;
import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
import org.hornetq.core.remoting.impl.invm.TransportConstants;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.ClusterConnectionConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.core.server.management.Notification;
import org.hornetq.tests.integration.SimpleNotificationService;
import org.hornetq.tests.util.RandomUtil;
@@ -199,7 +199,7 @@
acceptorParams,
RandomUtil.randomString());
- QueueConfiguration queueConfig = new QueueConfiguration(RandomUtil.randomString(),
+ CoreQueueConfiguration queueConfig = new CoreQueueConfiguration(RandomUtil.randomString(),
RandomUtil.randomString(),
null,
false);
Modified: trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -18,11 +18,11 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.management.DiscoveryGroupControl;
import org.hornetq.core.config.Configuration;
+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.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
import org.hornetq.tests.util.RandomUtil;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -20,13 +20,13 @@
import org.hornetq.api.core.management.DivertControl;
import org.hornetq.api.core.management.ObjectNameBuilder;
import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.DivertConfiguration;
+import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.DivertConfiguration;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.tests.util.RandomUtil;
/**
@@ -84,11 +84,11 @@
TransportConfiguration connectorConfig = new TransportConfiguration(InVMConnectorFactory.class.getName());
- QueueConfiguration queueConfig = new QueueConfiguration(RandomUtil.randomString(),
+ CoreQueueConfiguration queueConfig = new CoreQueueConfiguration(RandomUtil.randomString(),
RandomUtil.randomString(),
null,
false);
- QueueConfiguration fowardQueueConfig = new QueueConfiguration(RandomUtil.randomString(),
+ CoreQueueConfiguration fowardQueueConfig = new CoreQueueConfiguration(RandomUtil.randomString(),
RandomUtil.randomString(),
null,
false);
Modified: trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -23,11 +23,11 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.*;
import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.postoffice.Bindings;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.tests.util.ServiceTestBase;
/**
@@ -56,13 +56,13 @@
final String queueName3 = "queue3";
- QueueConfiguration queue1 = new QueueConfiguration(testAddress, queueName1, null, true);
+ CoreQueueConfiguration queue1 = new CoreQueueConfiguration(testAddress, queueName1, null, true);
- QueueConfiguration queue2 = new QueueConfiguration(testAddress, queueName2, null, true);
+ CoreQueueConfiguration queue2 = new CoreQueueConfiguration(testAddress, queueName2, null, true);
- QueueConfiguration queue3 = new QueueConfiguration(testAddress, queueName3, null, true);
+ CoreQueueConfiguration queue3 = new CoreQueueConfiguration(testAddress, queueName3, null, true);
- List<QueueConfiguration> queueConfs = new ArrayList<QueueConfiguration>();
+ List<CoreQueueConfiguration> queueConfs = new ArrayList<CoreQueueConfiguration>();
queueConfs.add(queue1);
queueConfs.add(queue2);
@@ -126,13 +126,13 @@
final String queueName2 = "queue2";
- QueueConfiguration queue1 = new QueueConfiguration(testAddress, queueName1, null, true);
+ CoreQueueConfiguration queue1 = new CoreQueueConfiguration(testAddress, queueName1, null, true);
- QueueConfiguration queue2 = new QueueConfiguration(testAddress, queueName1, null, true);
+ CoreQueueConfiguration queue2 = new CoreQueueConfiguration(testAddress, queueName1, null, true);
- QueueConfiguration queue3 = new QueueConfiguration(testAddress, queueName2, null, true);
+ CoreQueueConfiguration queue3 = new CoreQueueConfiguration(testAddress, queueName2, null, true);
- List<QueueConfiguration> queueConfs = new ArrayList<QueueConfiguration>();
+ List<CoreQueueConfiguration> queueConfs = new ArrayList<CoreQueueConfiguration>();
queueConfs.add(queue1);
queueConfs.add(queue2);
@@ -228,13 +228,13 @@
server.stop();
- QueueConfiguration queue1 = new QueueConfiguration(testAddress, queueName1, null, true);
+ CoreQueueConfiguration queue1 = new CoreQueueConfiguration(testAddress, queueName1, null, true);
- QueueConfiguration queue2 = new QueueConfiguration(testAddress, queueName2, null, true);
+ CoreQueueConfiguration queue2 = new CoreQueueConfiguration(testAddress, queueName2, null, true);
- QueueConfiguration queue3 = new QueueConfiguration(testAddress, queueName3, null, true);
+ CoreQueueConfiguration queue3 = new CoreQueueConfiguration(testAddress, queueName3, null, true);
- List<QueueConfiguration> queueConfs = new ArrayList<QueueConfiguration>();
+ List<CoreQueueConfiguration> queueConfs = new ArrayList<CoreQueueConfiguration>();
queueConfs.add(queue1);
queueConfs.add(queue2);
@@ -310,11 +310,11 @@
final String queueName2 = "queue2";
- QueueConfiguration queue1 = new QueueConfiguration(testAddress, queueName1, null, false);
+ CoreQueueConfiguration queue1 = new CoreQueueConfiguration(testAddress, queueName1, null, false);
- QueueConfiguration queue2 = new QueueConfiguration(testAddress, queueName2, null, true);
+ CoreQueueConfiguration queue2 = new CoreQueueConfiguration(testAddress, queueName2, null, true);
- List<QueueConfiguration> queueConfs = new ArrayList<QueueConfiguration>();
+ List<CoreQueueConfiguration> queueConfs = new ArrayList<CoreQueueConfiguration>();
queueConfs.add(queue1);
queueConfs.add(queue2);
@@ -398,9 +398,9 @@
final String filter = "cheese='camembert'";
- QueueConfiguration queue1 = new QueueConfiguration(testAddress, queueName1, filter, false);
+ CoreQueueConfiguration queue1 = new CoreQueueConfiguration(testAddress, queueName1, filter, false);
- List<QueueConfiguration> queueConfs = new ArrayList<QueueConfiguration>();
+ List<CoreQueueConfiguration> queueConfs = new ArrayList<CoreQueueConfiguration>();
queueConfs.add(queue1);
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-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -17,15 +17,15 @@
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;
import org.hornetq.core.server.JournalType;
-import org.hornetq.core.server.cluster.BridgeConfiguration;
-import org.hornetq.core.server.cluster.BroadcastGroupConfiguration;
-import org.hornetq.core.server.cluster.ClusterConnectionConfiguration;
-import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration;
-import org.hornetq.core.server.cluster.DivertConfiguration;
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java 2010-02-10 14:15:24 UTC (rev 8868)
+++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java 2010-02-10 20:03:59 UTC (rev 8869)
@@ -20,9 +20,9 @@
import org.hornetq.api.core.management.HornetQServerControl;
import org.hornetq.core.config.Configuration;
+import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.deployers.DeploymentManager;
import org.hornetq.core.deployers.impl.QueueDeployer;
-import org.hornetq.core.server.cluster.QueueConfiguration;
import org.hornetq.tests.util.UnitTestCase;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -69,7 +69,7 @@
Assert.assertEquals(1, serverControl.configs.size());
- QueueConfiguration queueConfiguration = serverControl.configs.get(0);
+ CoreQueueConfiguration queueConfiguration = serverControl.configs.get(0);
Assert.assertEquals("foo", queueConfiguration.getName());
Assert.assertEquals("bar", queueConfiguration.getAddress());
Assert.assertEquals("speed > 88", queueConfiguration.getFilterString());
@@ -179,11 +179,11 @@
return null;
}
- List<QueueConfiguration> configs = new ArrayList<QueueConfiguration>();
+ List<CoreQueueConfiguration> configs = new ArrayList<CoreQueueConfiguration>();
public void deployQueue(final String address, final String name, final String filter, final boolean durable) throws Exception
{
- QueueConfiguration config = new QueueConfiguration(address, name, filter, durable);
+ CoreQueueConfiguration config = new CoreQueueConfiguration(address, name, filter, durable);
configs.add(config);
}
More information about the hornetq-commits
mailing list