December 2010 - hornetq-commits - Jboss List Archives

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2010-12-15 18:05:32 -0500 (Wed, 15 Dec 2010) New Revision: 10041 Modified: trunk/build-maven.xml Log: updating JDK 1.5 on maven Modified: trunk/build-maven.xml =================================================================== --- trunk/build-maven.xml 2010-12-15 15:39:37 UTC (rev 10040) +++ trunk/build-maven.xml 2010-12-15 23:05:32 UTC (rev 10041) @@ -13,7 +13,7 @@ --> <project default="upload" name="HornetQ"> - <property name="hornetq.version" value="2.2.0.QA-10035"/> + <property name="hornetq.version" value="2.2.0.QA-10041"/> <property name="build.dir" value="build"/> <property name="jars.dir" value="${build.dir}/jars"/> @@ -107,42 +107,55 @@ <target name="install"> <antcall target="upload-local-target"> <param name="artifact.id" value="hornetq-resources"/> + <param name="file-name" value="hornetq-resources"/> </antcall> <antcall target="upload-local-target"> - <param name="artifact.id" value="hornetq-jms"/> + <param name="artifact.id" value="hornetq-jms"/> + <param name="file-name" value="hornetq-jms"/> </antcall> + +  <antcall target="upload-local-target"> - <param name="artifact.id" value="hornetq-jms-client"/> + <param name="artifact.id" value="hornetq-jms-client"/> + <param name="file-name" value="hornetq-jms-client-java5"/> </antcall> <antcall target="upload-local-target"> - <param name="artifact.id" value="hornetq-core"/> + <param name="artifact.id" value="hornetq-core"/> + <param name="file-name" value="hornetq-core"/> </antcall> <antcall target="upload-local-target"> - <param name="artifact.id" value="hornetq-jboss-as-integration"/> + <param name="artifact.id" value="hornetq-jboss-as-integration"/> + <param name="file-name" value="hornetq-jboss-as-integration"/> </antcall> <antcall target="upload-local-target"> - <param name="artifact.id" value="hornetq-bootstrap"/> + <param name="artifact.id" value="hornetq-bootstrap"/> + <param name="file-name" value="hornetq-bootstrap"/> </antcall> +  <antcall target="upload-local-target"> <param name="artifact.id" value="hornetq-core-client"/> + <param name="file-name" value="hornetq-core-client-java5"/> </antcall> <antcall target="upload-local-target"> - <param name="artifact.id" value="hornetq-logging"/> + <param name="artifact.id" value="hornetq-logging"/> + <param name="file-name" value="hornetq-logging"/> </antcall> <antcall target="upload-local-target"> - <param name="artifact.id" value="hornetq-ra"/> + <param name="artifact.id" value="hornetq-ra"/> + <param name="file-name" value="hornetq-ra"/> </antcall> <antcall target="upload-local-target"> - <param name="artifact.id" value="hornetq-spring-integration"/> + <param name="artifact.id" value="hornetq-spring-integration"/> + <param name="file-name" value="hornetq-spring-integration"/> </antcall> </target> @@ -157,7 +170,7 @@ <arg value="-DartifactId=${artifact.id}"/> <arg value="-Dversion=${hornetq.version}"/> <arg value="-Dpackaging=jar"/> - <arg value="-Dfile=./jars/${artifact.id}.jar"/> + <arg value="-Dfile=./jars/${file-name}.jar"/> </exec>  <exec executable="mvn" dir="./build"> @@ -169,7 +182,7 @@ <arg value="-Dversion=${hornetq.version}"/> <arg value="-Dpackaging=jar"/> <arg value="-Dclassifier=sources"/> - <arg value="-Dfile=./jars/${artifact.id}-sources.jar"/> + <arg value="-Dfile=./jars/${file-name}-sources.jar"/> </exec> </target> @@ -208,42 +221,54 @@ <antcall target="deploy-jar"> <param name="artifact.id" value="hornetq-resources"/> + <param name="file-name" value="hornetq-resources"/> </antcall> <antcall target="deploy-jar"> <param name="artifact.id" value="hornetq-jms"/> + <param name="file-name" value="hornetq-jms"/> </antcall> +  <antcall target="deploy-jar"> <param name="artifact.id" value="hornetq-jms-client"/> + <param name="file-name" value="hornetq-jms-client-java5"/> </antcall> <antcall target="deploy-jar"> <param name="artifact.id" value="hornetq-core"/> + <param name="file-name" value="hornetq-core"/> </antcall> <antcall target="deploy-jar"> <param name="artifact.id" value="hornetq-jboss-as-integration"/> + <param name="file-name" value="hornetq-jboss-as-integration"/> </antcall> <antcall target="deploy-jar"> <param name="artifact.id" value="hornetq-bootstrap"/> + <param name="file-name" value="hornetq-bootstrap"/> </antcall> - + +  <antcall target="deploy-jar"> <param name="artifact.id" value="hornetq-core-client"/> + <param name="file-name" value="hornetq-core-client-java5"/> </antcall> <antcall target="deploy-jar"> <param name="artifact.id" value="hornetq-logging"/> + <param name="file-name" value="hornetq-logging"/> </antcall> <antcall target="deploy-jar"> <param name="artifact.id" value="hornetq-ra"/> + <param name="file-name" value="hornetq-ra"/> </antcall> <antcall target="deploy-jar"> <param name="artifact.id" value="hornetq-spring-integration"/> + <param name="file-name" value="hornetq-spring-integration"/> </antcall> </target> @@ -266,7 +291,7 @@ <arg value="-DartifactId=${artifact.id}"/> <arg value="-Dversion=${hornetq.version}"/> <arg value="-Dpackaging=jar"/> - <arg value="-Dfile=./build/jars/${artifact.id}.jar"/> + <arg value="-Dfile=./build/jars/${file-name}.jar"/> <arg value="-DrepositoryId=jboss-releases-repository"/> <arg value="-Durl=https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/"/> </exec> @@ -280,7 +305,7 @@ <arg value="-Dversion=${hornetq.version}"/> <arg value="-Dpackaging=jar"/> <arg value="-Dclassifier=sources"/> - <arg value="-Dfile=./build/jars/${artifact.id}-sources.jar"/> + <arg value="-Dfile=./build/jars/${file-name}-sources.jar"/> <arg value="-DrepositoryId=jboss-releases-repository"/> <arg value="-Durl=https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/"/> </exec>

