[hornetq-commits] JBoss hornetq SVN: r8996 - in trunk: src/main/org/hornetq/jms/management/impl and 3 other directories.

Author: ataylor Date: 2010-03-29 07:46:06 -0400 (Mon, 29 Mar 2010) New Revision: 8996 Modified: trunk/src/main/org/hornetq/api/jms/management/ConnectionFactoryControl.java trunk/src/main/org/hornetq/api/jms/management/JMSQueueControl.java trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java trunk/src/main/org/hornetq/jms/server/JMSServerManager.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java Log: changed method signatures Modified: trunk/src/main/org/hornetq/api/jms/management/ConnectionFactoryControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/ConnectionFactoryControl.java 2010-03-29 09:57:27 UTC (rev 8995) +++ trunk/src/main/org/hornetq/api/jms/management/ConnectionFactoryControl.java 2010-03-29 11:46:06 UTC (rev 8996) @@ -42,7 +42,7 @@ /** * Returns the JNDI bindings associated to this connection factory. */ - List<String> getJNDIBindings(); + String[] getJNDIBindings(); /** * Returns the Client ID of this connection factory (or {@code null} if it is not set. Modified: trunk/src/main/org/hornetq/api/jms/management/JMSQueueControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/JMSQueueControl.java 2010-03-29 09:57:27 UTC (rev 8995) +++ trunk/src/main/org/hornetq/api/jms/management/JMSQueueControl.java 2010-03-29 11:46:06 UTC (rev 8996) @@ -81,7 +81,7 @@ * Returns the JNDI bindings associated to this connection factory. */ @Operation(desc = "Returns the list of JNDI bindings associated") - List<String> getJNDIBindings(); + String[] getJNDIBindings(); /** * Add the JNDI binding to this destination Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java 2010-03-29 09:57:27 UTC (rev 8995) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java 2010-03-29 11:46:06 UTC (rev 8996) @@ -63,7 +63,7 @@ // ManagedConnectionFactoryMBean implementation ------------------ - public List<String> getJNDIBindings() + public String[] getJNDIBindings() { return jmsManager.getJNDIOnConnectionFactory(name); } Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-03-29 09:57:27 UTC (rev 8995) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-03-29 11:46:06 UTC (rev 8996) @@ -174,7 +174,7 @@ jmsServerManager.addQueueToJndi(managedQueue.getName(), jndi); } - public List<String> getJNDIBindings() + public String[] getJNDIBindings() { return jmsServerManager.getJNDIOnQueue(managedQueue.getName()); } Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2010-03-29 09:57:27 UTC (rev 8995) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2010-03-29 11:46:06 UTC (rev 8996) @@ -94,8 +94,7 @@ public String[] getJNDIBindings() { - List<String> names = jmsServerManager.getJNDIOnTopic(managedTopic.getName()); - return (String[])names.toArray(new String[names.size()]); + return jmsServerManager.getJNDIOnTopic(managedTopic.getName()); } Modified: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2010-03-29 09:57:27 UTC (rev 8995) +++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2010-03-29 11:46:06 UTC (rev 8996) @@ -141,11 +141,11 @@ */ boolean destroyQueue(String name) throws Exception; - List<String> getJNDIOnQueue(String queue); + String[] getJNDIOnQueue(String queue); - List<String> getJNDIOnTopic(String topic); + String[] getJNDIOnTopic(String topic); - List<String> getJNDIOnConnectionFactory(String factoryName); + String[] getJNDIOnConnectionFactory(String factoryName); /** * destroys a topic and removes it from JNDI @@ -172,23 +172,23 @@ void createConnectionFactory(String name, TransportConfiguration liveTC, String ... jndiBindings) throws Exception; void createConnectionFactory(String name, + String clientID, String discoveryAddress, int discoveryPort, - String clientID, String ... jndiBindings) throws Exception; void createConnectionFactory(String name, + String clientID, List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, - String clientID, String ... jndiBindings) throws Exception; void createConnectionFactory(String name, + String clientID, TransportConfiguration liveTC, TransportConfiguration backupTC, - String clientID, String ... jndiBindings) throws Exception; - void createConnectionFactory(String name, TransportConfiguration liveTC, String clientID, String ... jndiBindings) throws Exception; + void createConnectionFactory(String name, String clientID, TransportConfiguration liveTC, String ... jndiBindings) throws Exception; void createConnectionFactory(String name, List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-03-29 09:57:27 UTC (rev 8995) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-03-29 11:46:06 UTC (rev 8996) @@ -14,7 +14,6 @@ package org.hornetq.jms.server.impl; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -395,17 +394,17 @@ return added; } - public List<String> getJNDIOnQueue(String queue) + public String[] getJNDIOnQueue(String queue) { return getJNDIList(queueJNDI, queue); } - public List<String> getJNDIOnTopic(String topic) + public String[] getJNDIOnTopic(String topic) { return getJNDIList(topicJNDI, topic); } - public List<String> getJNDIOnConnectionFactory(String factoryName) + public String[] getJNDIOnConnectionFactory(String factoryName) { return getJNDIList(connectionFactoryJNDI, factoryName); } @@ -613,8 +612,8 @@ } public synchronized void createConnectionFactory(final String name, + final String clientID, final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, - final String clientID, String... jndiBindings) throws Exception { checkInitialised(); @@ -785,9 +784,9 @@ public synchronized void createConnectionFactory(final String name, + final String clientID, final String discoveryAddress, final int discoveryPort, - final String clientID, final String... jndiBindings) throws Exception { checkInitialised(); @@ -954,16 +953,18 @@ } - private List<String> getJNDIList(final Map<String, List<String>> map, final String name) + private String[] getJNDIList(final Map<String, List<String>> map, final String name) { List<String> result = map.get(name); if (result == null) { - return Collections.emptyList(); + return new String[0]; } else { - return Collections.unmodifiableList(result); + String[] strings = new String[result.size()]; + result.toArray(strings); + return strings; } } @@ -1120,8 +1121,8 @@ } public synchronized void createConnectionFactory(final String name, + final String clientID, final TransportConfiguration liveTC, - final String clientID, final String... jndiBindings) throws Exception { checkInitialised(); @@ -1149,9 +1150,9 @@ } public synchronized void createConnectionFactory(final String name, + final String clientID, final TransportConfiguration liveTC, final TransportConfiguration backupTC, - final String clientID, final String... jndiBindings) throws Exception { checkInitialised(); 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-03-29 09:57:27 UTC (rev 8995) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2010-03-29 11:46:06 UTC (rev 8996) @@ -278,7 +278,7 @@ proxy.invokeOperation("addJNDI", jndi); } - public List<String> getJNDIBindings() + public String[] getJNDIBindings() { // TODO: Add a test for this return null;