[hornetq-commits] JBoss hornetq SVN: r8977 - in trunk: src/main/org/hornetq/jms/server and 8 other directories.

Author: ataylor Date: 2010-03-27 06:12:28 -0400 (Sat, 27 Mar 2010) New Revision: 8977 Modified: 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/impl/ConnectionFactoryConfigurationImpl.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/AcknowledgementTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionFactoryTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/SecurityTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/Server.java trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.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/divert/DivertAndACKClientTest.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java Log: updated createconnectionfactory methods to take String ... bindings Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -60,12 +60,12 @@ // Static -------------------------------------------------------- - private static List<String> convert(final Object[] jndiBindings) + private static String[] convert(final Object[] jndiBindings) { - List<String> bindings = new ArrayList<String>(); - for (Object object : jndiBindings) + String[] bindings = new String[jndiBindings.length]; + for (int i = 0, jndiBindingsLength = jndiBindings.length; i < jndiBindingsLength; i++) { - bindings.add(object.toString().trim()); + bindings[i] = jndiBindings[i].toString().trim(); } return bindings; } @@ -159,10 +159,9 @@ try { - List<String> jndiBindingsList = JMSServerControlImpl.convert(jndiBindings); TransportConfiguration liveTC = new TransportConfiguration(liveTransportClassName, liveTransportParams); - server.createConnectionFactory(name, liveTC, jndiBindingsList); + server.createConnectionFactory(name, liveTC, JMSServerControlImpl.convert(jndiBindings)); sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name); } @@ -189,10 +188,8 @@ liveConnectorTransportParams, backupConnectorsTransportClassNames, backupConnectorTransportParams); - List<String> jndiBindingsList = JMSServerControlImpl.convert(jndiBindings); + server.createConnectionFactory(name, pairs, JMSServerControlImpl.convert(jndiBindings)); - server.createConnectionFactory(name, pairs, jndiBindingsList); - sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name); } finally @@ -240,10 +237,8 @@ try { - List<String> jndiBindingsList = JMSServerControlImpl.convert(jndiBindings); + server.createConnectionFactory(name, discoveryAddress, discoveryPort, JMSServerControlImpl.convert(jndiBindings)); - server.createConnectionFactory(name, discoveryAddress, discoveryPort, jndiBindingsList); - sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name); } finally Modified: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -60,6 +60,8 @@ boolean addQueueToJndi(final String queueName, final String jndiBinding) throws Exception; + boolean addConnectionFactoryToJNDI(final String name, final String jndiBinding) throws Exception; + /** * Creates a JMS Topic * @@ -122,6 +124,10 @@ */ boolean removeQueueFromJNDI(String name) throws Exception; + boolean removeConnectionFactoryFromJNDI(String name, String jndi) throws Exception; + + boolean removeConnectionFactoryFromJNDI(String name) throws Exception; + /** * destroys a queue and removes it from JNDI * @@ -150,37 +156,37 @@ */ boolean destroyTopic(String name) throws Exception; - void createConnectionFactory(String name, String discoveryAddress, int discoveryPort, List<String> jndiBindings) throws Exception; + void createConnectionFactory(String name, String discoveryAddress, int discoveryPort, String ... jndiBindings) throws Exception; void createConnectionFactory(String name, List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, - List<String> jndiBindings) throws Exception; + String ... jndiBindings) throws Exception; void createConnectionFactory(String name, TransportConfiguration liveTC, TransportConfiguration backupTC, - List<String> jndiBindings) throws Exception; + String ... jndiBindings) throws Exception; - void createConnectionFactory(String name, TransportConfiguration liveTC, List<String> jndiBindings) throws Exception; + void createConnectionFactory(String name, TransportConfiguration liveTC, String ... jndiBindings) throws Exception; void createConnectionFactory(String name, String discoveryAddress, int discoveryPort, String clientID, - List<String> jndiBindings) throws Exception; + String ... jndiBindings) throws Exception; void createConnectionFactory(String name, List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, String clientID, - List<String> jndiBindings) throws Exception; + String ... jndiBindings) throws Exception; void createConnectionFactory(String name, TransportConfiguration liveTC, TransportConfiguration backupTC, String clientID, - List<String> jndiBindings) throws Exception; + String ... jndiBindings) throws Exception; - void createConnectionFactory(String name, TransportConfiguration liveTC, String clientID, List<String> jndiBindings) throws Exception; + void createConnectionFactory(String name, TransportConfiguration liveTC, String clientID, String ... jndiBindings) throws Exception; void createConnectionFactory(String name, List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, @@ -212,7 +218,7 @@ int reconnectAttempts, boolean failoverOnServerShutdown, String groupId, - List<String> jndiBindings) throws Exception; + String ... jndiBindings) throws Exception; void createConnectionFactory(String name, String discoveryAddress, @@ -247,9 +253,9 @@ int reconnectAttempts, boolean failoverOnServerShutdown, String groupId, - List<String> jndiBindings) throws Exception; + String ... jndiBindings) throws Exception; - void createConnectionFactory(ConnectionFactoryConfiguration cfConfig) throws Exception; + void createConnectionFactory(ConnectionFactoryConfiguration cfConfig, String... jndiBindings) throws Exception; /** * destroys a connection factory. Modified: trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -555,13 +555,6 @@ int nbindings = buffer.readInt(); - bindings = new String[nbindings]; - - for (int i = 0; i < nbindings; i++) - { - bindings[i] = buffer.readSimpleString().toString(); - } - discoveryGroupName = BufferHelper.readNullableSimpleStringAsString(buffer); discoveryAddress = BufferHelper.readNullableSimpleStringAsString(buffer); @@ -649,13 +642,6 @@ { BufferHelper.writeAsSimpleString(buffer, name); - buffer.writeInt(bindings.length); - - for (String str : bindings) - { - BufferHelper.writeAsSimpleString(buffer, str); - } - BufferHelper.writeAsNullableSimpleString(buffer, discoveryGroupName); BufferHelper.writeAsNullableSimpleString(buffer, discoveryAddress); @@ -734,19 +720,7 @@ BufferHelper.writeAsNullableSimpleString(buffer, groupID); } - private int sizeOfBindings() - { - int size = DataConstants.SIZE_INT; // for the number of bindings persisted - for (String str : bindings) - { - size += BufferHelper.sizeOfSimpleString(str); - } - - return size; - - } - private int sizeOfConnectors() { int size = DataConstants.SIZE_INT; // for the number of connectors persisted @@ -769,8 +743,6 @@ public int getEncodeSize() { return BufferHelper.sizeOfSimpleString(name) + - - sizeOfBindings() + BufferHelper.sizeOfNullableSimpleString(discoveryGroupName) + Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -364,18 +364,15 @@ ConnectionFactoryConfiguration cfConfig; - String[] strbindings = jndiBindings.toArray(new String[jndiBindings.size()]); - if (discoveryGroupName != null) { - cfConfig = new ConnectionFactoryConfigurationImpl(name, - strbindings); + cfConfig = new ConnectionFactoryConfigurationImpl(name); cfConfig.setInitialWaitTimeout(discoveryInitialWaitTimeout); cfConfig.setDiscoveryGroupName(discoveryGroupName); } else { - cfConfig = new ConnectionFactoryConfigurationImpl(name, strbindings); + cfConfig = new ConnectionFactoryConfigurationImpl(name); cfConfig.setConnectorNames(connectorNames); } Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -190,7 +190,7 @@ private void deployConnectionFactory(final Node node) throws Exception { ConnectionFactoryConfiguration cfConfig = parser.parseConnectionFactoryConfiguration(node); - jmsServerManager.createConnectionFactory(cfConfig); + jmsServerManager.createConnectionFactory(cfConfig, cfConfig.getBindings()); } Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -394,7 +394,24 @@ return added; } + public boolean addConnectionFactoryToJNDI(final String name, final String jndiBinding) throws Exception + { + checkInitialised(); + HornetQConnectionFactory factory = connectionFactories.get(name); + if(factory == null) + { + throw new IllegalArgumentException("Factory does not exist"); + } + boolean added = bindToJndi(jndiBinding, factory); + if (added) + { + addToBindings(connectionFactoryJNDI, name, jndiBinding); + storage.addJNDI(PersistedType.ConnectionFactory, name, jndiBinding); + } + return added; + } + /* (non-Javadoc) * @see org.hornetq.jms.server.JMSServerManager#removeQueueFromJNDI(java.lang.String, java.lang.String) */ @@ -450,6 +467,34 @@ return true; } + + /* (non-Javadoc) + * @see org.hornetq.jms.server.JMSServerManager#removeConnectionFactoryFromJNDI(java.lang.String, java.lang.String) + */ + public boolean removeConnectionFactoryFromJNDI(String name, String jndi) throws Exception + { + checkInitialised(); + + removeFromJNDI(connectionFactoryJNDI, name, jndi); + + storage.deleteJNDI(PersistedType.ConnectionFactory, name, jndi); + + return true; + } + + /* (non-Javadoc) + * @see org.hornetq.jms.server.JMSServerManager#removeConnectionFactoryFromJNDI(java.lang.String, java.lang.String) + */ + public boolean removeConnectionFactoryFromJNDI(String name) throws Exception + { + checkInitialised(); + + removeFromJNDI(connectionFactoryJNDI, name); + + storage.deleteJNDI(PersistedType.Topic, name); + + return true; + } public synchronized boolean destroyQueue(final String name) throws Exception @@ -511,27 +556,21 @@ public synchronized void createConnectionFactory(final String name, final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, - final List<String> jndiBindings) throws Exception + String ... jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { ConnectionFactoryConfiguration configuration = new ConnectionFactoryConfigurationImpl(name, connectorConfigs); - if (jndiBindings != null) - { - String[] bindings = new String[jndiBindings.size()]; - jndiBindings.toArray(bindings); - configuration.setBindings(bindings); - } - createConnectionFactory(configuration); + createConnectionFactory(configuration, jndiBindings); } } public synchronized void createConnectionFactory(final String name, final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, final String clientID, - final List<String> jndiBindings) throws Exception + String ... jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -539,13 +578,7 @@ { ConnectionFactoryConfiguration configuration = new ConnectionFactoryConfigurationImpl(name, connectorConfigs); configuration.setClientID(clientID); - if (jndiBindings != null) - { - String[] bindings = new String[jndiBindings.size()]; - jndiBindings.toArray(bindings); - configuration.setBindings(bindings); - } - createConnectionFactory(configuration); + createConnectionFactory(configuration, jndiBindings); } } @@ -579,7 +612,7 @@ final int reconnectAttempts, final boolean failoverOnServerShutdown, final String groupId, - final List<String> jndiBindings) throws Exception + String ... jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -614,13 +647,7 @@ configuration.setReconnectAttempts(reconnectAttempts); configuration.setFailoverOnServerShutdown(failoverOnServerShutdown); configuration.setGroupID(groupId); - if (jndiBindings != null) - { - String[] bindings = new String[jndiBindings.size()]; - jndiBindings.toArray(bindings); - configuration.setBindings(bindings); - } - createConnectionFactory(configuration); + createConnectionFactory(configuration, jndiBindings); } } @@ -657,7 +684,7 @@ final int reconnectAttempts, final boolean failoverOnServerShutdown, final String groupId, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -693,41 +720,30 @@ configuration.setMaxRetryInterval(maxRetryInterval); configuration.setReconnectAttempts(reconnectAttempts); configuration.setFailoverOnServerShutdown(failoverOnServerShutdown); - if (jndiBindings != null) - { - String[] bindings = new String[jndiBindings.size()]; - jndiBindings.toArray(bindings); - configuration.setBindings(bindings); - } - createConnectionFactory(configuration); + createConnectionFactory(configuration, jndiBindings); } } public synchronized void createConnectionFactory(final String name, final String discoveryAddress, final int discoveryPort, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { ConnectionFactoryConfiguration configuration = new ConnectionFactoryConfigurationImpl(name, discoveryAddress, discoveryPort); - if (jndiBindings != null) - { - String[] bindings = new String[jndiBindings.size()]; - jndiBindings.toArray(bindings); - configuration.setBindings(bindings); - } - createConnectionFactory(configuration); + createConnectionFactory(configuration, jndiBindings); } } + public synchronized void createConnectionFactory(final String name, final String discoveryAddress, final int discoveryPort, final String clientID, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { checkInitialised(); @@ -736,20 +752,19 @@ { ConnectionFactoryConfiguration configuration = new ConnectionFactoryConfigurationImpl(name, discoveryAddress, discoveryPort); configuration.setClientID(clientID); - if (jndiBindings != null) - { - String[] bindings = new String[jndiBindings.size()]; - jndiBindings.toArray(bindings); - configuration.setBindings(bindings); - } - createConnectionFactory(configuration); + createConnectionFactory(configuration, jndiBindings); } } - public synchronized void createConnectionFactory(final ConnectionFactoryConfiguration cfConfig) throws Exception + public synchronized void createConnectionFactory(final ConnectionFactoryConfiguration cfConfig, String... jndiBindings) throws Exception { internalCreateCF(cfConfig); storage.storeConnectionFactory(new PersistedConnectionFactory(cfConfig)); + for (String jndiBinding : jndiBindings) + { + addConnectionFactoryToJNDI(cfConfig.getName(), jndiBinding); + } + } private HornetQConnectionFactory internalCreateConnectionFactory(final String name, @@ -784,8 +799,7 @@ final long maxRetryInterval, final int reconnectAttempts, final boolean failoverOnServerShutdown, - final String groupId, - final List<String> jndiBindings) throws Exception + final String groupId) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -823,8 +837,6 @@ cf.setFailoverOnServerShutdown(failoverOnServerShutdown); } - bindConnectionFactory(cf, name, jndiBindings); - return cf; } @@ -857,8 +869,7 @@ final long maxRetryInterval, final int reconnectAttempts, final boolean failoverOnServerShutdown, - final String groupId, - final List<String> jndiBindings) throws Exception + final String groupId) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); @@ -894,8 +905,6 @@ cf.setFailoverOnServerShutdown(failoverOnServerShutdown); cf.setGroupID(groupId); } - - bindConnectionFactory(cf, name, jndiBindings); return cf; } @@ -971,11 +980,6 @@ */ private HornetQConnectionFactory internalCreateCF(final ConnectionFactoryConfiguration cfConfig) throws HornetQException, Exception { - ArrayList<String> listBindings = new ArrayList<String>(); - for (String str : cfConfig.getBindings()) - { - listBindings.add(str); - } List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = lookupConnectors(cfConfig); @@ -1015,8 +1019,7 @@ cfConfig.getMaxRetryInterval(), cfConfig.getReconnectAttempts(), cfConfig.isFailoverOnServerShutdown(), - cfConfig.getGroupID(), - listBindings); + cfConfig.getGroupID()); } else { @@ -1049,71 +1052,66 @@ cfConfig.getMaxRetryInterval(), cfConfig.getReconnectAttempts(), cfConfig.isFailoverOnServerShutdown(), - cfConfig.getGroupID(), - listBindings); + cfConfig.getGroupID()); } } public synchronized void createConnectionFactory(final String name, final TransportConfiguration liveTC, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = (HornetQConnectionFactory)HornetQJMSClient.createConnectionFactory(liveTC); + ConnectionFactoryConfiguration configuration = new ConnectionFactoryConfigurationImpl(name, liveTC); + createConnectionFactory(configuration, jndiBindings); } - - bindConnectionFactory(cf, name, jndiBindings); } public synchronized void createConnectionFactory(final String name, final TransportConfiguration liveTC, final String clientID, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = (HornetQConnectionFactory)HornetQJMSClient.createConnectionFactory(liveTC); - cf.setClientID(clientID); + ConnectionFactoryConfiguration configuration = new ConnectionFactoryConfigurationImpl(name, liveTC); + configuration.setClientID(clientID); + createConnectionFactory(configuration, jndiBindings); } - - bindConnectionFactory(cf, name, jndiBindings); } public synchronized void createConnectionFactory(final String name, final TransportConfiguration liveTC, final TransportConfiguration backupTC, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = (HornetQConnectionFactory)HornetQJMSClient.createConnectionFactory(liveTC, backupTC); + ConnectionFactoryConfiguration configuration = new ConnectionFactoryConfigurationImpl(name, liveTC, backupTC); + createConnectionFactory(configuration, jndiBindings); } - - bindConnectionFactory(cf, name, jndiBindings); } public synchronized void createConnectionFactory(final String name, final TransportConfiguration liveTC, final TransportConfiguration backupTC, final String clientID, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { checkInitialised(); HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = (HornetQConnectionFactory)HornetQJMSClient.createConnectionFactory(liveTC, backupTC); - cf.setClientID(clientID); + ConnectionFactoryConfiguration configuration = new ConnectionFactoryConfigurationImpl(name, liveTC, backupTC); + configuration.setClientID(clientID); + createConnectionFactory(configuration, jndiBindings); } - - bindConnectionFactory(cf, name, jndiBindings); } public synchronized boolean destroyConnectionFactory(final String name) throws Exception Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/AcknowledgementTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/AcknowledgementTest.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/AcknowledgementTest.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -744,9 +744,7 @@ { final int BATCH_SIZE = 10; - ArrayList<String> bindings = new ArrayList<String>(); - bindings.add("mycf"); - deployConnectionFactory(null, "MyConnectionFactory2", bindings, -1, -1, -1, -1, false, false, BATCH_SIZE, true); + deployConnectionFactory(null, "MyConnectionFactory2", -1, -1, -1, -1, false, false, BATCH_SIZE, true, "mycf"); Connection conn = null; try Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -63,8 +63,6 @@ connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"), null)); - List<String> jndiBindings = new ArrayList<String>(); - jndiBindings.add("/StrictTCKConnectionFactory"); getJmsServerManager().createConnectionFactory("StrictTCKConnectionFactory", connectorConfigs, @@ -96,7 +94,7 @@ HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, - jndiBindings); + "/StrictTCKConnectionFactory"); CTSMiscellaneousTest.cf = (HornetQConnectionFactory)getInitialContext().lookup("/StrictTCKConnectionFactory"); } Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionFactoryTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionFactoryTest.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionFactoryTest.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -81,9 +81,7 @@ public void testAdministrativelyConfiguredClientID() throws Exception { // deploy a connection factory that has an administatively configured clientID - ArrayList<String> bindings = new ArrayList<String>(); - bindings.add("TestConnectionFactory"); - HornetQServerTestCase.deployConnectionFactory("sofiavergara", "TestConnectionFactory", bindings); + HornetQServerTestCase.deployConnectionFactory("sofiavergara", "TestConnectionFactory", "TestConnectionFactory"); ConnectionFactory cf = (ConnectionFactory)JMSTestCase.ic.lookup("/TestConnectionFactory"); Connection c = cf.createConnection(); @@ -136,9 +134,7 @@ // Added for http://jira.jboss.org/jira/browse/JBMESSAGING-939 public void testDurableSubscriptionOnPreConfiguredConnectionFactory() throws Exception { - ArrayList<String> bindings = new ArrayList<String>(); - bindings.add("/TestDurableCF"); - HornetQServerTestCase.deployConnectionFactory("TestConnectionFactory1", "cfTest", bindings); + HornetQServerTestCase.deployConnectionFactory("TestConnectionFactory1", "cfTest", "/TestDurableCF"); createTopic("TestSubscriber"); @@ -190,7 +186,7 @@ { ArrayList<String> bindings = new ArrayList<String>(); bindings.add("TestSlowConsumersCF"); - HornetQServerTestCase.deployConnectionFactory(0, "TestSlowConsumersCF", bindings, 1); + HornetQServerTestCase.deployConnectionFactory(0, "TestSlowConsumersCF", 1, "TestSlowConsumersCF"); Connection conn = null; Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -424,39 +424,34 @@ public static void deployConnectionFactory(final String clientId, final String objectName, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { HornetQServerTestCase.servers.get(0).deployConnectionFactory(clientId, objectName, jndiBindings); } public static void deployConnectionFactory(final String objectName, - final List<String> jndiBindings, - final int prefetchSize) throws Exception + final int prefetchSize, + final String ... jndiBindings) throws Exception { - HornetQServerTestCase.servers.get(0).deployConnectionFactory(objectName, jndiBindings, prefetchSize); + HornetQServerTestCase.servers.get(0).deployConnectionFactory(objectName, prefetchSize, jndiBindings); } - public static void deployConnectionFactory(final String objectName, final List<String> jndiBindings) throws Exception - { - HornetQServerTestCase.servers.get(0).deployConnectionFactory(objectName, jndiBindings); - } public static void deployConnectionFactory(final int server, final String objectName, - final List<String> jndiBindings, - final int prefetchSize) throws Exception + final int prefetchSize, + final String ... jndiBindings) throws Exception { - HornetQServerTestCase.servers.get(server).deployConnectionFactory(objectName, jndiBindings, prefetchSize); + HornetQServerTestCase.servers.get(server).deployConnectionFactory(objectName, prefetchSize, jndiBindings); } - public static void deployConnectionFactory(final int server, final String objectName, final List<String> jndiBindings) throws Exception + public static void deployConnectionFactory(final int server, final String objectName, final String ... jndiBindings) throws Exception { HornetQServerTestCase.servers.get(server).deployConnectionFactory(objectName, jndiBindings); } public void deployConnectionFactory(final String clientId, final String objectName, - final List<String> jndiBindings, final int prefetchSize, final int defaultTempQueueFullSize, final int defaultTempQueuePageSize, @@ -464,11 +459,11 @@ final boolean supportsFailover, final boolean supportsLoadBalancing, final int dupsOkBatchSize, - final boolean blockOnAcknowledge) throws Exception + final boolean blockOnAcknowledge, + final String ... jndiBindings) throws Exception { HornetQServerTestCase.servers.get(0).deployConnectionFactory(clientId, objectName, - jndiBindings, prefetchSize, defaultTempQueueFullSize, defaultTempQueuePageSize, @@ -476,22 +471,23 @@ supportsFailover, supportsLoadBalancing, dupsOkBatchSize, - blockOnAcknowledge); + blockOnAcknowledge, + jndiBindings); } public static void deployConnectionFactory(final String objectName, - final List<String> jndiBindings, final int prefetchSize, final int defaultTempQueueFullSize, final int defaultTempQueuePageSize, - final int defaultTempQueueDownCacheSize) throws Exception + final int defaultTempQueueDownCacheSize, + final String ... jndiBindings) throws Exception { HornetQServerTestCase.servers.get(0).deployConnectionFactory(objectName, - jndiBindings, prefetchSize, defaultTempQueueFullSize, defaultTempQueuePageSize, - defaultTempQueueDownCacheSize); + defaultTempQueueDownCacheSize, + jndiBindings); } public static void undeployConnectionFactory(final String objectName) throws Exception Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -59,8 +59,6 @@ connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"), null)); - List<String> jndiBindings = new ArrayList<String>(); - jndiBindings.add("/testsuitecf"); getJmsServerManager().createConnectionFactory("testsuitecf", connectorConfigs, @@ -92,7 +90,7 @@ HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, - jndiBindings); + "/testsuitecf"); JMSTestCase.cf = (HornetQConnectionFactory)getInitialContext().lookup("/testsuitecf"); Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/SecurityTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/SecurityTest.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/SecurityTest.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -184,9 +184,7 @@ Connection conn = null; try { - ArrayList<String> bindings = new ArrayList<String>(); - bindings.add("preConfcf"); - HornetQServerTestCase.deployConnectionFactory("dilbert-id", "preConfcf", bindings); + HornetQServerTestCase.deployConnectionFactory("dilbert-id", "preConfcf", "preConfcf"); ConnectionFactory cf = (ConnectionFactory)getInitialContext().lookup("preConfcf"); conn = cf.createConnection("guest", "guest"); String clientID = conn.getClientID(); @@ -232,9 +230,7 @@ Connection conn = null; try { - ArrayList<String> bindings = new ArrayList<String>(); - bindings.add("preConfcf"); - HornetQServerTestCase.deployConnectionFactory("dilbert-id", "preConfcf", bindings); + HornetQServerTestCase.deployConnectionFactory("dilbert-id", "preConfcf", "preConfcf"); ConnectionFactory cf = (ConnectionFactory)getInitialContext().lookup("preConfcf"); conn = cf.createConnection("guest", "guest"); conn.setClientID("myID"); 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-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -218,33 +218,32 @@ getJMSServerManager().createTopic(name, "/topic/" + (jndiName != null ? jndiName : name)); } - public void deployConnectionFactory(final String clientId, final String objectName, final List<String> jndiBindings) throws Exception + public void deployConnectionFactory(final String clientId, final String objectName, final String ... jndiBindings) throws Exception { - deployConnectionFactory(clientId, objectName, jndiBindings, -1, -1, -1, -1, false, false, -1, false); + deployConnectionFactory(clientId, objectName, -1, -1, -1, -1, false, false, -1, false, jndiBindings); } public void deployConnectionFactory(final String objectName, - final List<String> jndiBindings, - final int consumerWindowSize) throws Exception + final int consumerWindowSize, + final String ... jndiBindings) throws Exception { - deployConnectionFactory(null, objectName, jndiBindings, consumerWindowSize, -1, -1, -1, false, false, -1, false); + deployConnectionFactory(null, objectName, consumerWindowSize, -1, -1, -1, false, false, -1, false, jndiBindings); } - public void deployConnectionFactory(final String objectName, final List<String> jndiBindings) throws Exception + public void deployConnectionFactory(final String objectName, final String ... jndiBindings) throws Exception { - deployConnectionFactory(null, objectName, jndiBindings, -1, -1, -1, -1, false, false, -1, false); + deployConnectionFactory(null, objectName, -1, -1, -1, -1, false, false, -1, false, jndiBindings); } public void deployConnectionFactory(final String objectName, - final List<String> jndiBindings, final int prefetchSize, final int defaultTempQueueFullSize, final int defaultTempQueuePageSize, - final int defaultTempQueueDownCacheSize) throws Exception + final int defaultTempQueueDownCacheSize, + final String ... jndiBindings) throws Exception { this.deployConnectionFactory(null, objectName, - jndiBindings, prefetchSize, defaultTempQueueFullSize, defaultTempQueuePageSize, @@ -252,17 +251,17 @@ false, false, -1, - false); + false, + jndiBindings); } public void deployConnectionFactory(final String objectName, - final List<String> jndiBindings, final boolean supportsFailover, - final boolean supportsLoadBalancing) throws Exception + final boolean supportsLoadBalancing, + final String ... jndiBindings) throws Exception { this.deployConnectionFactory(null, objectName, - jndiBindings, -1, -1, -1, @@ -270,12 +269,12 @@ supportsFailover, supportsLoadBalancing, -1, - false); + false, + jndiBindings); } public void deployConnectionFactory(final String clientId, final String objectName, - final List<String> jndiBindings, final int prefetchSize, final int defaultTempQueueFullSize, final int defaultTempQueuePageSize, @@ -283,7 +282,8 @@ final boolean supportsFailover, final boolean supportsLoadBalancing, final int dupsOkBatchSize, - final boolean blockOnAcknowledge) throws Exception + final boolean blockOnAcknowledge, + final String ... jndiBindings) throws Exception { List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/Server.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/Server.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/Server.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -135,7 +135,6 @@ // boolean undeployDestinationProgrammatically(boolean isQueue, String name) throws Exception; public void deployConnectionFactory(String clientId, String objectName, - List<String> jndiBindings, int prefetchSize, int defaultTempQueueFullSize, int defaultTempQueuePageSize, @@ -143,25 +142,29 @@ boolean supportsFailover, boolean supportsLoadBalancing, int dupsOkBatchSize, - boolean blockOnAcknowledge) throws Exception; + boolean blockOnAcknowledge, + final String ... jndiBindings) throws Exception; void deployConnectionFactory(String objectName, - List<String> jndiBindings, int prefetchSize, int defaultTempQueueFullSize, int defaultTempQueuePageSize, - int defaultTempQueueDownCacheSize) throws Exception; + int defaultTempQueueDownCacheSize, + final String ... jndiBindings) throws Exception; void deployConnectionFactory(String objectName, - List<String> jndiBindings, boolean supportsFailover, - boolean supportsLoadBalancing) throws Exception; + boolean supportsLoadBalancing, + final String ... jndiBindings) throws Exception; - void deployConnectionFactory(String clientID, String objectName, List<String> jndiBindings) throws Exception; + void deployConnectionFactory(String clientID, String objectName, + final String ... jndiBindings) throws Exception; - void deployConnectionFactory(String objectName, List<String> jndiBindings, int prefetchSize) throws Exception; + void deployConnectionFactory(String objectName, int prefetchSize, + final String ... jndiBindings) throws Exception; - void deployConnectionFactory(String objectName, List<String> jndiBindings) throws Exception; + void deployConnectionFactory(String objectName, + final String ... jndiBindings) throws Exception; void undeployConnectionFactory(String objectName) throws Exception; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -128,9 +128,6 @@ connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration(NettyConnectorFactory.class.getName()), null)); - List<String> jndiBindings = new ArrayList<String>(); - jndiBindings.add("/cf"); - serverManager.createConnectionFactory("ManualReconnectionToSingleServerTest", connectorConfigs, null, @@ -161,7 +158,7 @@ reconnectAttempts, failoverOnServerShutdown, null, - jndiBindings); + "/cf"); } public void testFoo() Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -190,7 +190,7 @@ @Override protected void createCF(final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { int retryInterval = 1000; double retryIntervalMultiplier = 1.0; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -236,7 +236,7 @@ // Protected ----------------------------------------------------- @Override protected void createCF(final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { int retryInterval = 1000; double retryIntervalMultiplier = 1.0; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -65,8 +65,6 @@ connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration(NettyConnectorFactory.class.getName()), null)); - List<String> jndiBindings = new ArrayList<String>(); - jndiBindings.add("/cffoo"); jmsServer.createConnectionFactory("cffoo", connectorConfigs, @@ -98,7 +96,7 @@ 0, false, null, - jndiBindings); + "/cffoo"); cf = (ConnectionFactory)context.lookup("/cffoo"); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -225,7 +225,7 @@ @Override protected void createCF(final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { int retryInterval = 1000; double retryIntervalMultiplier = 1.0; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -136,7 +136,7 @@ // Inner classes ------------------------------------------------- @Override protected void createCF(final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { int retryInterval = 1000; double retryIntervalMultiplier = 1.0; Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-03-27 08:51:18 UTC (rev 8976) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-03-27 10:12:28 UTC (rev 8977) @@ -163,11 +163,8 @@ connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration(NettyConnectorFactory.class.getName()), null)); - List<String> jndiBindings = new ArrayList<String>(); - jndiBindings.add("/cf"); + createCF(connectorConfigs, "/cf"); - createCF(connectorConfigs, jndiBindings); - cf = (ConnectionFactory)context.lookup("/cf"); } @@ -178,7 +175,7 @@ * @throws Exception */ protected void createCF(final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, - final List<String> jndiBindings) throws Exception + final String ... jndiBindings) throws Exception { int retryInterval = 1000; double retryIntervalMultiplier = 1.0;