15 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r10040 - in trunk/src: main/org/hornetq/jms/server/config and 2 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-12-15 10:39:37 -0500 (Wed, 15 Dec 2010) New Revision: 10040 Modified: trunk/src/config/common/schema/hornetq-jms.xsd 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/impl/JMSServerConfigParserImpl.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java Log: added jmx-domain to jms config Modified: trunk/src/config/common/schema/hornetq-jms.xsd =================================================================== --- trunk/src/config/common/schema/hornetq-jms.xsd 2010-12-13 23:18:50 UTC (rev 10039) +++ trunk/src/config/common/schema/hornetq-jms.xsd 2010-12-15 15:39:37 UTC (rev 10040) @@ -10,6 +10,7 @@ <xsd:element name="configuration"> <xsd:complexType> <xsd:sequence> + <xsd:element ref="jmx-domain" minOccurs="0" maxOccurs="1"/> <xsd:element ref="connection-factory" maxOccurs="unbounded" minOccurs="0"> </xsd:element> @@ -23,6 +24,8 @@ </xsd:complexType> </xsd:element> + <xsd:element name="jmx-domain" type="xsd:string"/> + <xsd:element name="connection-factory"> <xsd:complexType> <xsd:all> Modified: trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java 2010-12-13 23:18:50 UTC (rev 10039) +++ trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java 2010-12-15 15:39:37 UTC (rev 10040) @@ -35,4 +35,6 @@ List<TopicConfiguration> getTopicConfigurations(); List<ConnectionFactoryConfiguration> getConnectionFactoryConfigurations(); + + String getDomain(); } Modified: trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2010-12-13 23:18:50 UTC (rev 10039) +++ trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2010-12-15 15:39:37 UTC (rev 10040) @@ -18,6 +18,7 @@ import javax.naming.Context; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; import org.hornetq.jms.server.config.JMSConfiguration; import org.hornetq.jms.server.config.JMSQueueConfiguration; @@ -40,6 +41,8 @@ private final List<TopicConfiguration> topicConfigurations = new ArrayList<TopicConfiguration>(); + private final String domain; + private Context context = null; // Constants ----------------------------------------------------- @@ -52,15 +55,18 @@ public JMSConfigurationImpl() { + domain = null; } public JMSConfigurationImpl(final List<ConnectionFactoryConfiguration> connectionFactoryConfigurations, final List<JMSQueueConfiguration> queueConfigurations, - final List<TopicConfiguration> topicConfigurations) + final List<TopicConfiguration> topicConfigurations, + final String domain) { this.connectionFactoryConfigurations.addAll(connectionFactoryConfigurations); this.queueConfigurations.addAll(queueConfigurations); this.topicConfigurations.addAll(topicConfigurations); + this.domain = domain; } // JMSConfiguration implementation ------------------------------- @@ -90,6 +96,11 @@ this.context = context; } + public String getDomain() + { + return domain; + } + // Public -------------------------------------------------------- // Package protected --------------------------------------------- Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-12-13 23:18:50 UTC (rev 10039) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-12-15 15:39:37 UTC (rev 10040) @@ -25,6 +25,7 @@ import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.config.impl.Validators; import org.hornetq.core.logging.Logger; import org.hornetq.jms.server.JMSServerConfigParser; @@ -90,6 +91,7 @@ ArrayList<JMSQueueConfiguration> queues = new ArrayList<JMSQueueConfiguration>(); ArrayList<TopicConfiguration> topics = new ArrayList<TopicConfiguration>(); ArrayList<ConnectionFactoryConfiguration> cfs = new ArrayList<ConnectionFactoryConfiguration>(); + String domain = ConfigurationImpl.DEFAULT_JMX_DOMAIN; Element e = (Element)rootnode; @@ -97,7 +99,7 @@ String elements[] = new String[] { JMSServerDeployer.QUEUE_NODE_NAME, JMSServerDeployer.TOPIC_NODE_NAME, - JMSServerDeployer.CONNECTION_FACTORY_NODE_NAME }; + JMSServerDeployer.CONNECTION_FACTORY_NODE_NAME}; for (String element : elements) { NodeList children = e.getElementsByTagName(element); @@ -126,8 +128,11 @@ } } - JMSConfiguration value = newConfig(queues, topics, cfs); + domain = XMLConfigurationUtil.getString(e, JMSServerDeployer.JMX_DOMAIN_NAME, ConfigurationImpl.DEFAULT_JMX_DOMAIN, Validators.NO_CHECK); + + JMSConfiguration value = newConfig(queues, topics, cfs, domain); + return value; } @@ -521,13 +526,14 @@ * @param queues * @param topics * @param cfs + * @param domain * @return */ protected JMSConfiguration newConfig(final ArrayList<JMSQueueConfiguration> queues, final ArrayList<TopicConfiguration> topics, - final ArrayList<ConnectionFactoryConfiguration> cfs) + final ArrayList<ConnectionFactoryConfiguration> cfs, String domain) { - JMSConfiguration value = new JMSConfigurationImpl(cfs, queues, topics); + JMSConfiguration value = new JMSConfigurationImpl(cfs, queues, topics, domain); return value; } Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-12-13 23:18:50 UTC (rev 10039) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-12-15 15:39:37 UTC (rev 10040) @@ -54,6 +54,8 @@ protected static final String TOPIC_NODE_NAME = "topic"; + protected static final String JMX_DOMAIN_NAME = "jmx-domain"; + protected static final boolean DEFAULT_QUEUE_DURABILITY = true; public JMSServerDeployer(final JMSServerManager jmsServerManager,

15 years, 5 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2010-12-13 18:18:50 -0500 (Mon, 13 Dec 2010) New Revision: 10039 Modified: trunk/native/src/AsyncFile.cpp Log: RHEL6 would complain about this include. Adding it to fix compilations on RHEL6 Modified: trunk/native/src/AsyncFile.cpp =================================================================== --- trunk/native/src/AsyncFile.cpp 2010-12-13 18:10:21 UTC (rev 10038) +++ trunk/native/src/AsyncFile.cpp 2010-12-13 23:18:50 UTC (rev 10039) @@ -24,6 +24,7 @@ #include <errno.h> #include <libaio.h> #include <fcntl.h> +#include <sys/stat.h> #include "AsyncFile.h" #include "AIOController.h" #include "AIOException.h"

15 years, 5 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

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

15 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r10037 - in trunk: tests/src/org/hornetq/tests/integration/http and 1 other directory.

by do-not-reply＠jboss.org

Author: gaohoward Date: 2010-12-13 08:03:21 -0500 (Mon, 13 Dec 2010) New Revision: 10037 Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java Log: https://issues.jboss.org/browse/JBPAPP-5542 Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java 2010-12-11 10:45:00 UTC (rev 10036) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java 2010-12-13 13:03:21 UTC (rev 10037) @@ -347,6 +347,8 @@ if (httpEnabled) { handlers.put("http-decoder", new HttpRequestDecoder()); + + handlers.put("http-aggregator", new HttpChunkAggregator(Integer.MAX_VALUE)); handlers.put("http-encoder", new HttpResponseEncoder()); Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java 2010-12-11 10:45:00 UTC (rev 10036) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java 2010-12-13 13:03:21 UTC (rev 10037) @@ -66,6 +66,7 @@ import org.jboss.netty.handler.codec.http.CookieDecoder; import org.jboss.netty.handler.codec.http.CookieEncoder; import org.jboss.netty.handler.codec.http.DefaultHttpRequest; +import org.jboss.netty.handler.codec.http.HttpChunkAggregator; import org.jboss.netty.handler.codec.http.HttpHeaders; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpRequest; @@ -354,6 +355,8 @@ handlers.add(new HttpRequestEncoder()); handlers.add(new HttpResponseDecoder()); + + handlers.add(new HttpChunkAggregator(Integer.MAX_VALUE)); handlers.add(new HttpHandler()); } Modified: trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-12-11 10:45:00 UTC (rev 10036) +++ trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-12-13 13:03:21 UTC (rev 10037) @@ -13,6 +13,7 @@ package org.hornetq.tests.integration.http; import java.util.HashMap; +import java.util.Random; import junit.framework.Assert; @@ -127,4 +128,80 @@ server.stop(); } + + //https://issues.jboss.org/browse/JBPAPP-5542 + public void testCoreHttpClient8kPlus() throws Exception + { + final SimpleString QUEUE = new SimpleString("CoreClientOverHttpTestQueue"); + + Configuration conf = new ConfigurationImpl(); + + conf.setSecurityEnabled(false); + + HashMap<String, Object> params = new HashMap<String, Object>(); + params.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true); + conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName(), params)); + + HornetQServer server = HornetQServers.newHornetQServer(conf, false); + + server.start(); + + ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName(), params)); + ClientSessionFactory sf = locator.createSessionFactory(); + + ClientSession session = sf.createSession(false, true, true); + + session.createQueue(QUEUE, QUEUE, null, false); + + ClientProducer producer = session.createProducer(QUEUE); + + final int numMessages = 100; + + String[] content = new String[numMessages]; + + for (int i = 0; i < numMessages; i++) + { + ClientMessage message = session.createMessage(HornetQTextMessage.TYPE, + false, + 0, + System.currentTimeMillis(), + (byte)1); + content[i] = this.getFixedSizeString(i*1024*8); + message.getBodyBuffer().writeString(content[i]); + producer.send(message); + } + + ClientConsumer consumer = session.createConsumer(QUEUE); + + session.start(); + + for (int i = 0; i < numMessages; i++) + { + ClientMessage message2 = consumer.receive(); + + Assert.assertEquals(content[i], message2.getBodyBuffer().readString()); + + message2.acknowledge(); + } + + session.close(); + + locator.close(); + + server.stop(); + } + + private String getFixedSizeString(int size) + { + StringBuffer sb = new StringBuffer(); + Random r = new Random(); + for (int i = 0; i < size; i++) + { + char chr = (char)r.nextInt(256); + sb.append(chr); + } + String result = sb.toString(); + return result; + } + }

15 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r10036 - trunk/docs/user-manual/en.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-12-11 05:45:00 -0500 (Sat, 11 Dec 2010) New Revision: 10036 Modified: trunk/docs/user-manual/en/clusters.xml Log: updates to HA chapter in docs Modified: trunk/docs/user-manual/en/clusters.xml =================================================================== --- trunk/docs/user-manual/en/clusters.xml 2010-12-10 23:23:05 UTC (rev 10035) +++ trunk/docs/user-manual/en/clusters.xml 2010-12-11 10:45:00 UTC (rev 10036) @@ -310,9 +310,73 @@ there connection details will be propagated via the server it connects to</para> <section> <title>Configuring a Cluster Connection</title> + <para>For cluster connections there is no extra configuration needed, you just need to make sure that any + connectors are defined in the usual manner, (see <xref linkend="configuring-transports"/> for more + information on connectors). These are then referenced by the cluster connection configuration.</para> </section> <section> <title>Configuring a Client Connection</title> + <para>A static list of possible servers can also be used by a normal client.</para> + <section> + <title>Configuring client discovery using JMS</title> + <para>If you're using JMS and you're also using the JMS Service on the server to + load your JMS connection factory instances into JNDI, then you can specify which + connectors to use for your JMS connection factory in the server side xml + configuration <literal>hornetq-jms.xml</literal>. Let's take a look at an + example:</para> + <programlisting> + <connection-factory name="ConnectionFactory"> + <connectors> + <connector-ref connector-name="netty-connector"/> + <connector-ref connector-name="netty-connector2"/> + <connector-ref connector-name="netty-connector3"/> + </connectors> + <entries> + <entry name="ConnectionFactory"/> + </entries> + </connection-factory></programlisting> + <para> + The element <literal>connectors</literal> contains a list of pre defined connectors in the + <literal>hornetq-configuration.xml</literal> file. When this connection factory is downloaded + from JNDI by a client application and JMS connections are created from it, those connections will + be load-balanced across the list of servers defined by these connectors. + </para> + <para> + If you're using JMS, but you're not using JNDI to lookup a connection factory - you're instantiating + the JMS connection factory directly then you can specify the connector list directly when creating + the JMS connection factory. Here's an example: + </para> + <programlisting> + HashMap<String, Object> map = new HashMap<String, Object>(); + map.put("host", "myhost"); + map.put("port", "5445"); + TransportConfiguration server1 = new TransportConfiguration(NettyConnectorFactory.class.getName(), map); + HashMap<String, Object> map2 = new HashMap<String, Object>(); + map2.put("host", "myhost2"); + map2.put("port", "5446"); + TransportConfiguration server2 = new TransportConfiguration(NettyConnectorFactory.class.getName(), map2); + + HornetQConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, server1, server2); + </programlisting> + </section> + <section> + <title>Configuring client discovery using JMS</title> + <para>If you are using the core API then the same can be done as follows:</para> + <programlisting> + HashMap<String, Object> map = new HashMap<String, Object>(); + map.put("host", "myhost"); + map.put("port", "5445"); + TransportConfiguration server1 = new TransportConfiguration(NettyConnectorFactory.class.getName(), map); + HashMap<String, Object> map2 = new HashMap<String, Object>(); + map2.put("host", "myhost2"); + map2.put("port", "5446"); + TransportConfiguration server2 = new TransportConfiguration(NettyConnectorFactory.class.getName(), map2); + + ServerLocator locator = HornetQClient.createServerLocatorWithHA(server1, server2); + ClientSessionFactory factory = locator.createSessionFactory(); + ClientSession session = factory.createSession(); + </programlisting> + </section> </section> </section> </section> @@ -452,6 +516,29 @@ that this cluster connection will make connections to.</para> </listitem> </itemizedlist> + <para> + Alternatively if you would like your cluster connections to use a static list of + servers for discovery then you can do it like this. + </para> + <programlisting> + <cluster-connection name="my-cluster"> + <address>jms</address> + <connector-ref>netty-connector</connector-ref> + <retry-interval>500</retry-interval> + <use-duplicate-detection>true</use-duplicate-detection> + <forward-when-no-consumers>true</forward-when-no-consumers> + <max-hops>1</max-hops> + <static-connectors> + <connector-ref>server0-connector</connector-ref> + <connector-ref>server1-connector</connector-ref> + </static-connectors> + </cluster-connection> + </programlisting> + <para> + Here we have defined 2 servers that we know for sure will that at least one will be available. There may + be many more servers in the cluster but these will; be discovered via one of these connectors once an + initial connection has been made. + </para> </section> <section id="clusters.clusteruser"> <title>Cluster User Credentials</title> @@ -538,138 +625,30 @@ </section> <section> <title>Specifying Members of a Cluster Explicitly</title> - <para>Sometimes UDP is not enabled on a network so it's not possible to use UDP server - discovery for clients to discover the list of servers in the cluster, or for servers to - discover what other servers are in the cluster.</para> - <para>In this case, the list of servers in the cluster can be specified explicitly on each - node and on the client side. Let's look at how we do this:</para> - <section> - <title>Specify List of Servers on the Client Side</title> - <para>This differs depending on whether you're using JMS or the Core API</para> - <section> - <title>Specifying List of Servers using JMS</title> - <para>If you're using JMS, and you're using the JMS Service to load your JMS - connection factory instances directly into JNDI on the server, then you can - specify the list of servers in the server side configuration file <literal - >hornetq-jms.xml</literal>. Let's take a look at an example:</para> - <programlisting><connection-factory name="ConnectionFactory"> - <connectors> - <connector-ref connector-name="my-connector1" - backup-connector-name="my-backup-connector1"/> - <connector-ref connector-name="my-connector2" - backup-connector-name="my-backup-connector2"/> - <connector-ref connector-name="my-connector3" - backup-connector-name="my-backup-connector3"/> - </connectors> - <entries> - <entry name="ConnectionFactory"/> - </entries> -</connection-factory></programlisting> - <para>The <literal>connection-factory</literal> element can contain zero or more - <literal>connector-ref</literal> elements, each one of which specifies a - <literal>connector-name</literal> attribute and an optional <literal - >backup-connector-name</literal> attribute. The <literal - >connector-name</literal> attribute references a connector defined in - <literal>hornetq-configuration.xml</literal> which will be used as a live - connector. The <literal>backup-connector-name</literal> is optional, and if - specified it also references a connector defined in <literal - >hornetq-configuration.xml</literal>. For more information on connectors - please see <xref linkend="configuring-transports"/>.</para> - <para>The connection factory thus maintains a list of [connector, backup connector] - pairs, these pairs are then used by the client connection load balancing policy - on the client side when creating connections to the cluster.</para> - <para>If you're using JMS but you're not using JNDI then you can also specify the - list of [connector, backup connector] pairs directly when instantiating the - <literal>HornetQConnectionFactory</literal>, here's an - example:<programlisting>List<Pair<TransportConfiguration, TransportConfiguration>> serverList = - new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); - -serverList.add(new Pair<TransportConfiguration, - TransportConfiguration>(liveTC0, backupTC0)); -serverList.add(new Pair<TransportConfiguration, - TransportConfiguration>(liveTC1, backupTC1)); -serverList.add(new Pair<TransportConfiguration, - TransportConfiguration>(liveTC2, backupTC2)); - -ConnectionFactory jmsConnectionFactory = HornetQJMSClient.createConnectionFactory(serverList); - -Connection jmsConnection1 = jmsConnectionFactory.createConnection(); - -Connection jmsConnection2 = jmsConnectionFactory.createConnection();</programlisting></para> - <para>In the above snippet we create a list of pairs of <literal - >TransportConfiguration</literal> objects. Each <literal - >TransportConfiguration</literal> object contains knowledge of how to make a - connection to a specific server.</para> - <para>A <literal>HornetQConnectionFactory</literal> instance is then created passing - the list of servers in the constructor. Any connections subsequently created by - this factory will create connections according to the client connection load - balancing policy applied to that list of servers.</para> - </section> - <section> - <title>Specifying List of Servers using the Core API</title> - <para>If you're using the core API you can also specify the list of servers directly - when creating the <literal>ClientSessionFactory</literal> instance. Here's an - example:</para> - <programlisting>List<Pair<TransportConfiguration, TransportConfiguration>> serverList = - new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); - -serverList.add(new Pair<TransportConfiguration, - TransportConfiguration>(liveTC0, backupTC0)); -serverList.add(new Pair<TransportConfiguration, - TransportConfiguration>(liveTC1, backupTC1)); -serverList.add(new Pair<TransportConfiguration, - TransportConfiguration>(liveTC2, backupTC2)); - -ClientSessionFactory factory = HornetQClient.createClientSessionFactory(serverList); - -ClientSession sesison1 = factory.createClientSession(...); - -ClientSession session2 = factory.createClientSession(...);</programlisting> - <para>In the above snippet we create a list of pairs of <literal - >TransportConfiguration</literal> objects. Each <literal - >TransportConfiguration</literal> object contains knowledge of how to make a - connection to a specific server. For more information on this, please see <xref - linkend="configuring-transports"/>.</para> - <para>A <literal>ClientSessionFactoryImpl</literal> instance is then created passing - the list of servers in the constructor. Any sessions subsequently created by - this factory will create sessions according to the client connection load - balancing policy applied to that list of servers.</para> - </section> - </section> - <section id="clusters.static.servers"> - <title>Specifying List of Servers to form a Cluster</title> - <para>Let's take a look at an example where each cluster connection is defined for a - symmetric cluster, but we're not using discovery for each node to discover its - neighbours, instead we'll configure each cluster connection to have explicit - knowledge of all the other nodes in the cluster.</para> - <para>Here's an example cluster connection definition showing that:</para> - <programlisting><cluster-connections> - <cluster-connection name="my-explicit-cluster"> - <address>jms</address> - <connector-ref connector-name="my-connector1" - backup-connector-name="my-backup-connector1"/> - <connector-ref connector-name="my-connector2" - backup-connector-name="my-backup-connector2"/> - <connector-ref connector-name="my-connector3" - backup-connector-name="my-backup-connector3"/> - </cluster-connection> -</cluster-connections></programlisting> - <para>The <literal>cluster-connection</literal> element can contain zero or more - <literal>connector-ref</literal> elements, each one of which specifies a - <literal>connector-name</literal> attribute and an optional <literal - >backup-connector-name</literal> attribute. The <literal - >connector-name</literal> attribute references a connector defined in <literal - >hornetq-configuration.xml</literal> which will be used as a live connector. The - <literal>backup-connector-name</literal> is optional, and if specified it also - references a connector defined in <literal>hornetq-configuration.xml</literal>. For - more information on connectors please see <xref linkend="configuring-transports" - />.</para> - <note> - <para>Due to a limitation in HornetQ 2.0.0, failover is not supported for clusters - defined using a static set of nodes. To support failover over cluster nodes, - they must be configured to use a discovery group.</para> - </note> - </section> + <para> + Sometimes you want to explicitly define a cluster more explicitly, that is control which + server connect to each other in the cluster. This is typically used to form non symmetrical clusters + such as chain cluster or ring clusters. This can only be done using a static list of connectors and is + configured as follows: + </para> + <programlisting> + <cluster-connection name="my-cluster"> + <address>jms</address> + <connector-ref>netty-connector</connector-ref> + <retry-interval>500</retry-interval> + <use-duplicate-detection>true</use-duplicate-detection> + <forward-when-no-consumers>true</forward-when-no-consumers> + <max-hops>1</max-hops> + <static-connectors allow-direct-connections-only="true"> + <connector-ref>server1-connector</connector-ref> + </static-connectors> + </cluster-connection> + </programlisting> + <para> + In this example we have set the attribute <literal>allow-direct-connections-only</literal> which means that + the only server that this server can create a cluster connection to is server1-connector. This means you can + explicitly create any cluster topology you want. + </para> </section> <section id="clusters.message-redistribution"> <title>Message Redistribution</title>

15 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r10035 - trunk.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2010-12-10 18:23:05 -0500 (Fri, 10 Dec 2010) New Revision: 10035 Modified: trunk/build-maven.xml Log: update qa build Modified: trunk/build-maven.xml =================================================================== --- trunk/build-maven.xml 2010-12-10 19:55:47 UTC (rev 10034) +++ trunk/build-maven.xml 2010-12-10 23:23:05 UTC (rev 10035) @@ -13,7 +13,7 @@ --> <project default="upload" name="HornetQ"> - <property name="hornetq.version" value="2.2.0.QA4"/> + <property name="hornetq.version" value="2.2.0.QA-10035"/> <property name="build.dir" value="build"/> <property name="jars.dir" value="${build.dir}/jars"/>

15 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r10034 - in trunk: src/main/org/hornetq/api/core/management and 2 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-12-10 14:55:47 -0500 (Fri, 10 Dec 2010) New Revision: 10034 Modified: trunk/build-hornetq.xml trunk/build.xml trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java Log: fixed server control and test Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2010-12-10 16:43:24 UTC (rev 10033) +++ trunk/build-hornetq.xml 2010-12-10 19:55:47 UTC (rev 10034) @@ -1654,6 +1654,19 @@ </antcall> </target> + <target name="management-tests" depends="jar, compile-unit-tests"> + <antcall inheritall="true" inheritrefs="true" target="tests"> + <param name="tests.param" value="**/org/hornetq/tests/integration/management/**/*${test-mask}.class"/> + </antcall> + </target> + + + <target name="jms-management-tests" depends="jar, compile-unit-tests"> + <antcall inheritall="true" inheritrefs="true" target="tests"> + <param name="tests.param" value="**/org/hornetq/tests/integration/jms/server/management/**/*${test-mask}.class"/> + </antcall> + </target> + <target name="spring-tests" depends="jar, compile-unit-tests"> <antcall inheritall="true" inheritrefs="true" target="tests"> <param name="tests.param" value="**/org/hornetq/tests/integration/spring/*${test-mask}.class"/> @@ -1743,7 +1756,7 @@  <exclude name="**/cluster/failover/*ClusterWithBackupFailoverTestBase.class"/> - + <exclude name="**/cluster/**/*/class"/> <exclude name="**/cluster/failover/*DiscoveryClusterWithBackupFailoverTest.class"/> <exclude name="**/cluster/failover/*GroupingFailoverReplicationTest.class"/> <exclude name="**/cluster/failover/*Replicated*.class"/> Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2010-12-10 16:43:24 UTC (rev 10033) +++ trunk/build.xml 2010-12-10 19:55:47 UTC (rev 10034) @@ -250,7 +250,16 @@ <ant antfile="build-hornetq.xml" target="compile-reports"/> </target> + <target name="management-tests" depends="createthirdparty"> + <ant antfile="build-hornetq.xml" target="management-tests"/> + <ant antfile="build-hornetq.xml" target="compile-reports"/> + </target> + <target name="jms-management-tests" depends="createthirdparty"> + <ant antfile="build-hornetq.xml" target="jms-management-tests"/> + <ant antfile="build-hornetq.xml" target="compile-reports"/> + </target> + <target name="cluster-tests" depends="createthirdparty"> <ant antfile="build-hornetq.xml" target="cluster-tests"/> <ant antfile="build-hornetq.xml" target="compile-reports"/> Modified: trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-12-10 16:43:24 UTC (rev 10033) +++ trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-12-10 19:55:47 UTC (rev 10034) @@ -553,7 +553,7 @@ String[] getBridgeNames(); - @Operation(desc= "Create a Bridge using a pair of connectors", impact = MBeanOperationInfo.ACTION) + @Operation(desc= "Create a Bridge", impact = MBeanOperationInfo.ACTION) void createBridge(@Parameter(name="name", desc="Name of the bridge") String name, @Parameter(name="queueName", desc="Name of the source queue") String queueName, @Parameter(name="forwardingAddress", desc="Forwarding address") String forwardingAddress, @@ -565,27 +565,12 @@ @Parameter(name="useDuplicateDetection", desc="Use duplicate detection") boolean useDuplicateDetection, @Parameter(name="confirmationWindowSize", desc="Confirmation window size") int confirmationWindowSize, @Parameter(name="clientFailureCheckPeriod", desc="Period to check client failure") long clientFailureCheckPeriod, - @Parameter(name="liveConnector", desc="Name of the connector to the live server") List<String> staticConnectors, + @Parameter(name="staticConnectorNames", desc="comma separated list of connector names or name of discovery group if 'useDiscoveryGroup' is set to true") String connectorNames, + @Parameter(name="useDiscoveryGroup", desc="use discovery group")boolean useDiscoveryGroup, @Parameter(name="ha", desc="Is it using HA") boolean ha, @Parameter(name="user", desc="User name") String user, @Parameter(name="password", desc="User password") String password) throws Exception; - @Operation(desc= "Create a Bridge using a discovery group", impact = MBeanOperationInfo.ACTION) - void createBridge(@Parameter(name="name", desc="Name of the bridge") String name, - @Parameter(name="queueName", desc="Name of the source queue") String queueName, - @Parameter(name="forwardingAddress", desc="Forwarding address") String forwardingAddress, - @Parameter(name="filterString", desc="Filter of the brdige") String filterString, - @Parameter(name="transformerClassName", desc="Class name of the bridge transformer") String transformerClassName, - @Parameter(name="retryInterval", desc="Connection retry interval") long retryInterval, - @Parameter(name="retryIntervalMultiplier", desc="Connection retry interval multiplier") double retryIntervalMultiplier, - @Parameter(name="reconnectAttempts", desc="Number of reconnection attempts") int reconnectAttempts, - @Parameter(name="useDuplicateDetection", desc="Use duplicate detection") boolean useDuplicateDetection, - @Parameter(name="confirmationWindowSize", desc="Confirmation window size") int confirmationWindowSize, - @Parameter(name="clientFailureCheckPeriod", desc="Period to check client failure") long clientFailureCheckPeriod, - @Parameter(name="name", desc="Name of the discovery group") String discoveryGroupName, - @Parameter(name="ha", desc="Is it using HA") boolean ha, - @Parameter(name="user", desc="User name") String user, - @Parameter(name="password", desc="User password") String password) throws Exception; @Operation(desc= "Destroy a bridge", impact = MBeanOperationInfo.ACTION) void destroyBridge(@Parameter(name="name", desc="Name of the bridge") String name) throws Exception; Modified: trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-12-10 16:43:24 UTC (rev 10033) +++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-12-10 19:55:47 UTC (rev 10034) @@ -1623,7 +1623,8 @@ final boolean useDuplicateDetection, final int confirmationWindowSize, final long clientFailureCheckPeriod, - final List<String> staticConnectors, + final String connectorNames, + boolean useDiscoveryGroup, final boolean ha, final String user, final String password) throws Exception @@ -1631,67 +1632,48 @@ checkStarted(); clearIO(); - try - { - BridgeConfiguration config = new BridgeConfiguration(name, - queueName, - forwardingAddress, - filterString, - transformerClassName, - retryInterval, - retryIntervalMultiplier, - reconnectAttempts, - useDuplicateDetection, - confirmationWindowSize, - clientFailureCheckPeriod, - staticConnectors, - ha, - user, - password); - server.deployBridge(config); - } - finally - { - blockOnIO(); - } - } - public void createBridge(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 useDuplicateDetection, - final int confirmationWindowSize, - final long clientFailureCheckPeriod, - final String discoveryGroupName, - final boolean ha, - final String user, - final String password) throws Exception - { - checkStarted(); - clearIO(); try { - BridgeConfiguration config = new BridgeConfiguration(name, - queueName, - forwardingAddress, - filterString, - transformerClassName, - retryInterval, - retryIntervalMultiplier, - reconnectAttempts, - useDuplicateDetection, - confirmationWindowSize, - clientFailureCheckPeriod, - discoveryGroupName, - ha, - user, - password); + BridgeConfiguration config = null; + if (useDiscoveryGroup) + { + config = new BridgeConfiguration(name, + queueName, + forwardingAddress, + filterString, + transformerClassName, + retryInterval, + retryIntervalMultiplier, + reconnectAttempts, + useDuplicateDetection, + confirmationWindowSize, + clientFailureCheckPeriod, + connectorNames, + ha, + user, + password); + } + else + { + List<String> connectors = toList(connectorNames); + config = new BridgeConfiguration(name, + queueName, + forwardingAddress, + filterString, + transformerClassName, + retryInterval, + retryIntervalMultiplier, + reconnectAttempts, + useDuplicateDetection, + confirmationWindowSize, + clientFailureCheckPeriod, + connectors, + ha, + user, + password); + } server.deployBridge(config); } finally @@ -1700,6 +1682,7 @@ } } + public void destroyBridge(final String name) throws Exception { checkStarted(); @@ -1908,4 +1891,19 @@ return new String[0]; } + private static List<String> toList(final String commaSeparatedString) + { + List<String> list = new ArrayList<String>(); + if (commaSeparatedString == null || commaSeparatedString.trim().length() == 0) + { + return list; + } + String[] values = commaSeparatedString.split(","); + for (int i = 0; i < values.length; i++) + { + list.add(values[i].trim()); + } + return list; + } + } Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-12-10 16:43:24 UTC (rev 10033) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-12-10 19:55:47 UTC (rev 10034) @@ -614,9 +614,6 @@ session.createQueue(sourceAddress, sourceQueue); session.createQueue(targetAddress, targetQueue); - - List<String> listName = new ArrayList<String>(); - listName.add(connectorConfig.getName()); serverControl.createBridge(name, sourceQueue, @@ -629,8 +626,9 @@ false, // duplicateDetection 1, // confirmationWindowSize HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - listName, // liveConnector + connectorConfig.getName(), // liveConnector false, + false, null, null); Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-12-10 16:43:24 UTC (rev 10033) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-12-10 19:55:47 UTC (rev 10034) @@ -593,7 +593,8 @@ boolean useDuplicateDetection, int confirmationWindowSize, long clientFailureCheckPeriod, - List<String> staticConnectors, + String connectorNames, + boolean useDiscovery, boolean ha, String user, String password) throws Exception @@ -610,7 +611,8 @@ useDuplicateDetection, confirmationWindowSize, clientFailureCheckPeriod, - staticConnectors, + connectorNames, + useDiscovery, ha, user, password);

15 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r10033 - trunk/src/main/org/hornetq/core/remoting/impl/netty.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2010-12-10 11:43:24 -0500 (Fri, 10 Dec 2010) New Revision: 10033 Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java Log: QA was doing some tests with IPV6, and this would cope better with IPV6 URL scheme as new URI.toString() should do the proper URL spec on IPV6 Modified: trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java 2010-12-10 15:21:37 UTC (rev 10032) +++ trunk/src/main/org/hornetq/core/remoting/impl/netty/NettyConnector.java 2010-12-10 16:43:24 UTC (rev 10033) @@ -517,7 +517,7 @@ private HttpIdleTimer task; - private final String url = "http://" + host + ":" + port + servletPath; + private final String url; private final Future handShakeFuture = new Future(); @@ -530,6 +530,11 @@ private String cookie; private final CookieEncoder cookieEncoder = new CookieEncoder(false); + + public HttpHandler() throws Exception + { + url = new URI("http", null, host, port, servletPath, null, null).toString(); + } @Override public void channelConnected(final ChannelHandlerContext ctx, final ChannelStateEvent e) throws Exception

15 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r10032 - trunk/tests/src/org/hornetq/tests/integration/persistence.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-12-10 10:21:37 -0500 (Fri, 10 Dec 2010) New Revision: 10032 Modified: trunk/tests/src/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java Log: fixed test Modified: trunk/tests/src/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java 2010-12-10 14:56:36 UTC (rev 10031) +++ trunk/tests/src/org/hornetq/tests/integration/persistence/JMSConnectionFactoryConfigurationStorageTest.java 2010-12-10 15:21:37 UTC (rev 10032) @@ -93,12 +93,14 @@ PersistedConnectionFactory cf1 = cfs.get(0); - assertEquals(5, cf1.getConfig().getConnectorNames().size()); + assertEquals(10, cf1.getConfig().getConnectorNames().size()); - int i = 0 ; List<String> configs = cf1.getConfig().getConnectorNames(); - assertEquals(configs.get(0), "c1-" + i); - assertEquals(configs.get(1), "c2-" + i); + for (int i = 0, j = 0; i < 10; i+=2, j++) + { + assertEquals(configs.get(i), "c1-" + j); + assertEquals(configs.get(i+1), "c2-" + j); + } } public void testSizeOfCF() throws Exception

15 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits December 2010