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

do-not-reply at jboss.org do-not-reply at jboss.org
Sat Feb 20 05:17:42 EST 2010


Author: ataylor
Date: 2010-02-20 05:17:41 -0500 (Sat, 20 Feb 2010)
New Revision: 8890

Modified:
   trunk/src/main/org/hornetq/api/jms/management/ConnectionFactoryControl.java
   trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java
   trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java
   trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
   trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java
   trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-305 removed unwanted createconnectionfactory methods and added set/get's to ConnectionFactoryControl

Modified: trunk/src/main/org/hornetq/api/jms/management/ConnectionFactoryControl.java
===================================================================
--- trunk/src/main/org/hornetq/api/jms/management/ConnectionFactoryControl.java	2010-02-18 23:12:11 UTC (rev 8889)
+++ trunk/src/main/org/hornetq/api/jms/management/ConnectionFactoryControl.java	2010-02-20 10:17:41 UTC (rev 8890)
@@ -15,6 +15,8 @@
 
 import java.util.List;
 
+import org.hornetq.api.core.Pair;
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.ClientSessionFactory;
 
 /**
@@ -46,16 +48,31 @@
    String getClientID();
 
    /**
+   * @see  ClientSessionFactory.setClientID
+   */
+   void setClientID(String clientID);
+
+   /**
     * @see ClientSessionFactory#getClientFailureCheckPeriod()
     */
    long getClientFailureCheckPeriod();
 
    /**
+    * @see ClientSessionFactory#setClientFailureCheckPeriod
+    */
+   void setClientFailureCheckPeriod(long clientFailureCheckPeriod);
+
+   /**
     * @see ClientSessionFactory#getCallTimeout()
     */
    long getCallTimeout();
 
    /**
+    * @see ClientSessionFactory#setCallTimeout(long)
+    */
+   void setCallTimeout(long callTimeout);
+
+   /**
     * Returns the batch size (in bytes) between acknowledgements when using DUPS_OK_ACKNOWLEDGE mode.
     * 
     * @see ClientSessionFactory#getAckBatchSize()
@@ -64,84 +81,310 @@
    int getDupsOKBatchSize();
 
    /**
+    * @see ClientSessionFactory#setDupsOKBatchSize(int)
+    */
+   void setDupsOKBatchSize(int dupsOKBatchSize);
+
+   /**
     * @see ClientSessionFactory#getConsumerMaxRate()
     */
    int getConsumerMaxRate();
 
    /**
+    * @see ClientSessionFactory#setConsumerMaxRate(int)
+    */
+   void setConsumerMaxRate(int consumerMaxRate);
+
+   /**
     * @see ClientSessionFactory#getConsumerWindowSize()
     */
    int getConsumerWindowSize();
 
    /**
+    * @see ClientSessionFactory#setConfirmationWindowSize(int)
+    */
+   void setConsumerWindowSize(int consumerWindowSize);
+
+   /**
     * @see ClientSessionFactory#getProducerMaxRate()
     */
    int getProducerMaxRate();
 
    /**
+    * @see ClientSessionFactory#setProducerMaxRate(int)
+    */
+   void setProducerMaxRate(int producerMaxRate);
+
+   /**
     * @see ClientSessionFactory#getConfirmationWindowSize()
     */
    int getConfirmationWindowSize();
 
+    /**
+    * @see ClientSessionFactory#setConfirmationWindowSize(int)
+    */
+   void setConfirmationWindowSize(int confirmationWindowSize);
+
    /**
     * @see ClientSessionFactory#isBlockOnAcknowledge()
     */
    boolean isBlockOnAcknowledge();
 
+    /**
+    * @see ClientSessionFactory#setBlockOnAcknowledge(boolean)
+    */
+   void setBlockOnAcknowledge(boolean blockOnAcknowledge);
+
    /**
     * @see ClientSessionFactory#isBlockOnDurableSend()
     */
    boolean isBlockOnDurableSend();
 
+    /**
+    * @see ClientSessionFactory#setBlockOnDurableSend(boolean)
+    */
+   void setBlockOnDurableSend(boolean blockOnDurableSend);
+
    /**
     * @see ClientSessionFactory#isBlockOnNonDurableSend()
     */
    boolean isBlockOnNonDurableSend();
 
+    /**
+    * @see ClientSessionFactory#setBlockOnNonDurableSend(boolean)
+    */
+   void setBlockOnNonDurableSend(boolean blockOnNonDurableSend);
+
    /**
     * @see ClientSessionFactory#isPreAcknowledge()
     */
    boolean isPreAcknowledge();
 
+    /**
+    * @see ClientSessionFactory#setPreAcknowledge(boolean)
+    */
+   void setPreAcknowledge(boolean preAcknowledge);
+
+
    /**
     * @see ClientSessionFactory#getConnectionTTL()
     */
    long getConnectionTTL();
 
+    /**
+    * @see ClientSessionFactory#setConnectionTTL(long)
+    */
+   void setConnectionTTL(long connectionTTL);
+
    /**
     * Returns the batch size (in bytes) between acknowledgements when using a transacted session.
     * 
     * @see ClientSessionFactory#getAckBatchSize()
     */
-   long getTransactionBatchSize();
+   int getTransactionBatchSize();
 
+    /**
+    * @see ClientSessionFactory#setTransactionBatchSize(int)
+    */
+   void setTransactionBatchSize(int transactionBatchSize);
+
    /**
     * @see ClientSessionFactory#getMinLargeMessageSize()
     */
-   long getMinLargeMessageSize();
+   int getMinLargeMessageSize();
 
+    /**
+    * @see ClientSessionFactory#setMinLargeMessageSize(int)
+    */
+   void setMinLargeMessageSize(int minLargeMessageSize);
+
    /**
     * @see ClientSessionFactory#isAutoGroup()
     */
    boolean isAutoGroup();
 
+    /**
+    * @see ClientSessionFactory#setAutoGroup(boolean)
+    */
+   void setAutoGroup(boolean autoGroup);
+
    /**
     * @see ClientSessionFactory#getRetryInterval()
     */
    long getRetryInterval();
 
+    /**
+    * @see ClientSessionFactory#setRetryInterval(long)
+    */
+   void setRetryInterval(long retryInterval);
+
    /**
     * @see ClientSessionFactory#getRetryIntervalMultiplier()
     */
    double getRetryIntervalMultiplier();
 
+    /**
+    * @see ClientSessionFactory#setRetryIntervalMultiplier(double)
+    */
+   void setRetryIntervalMultiplier(double retryIntervalMultiplier);
+
    /**
     * @see ClientSessionFactory#getReconnectAttempts()
     */
    int getReconnectAttempts();
 
+    /**
+    * @see ClientSessionFactory#setReconnectAttempts(int)
+    */
+   void setReconnectAttempts(int reconnectAttempts);
+
    /**
     * @see ClientSessionFactory#isFailoverOnServerShutdown()
     */
    boolean isFailoverOnServerShutdown();
+
+    /**
+    * @see ClientSessionFactory#setFailoverOnServerShutdown(boolean)
+    */
+   void setFailoverOnServerShutdown(boolean failoverOnServerShutdown);
+
+    /**
+    * @see org.hornetq.api.core.client.ClientSessionFactory#getDiscoveryRefreshTimeout()
+    */
+   long getDiscoveryRefreshTimeout();
+
+    /**
+    * @see ClientSessionFactory#setDiscoveryRefreshTimeout(long)
+    */
+   void setDiscoveryRefreshTimeout(long discoveryRefreshTimeout);
+
+    /**
+    * @see org.hornetq.api.core.client.ClientSessionFactory#getDiscoveryInitialWaitTimeout()
+    */
+   long getDiscoveryInitialWaitTimeout();
+
+    /**
+    * @see ClientSessionFactory#setDiscoveryInitialWaitTimeout(long)
+    */
+   void setDiscoveryInitialWaitTimeout(long discoveryInitialWaitTimeout);
+
+    /**
+    * @see org.hornetq.api.core.client.ClientSessionFactory#getProducerWindowSize()
+    */
+   int getProducerWindowSize();
+
+    /**
+    * @see ClientSessionFactory#setProducerWindowSize(int)
+    */
+   void setProducerWindowSize(int producerWindowSize);
+
+    /**
+    * @see ClientSessionFactory#isCacheLargeMessagesClient()
+    */
+   boolean isCacheLargeMessagesClient();
+
+    /**
+    * @see ClientSessionFactory#setCacheLargeMessagesClient(boolean)
+    */
+   void setCacheLargeMessagesClient(boolean cacheLargeMessagesClient);
+
+    /**
+    * @see ClientSessionFactory#getMaxRetryInterval()
+    */
+   long getMaxRetryInterval();
+
+    /**
+    * @see ClientSessionFactory#setMaxRetryInterval(long)
+    */
+   void setMaxRetryInterval(long retryInterval);
+
+    /**
+    * @see ClientSessionFactory#getScheduledThreadPoolMaxSize()
+    */
+   int getScheduledThreadPoolMaxSize();
+
+    /**
+    * @see ClientSessionFactory#setScheduledThreadPoolMaxSize(int)
+    */
+   void setScheduledThreadPoolMaxSize(int scheduledThreadPoolMaxSize);
+
+    /**
+    * @see ClientSessionFactory#getThreadPoolMaxSize()
+    */
+   int getThreadPoolMaxSize();
+
+    /**
+    * @see ClientSessionFactory#setThreadPoolMaxSize(int)
+    */
+   void setThreadPoolMaxSize(int threadPoolMaxSize);
+
+    /**
+    * @see ClientSessionFactory#getGroupID()
+    */
+   String getGroupID();
+
+    /**
+    * @see ClientSessionFactory#setGroupID(String)
+    */
+   void setGroupID(String groupID);
+
+    /**
+    * @see ClientSessionFactory#getInitialMessagePacketSize()
+    */
+   int getInitialMessagePacketSize();
+
+    /**
+    * @see ClientSessionFactory#setInitialMessagePacketSize(int)
+    */
+   void setInitialMessagePacketSize(int size);
+
+    /**
+    * @see ClientSessionFactory#isUseGlobalPools()
+    */
+   boolean isUseGlobalPools();
+
+    /**
+    * @see ClientSessionFactory#setUseGlobalPools(boolean)
+    */
+   void setUseGlobalPools(boolean useGlobalPools);
+
+    /**
+    * @see ClientSessionFactory#getConnectionLoadBalancingPolicyClassName()
+    */
+   String getConnectionLoadBalancingPolicyClassName();
+
+    /**
+    * @see ClientSessionFactory#setConnectionLoadBalancingPolicyClassName(String)
+    */
+   void setConnectionLoadBalancingPolicyClassName(String connectionLoadBalancingPolicyClassName);
+
+    /**
+    * @see ClientSessionFactory#getStaticConnectors()
+    */
+   List<Pair<TransportConfiguration, TransportConfiguration>> getStaticConnectors();
+
+    /**
+    * @see ClientSessionFactory#setStaticConnectors(java.util.List)
+    */
+   void setStaticConnectors(List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors);
+
+    /**
+    * @see ClientSessionFactory#getDiscoveryAddress()
+    */
+   String getDiscoveryAddress();
+
+    /**
+    * @see ClientSessionFactory#setDiscoveryAddress(String)
+    */
+   void setDiscoveryAddress(String discoveryAddress);
+
+    /**
+    * @see ClientSessionFactory#getDiscoveryPort()
+    */
+   int getDiscoveryPort();
+
+    /**
+    * @see ClientSessionFactory#setDiscoveryPort(int)
+    */
+   void setDiscoveryPort(int discoveryPort);
 }

Modified: trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java
===================================================================
--- trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java	2010-02-18 23:12:11 UTC (rev 8889)
+++ trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java	2010-02-20 10:17:41 UTC (rev 8890)
@@ -95,6 +95,15 @@
    boolean destroyTopic(@Parameter(name = "name", desc = "Name of the topic to destroy") String name) throws Exception;
 
    /**
+    * Create a JMS ConnectionFactory with the specified name connected to a single HornetQ server.
+    * <br>
+    * The ConnectionFactory is bound to JNDI for all the specified bindings.
+    */
+   void createConnectionFactory(final String name,
+                                       final String liveTransportClassName,
+                                       final Map<String, Object> liveTransportParams,
+                                       final Object[] jndiBindings) throws Exception;
+   /**
     * Create a JMS ConnectionFactory with the specified name connected to a static list of live-backup servers.
     * <br>
     * The ConnectionFactory is bound to JNDI for all the specified bindings Strings.
@@ -128,143 +137,17 @@
                                 @Parameter(name = "jndiBindings", desc = "comma-separated list of JNDI bindings") String jndiBindings) throws Exception;
 
    /**
-    * Create a JMS ConnectionFactory with the specified name connected to a static list of live-backup servers.
-    * <br>
-    * Connections created by this ConnectionFactory will have their ClientID set to the specified ClientID.
-    * 
-    * @see #createConnectionFactory(String, Object[], Object[], Object[], Object[], Object[])
-    */
-   void createConnectionFactory(String name,
-                                Object[] liveConnectorsTransportClassNames,
-                                Object[] liveConnectorTransportParams,
-                                Object[] backupConnectorsTransportClassNames,
-                                Object[] backupConnectorTransportParams,
-                                String clientID,
-                                Object[] jndiBindings) throws Exception;
-
-   /**
-    * Create a JMS ConnectionFactory with the specified name connected to a single live-backup pair of servers.
-    * <br>
-    * The ConnectionFactory is bound to JNDI for all the specified bindings Strings.
-    * <br>
-    * Connections created by this ConnectionFactory will have their ClientID set to the specified ClientID.
-    * <br>
-    * {@code backupTransportClassNames} and {@code backupTransportParams} can be {@code null} if there is no backup server.
-    */
-   @Operation(desc = "Create a JMS ConnectionFactory", impact = MBeanOperationInfo.ACTION)
-   void createConnectionFactory(@Parameter(name = "name") String name,
-                                @Parameter(name = "liveTransportClassNames", desc = "comma-separated list of class names for transport to live servers") String liveTransportClassNames,
-                                @Parameter(name = "liveTransportParams", desc = "comma-separated list of key=value parameters for the live transports (enclosed between { } for each transport)") String liveTransportParams,
-                                @Parameter(name = "backupTransportClassNames", desc = "comma-separated list of class names for transport to backup servers") String backupTransportClassNames,
-                                @Parameter(name = "backupTransportParams", desc = "comma-separated list of key=value parameters for the backup transports (enclosed between { } for each transport)") String backupTransportParams,
-                                @Parameter(name = "clientID") String clientID,
-                                @Parameter(name = "jndiBindings", desc = "comma-separated list of JNDI bindings") String jndiBindings) throws Exception;
-
-   /**
-    * Create a JMS ConnectionFactory with the specified name connected to a static list of live-backup servers.
-    * <br>
-    * The ConnectionFactory is bound to JNDI for all the specified bindings Strings.
-    * <br>
-    * All parameters corresponds to the underlying ClientSessionFactory used by the factory.
-    * 
-    * @see #createConnectionFactory(String, Object[], Object[], Object[], Object[], Object[])
-    * @see ClientSessionFactory
-    */
-   void createConnectionFactory(String name,
-                                Object[] liveConnectorsTransportClassNames,
-                                Object[] liveConnectorTransportParams,
-                                Object[] backupConnectorsTransportClassNames,
-                                Object[] backupConnectorTransportParams,
-                                String clientID,
-                                long clientFailureCheckPeriod,
-                                long connectionTTL,
-                                long callTimeout,
-                                boolean cacheLargeMessageClient,
-                                int minLargeMessageSize,
-                                int consumerWindowSize,
-                                int consumerMaxRate,
-                                int confirmationWindowSize,
-                                int producerWindowSize,
-                                int producerMaxRate,
-                                boolean blockOnAcknowledge,
-                                boolean blockOnDurableSend,
-                                boolean blockOnNonDurableSend,
-                                boolean autoGroup,
-                                boolean preAcknowledge,
-                                String loadBalancingPolicyClassName,
-                                int transactionBatchSize,
-                                int dupsOKBatchSize,
-                                boolean useGlobalPools,
-                                int scheduledThreadPoolMaxSize,
-                                int threadPoolMaxSize,
-                                long retryInterval,
-                                double retryIntervalMultiplier,
-                                long maxRetryInterval,
-                                int reconnectAttempts,
-                                boolean failoverOnServerShutdown,
-                                String groupID,
-                                Object[] jndiBindings) throws Exception;
-
-   /**
-    * Create a JMS ConnectionFactory with the specified name connected to a single live-backup pair of servers.
-    * <br>
-    * The ConnectionFactory is bound to JNDI for all the specified bindings Strings.
-    * <br>
-    * All parameters corresponds to the underlying ClientSessionFactory used by the factory.
-    * 
-    * @see #createConnectionFactory(String, Object[], Object[], Object[], Object[], Object[])
-    * @see ClientSessionFactory
-    */
-   void createConnectionFactory(@Parameter(name = "name") String name,
-                                @Parameter(name = "liveTransportClassNames", desc = "comma-separated list of class names for transport to live servers") String liveTransportClassNames,
-                                @Parameter(name = "liveTransportParams", desc = "comma-separated list of key=value parameters for the live transports (enclosed between { } for each transport)") String liveTransportParams,
-                                @Parameter(name = "backupTransportClassNames", desc = "comma-separated list of class names for transport to backup servers") String backupTransportClassNames,
-                                @Parameter(name = "backupTransportParams", desc = "comma-separated list of key=value parameters for the backup transports (enclosed between { } for each transport)") String backupTransportParams,
-                                @Parameter(name = "clientID") String clientID,
-                                @Parameter(name = "clientFailureCheckPeriod") long clientFailureCheckPeriod,
-                                @Parameter(name = "connectionTTL") long connectionTTL,
-                                @Parameter(name = "callTimeout") long callTimeout,
-                                @Parameter(name = "cacheLargemessageClient") boolean cacheLargeMessageClient,
-                                @Parameter(name = "minLargeMessageSize") int minLargeMessageSize,
-                                @Parameter(name = "consumerWindowSize") int consumerWindowSize,
-                                @Parameter(name = "consumerMaxRate") int consumerMaxRate,
-                                @Parameter(name = "confirmationWindowSize") int confirmationWindowSize,
-                                @Parameter(name = "producerWindowSize") int producerWindowSize,
-                                @Parameter(name = "producerMaxRate") int producerMaxRate,
-                                @Parameter(name = "blockOnAcknowledge") boolean blockOnAcknowledge,
-                                @Parameter(name = "blockOnDurableSend") boolean blockOnDurableSend,
-                                @Parameter(name = "blockOnNonDurableSend") boolean blockOnNonDurableSend,
-                                @Parameter(name = "autoGroup") boolean autoGroup,
-                                @Parameter(name = "preAcknowledge") boolean preAcknowledge,
-                                @Parameter(name = "loadBalancingPolicyClassName") String loadBalancingPolicyClassName,
-                                @Parameter(name = "transactionBatchSize") int transactionBatchSize,
-                                @Parameter(name = "dupsOKBatchSize") int dupsOKBatchSize,
-                                @Parameter(name = "useGlobalPools") boolean useGlobalPools,
-                                @Parameter(name = "scheduledThreadPoolMaxSize") int scheduledThreadPoolMaxSize,
-                                @Parameter(name = "threadPoolMaxSize") int threadPoolMaxSize,
-                                @Parameter(name = "retryInterval") long retryInterval,
-                                @Parameter(name = "retryIntervalMultiplier") double retryIntervalMultiplier,
-                                @Parameter(name = "maxRetryInterval") long maxRetryInterval,
-                                @Parameter(name = "reconnectAttempts") int reconnectAttempts,
-                                @Parameter(name = "failoverOnServerShutdown") boolean failoverOnServerShutdown,
-                                @Parameter(name = "groupID") String groupID,
-                                @Parameter(name = "jndiBindings", desc = "comma-separated list of JNDI bindings") String jndiBindings) throws Exception;
-
-   /**
     * Create a JMS ConnectionFactory with the specified name using a discovery group to discover HornetQ servers.
     * <br>
     * The ConnectionFactory is bound to JNDI for all the specified bindings Strings.
     * <br>
     * This factory listens to the specified {@code discoveryAddress} and {@code discoveryPort} to discover which servers it can connect to.
-    * <br>
-    * Connections created by this ConnectionFactory will have their ClientID set to the specified ClientID.
     * 
-    * @see #createConnectionFactory(String, Object[], Object[], Object[], Object[], Object[])
+    * @see #createConnectionFactory(String, Object[], Object[], Object[], Object[])
     */
    void createConnectionFactory(String name,
                                 String discoveryAddress,
                                 int discoveryPort,
-                                String clientID,
                                 Object[] bindings) throws Exception;
 
    /**
@@ -273,191 +156,16 @@
     * The ConnectionFactory is bound to JNDI for the specified bindings Strings
     * <br>
     * This factory listens to the specified {@code discoveryAddress} and {@code discoveryPort} to discover which servers it can connect to.
-    * <br>
-    * Connections created by this ConnectionFactory will have their ClientID set to the specified ClientID.
     * 
-    * @see #createConnectionFactory(String, Object[], Object[], Object[], Object[], Object[])
+    * @see #createConnectionFactory(String, Object[], Object[], Object[], Object[])
     */
    @Operation(desc = "Create a JMS ConnectionFactory", impact = MBeanOperationInfo.ACTION)
    void createConnectionFactory(@Parameter(name = "name") String name,
                                 @Parameter(name = "discoveryAddress") String discoveryAddress,
                                 @Parameter(name = "discoveryPort") int discoveryPort,
-                                @Parameter(name = "clientID") String clientID,
                                 @Parameter(name = "jndiBindings") String jndiBindings) throws Exception;
 
    /**
-    * Create a JMS ConnectionFactory with the specified name using a discovery group to discover HornetQ servers.
-    * <br>
-    * The ConnectionFactory is bound to JNDI for all the specified bindings Strings.
-    * <br>
-    * This factory listens to the specified {@code discoveryAddress} and {@code discoveryPort} to discover which servers it can connect to.
-    * <br>
-    * All parameters corresponds to the underlying ClientSessionFactory used by the factory.
-    * 
-    * @see ClientSessionFactory
-    */
-   void createConnectionFactory(String name,
-                                String discoveryAddress,
-                                int discoveryPort,
-                                String clientID,
-                                long discoveryRefreshTimeout,
-                                long clientFailureCheckPeriod,
-                                long connectionTTL,
-                                long callTimeout,
-                                boolean cacheLargeMessageClient,
-                                int minLargeMessageSize,
-                                int consumerWindowSize,
-                                int consumerMaxRate,
-                                int confirmationWindowSize,
-                                int producerWindowSize,
-                                int producerMaxRate,
-                                boolean blockOnAcknowledge,
-                                boolean blockOnDurableSend,
-                                boolean blockOnNonDurableSend,
-                                boolean autoGroup,
-                                boolean preAcknowledge,
-                                String loadBalancingPolicyClassName,
-                                int transactionBatchSize,
-                                int dupsOKBatchSize,
-                                long initialWaitTimeout,
-                                boolean useGlobalPools,
-                                int scheduledThreadPoolMaxSize,
-                                int threadPoolMaxSize,
-                                long retryInterval,
-                                double retryIntervalMultiplier,
-                                long maxRetryInterval,
-                                int reconnectAttempts,
-                                boolean failoverOnServerShutdown,
-                                String groupID,
-                                Object[] jndiBindings) throws Exception;
-
-   /**
-    * Create a JMS ConnectionFactory with the specified name using a discovery group to discover HornetQ servers.
-    * <br>
-    * The ConnectionFactory is bound to JNDI for all the specified comma-separated bindings.
-    * <br>
-    * This factory listens to the specified {@code discoveryAddress} and {@code discoveryPort} to discover which servers it can connect to.
-    * <br>
-    * All parameters corresponds to the underlying ClientSessionFactory used by the factory.
-    * 
-    * @see ClientSessionFactory
-    */
-   @Operation(desc = "Create a JMS ConnectionFactory", impact = MBeanOperationInfo.ACTION)
-   void createConnectionFactory(@Parameter(name = "name") String name,
-                                @Parameter(name = "discoveryAddress") String discoveryAddress,
-                                @Parameter(name = "discoveryPort") int discoveryPort,
-                                @Parameter(name = "clientID") String clientID,
-                                @Parameter(name = "discoveryRefreshTimeout") long discoveryRefreshTimeout,
-                                @Parameter(name = "clientFailureCheckPeriod") long clientFailureCheckPeriod,
-                                @Parameter(name = "connectionTTL") long connectionTTL,
-                                @Parameter(name = "callTimeout") long callTimeout,
-                                @Parameter(name = "cacheLargemessageClient") boolean cacheLargeMessageClient,
-                                @Parameter(name = "minLargeMessageSize") int minLargeMessageSize,
-                                @Parameter(name = "consumerWindowSize") int consumerWindowSize,
-                                @Parameter(name = "consumerMaxRate") int consumerMaxRate,
-                                @Parameter(name = "confirmationWindowSize") int confirmationWindowSize,
-                                @Parameter(name = "producerWindowSize") int producerWindowSize,
-                                @Parameter(name = "producerMaxRate") int producerMaxRate,
-                                @Parameter(name = "blockOnAcknowledge") boolean blockOnAcknowledge,
-                                @Parameter(name = "blockOnDurableSend") boolean blockOnDurableSend,
-                                @Parameter(name = "blockOnNonDurableSend") boolean blockOnNonDurableSend,
-                                @Parameter(name = "autoGroup") boolean autoGroup,
-                                @Parameter(name = "preAcknowledge") boolean preAcknowledge,
-                                @Parameter(name = "loadBalancingPolicyClassName") String loadBalancingPolicyClassName,
-                                @Parameter(name = "transactionBatchSize") int transactionBatchSize,
-                                @Parameter(name = "dupsOKBatchSize") int dupsOKBatchSize,
-                                @Parameter(name = "initialWaitTimeout") long initialWaitTimeout,
-                                @Parameter(name = "useGlobalPools") boolean useGlobalPools,
-                                @Parameter(name = "scheduledThreadPoolMaxSize") int scheduledThreadPoolMaxSize,
-                                @Parameter(name = "threadPoolMaxSize") int threadPoolMaxSize,
-                                @Parameter(name = "retryInterval") long retryInterval,
-                                @Parameter(name = "retryIntervalMultiplier") double retryIntervalMultiplier,
-                                @Parameter(name = "maxRetryInterval") long maxRetryInterval,
-                                @Parameter(name = "reconnectAttempts") int reconnectAttempts,
-                                @Parameter(name = "failoverOnServerShutdown") boolean failoverOnServerShutdown,
-                                @Parameter(name = "groupID") String groupID,
-                                @Parameter(name = "jndiBindings", desc = "comma-separated list of JNDI bindings") String jndiBindings) throws Exception;
-
-   /**
-    * Create a JMS ConnectionFactory with the specified name connected to a single HornetQ server.
-    * <br>
-    * The ConnectionFactory is bound to JNDI for all the specified bindings.
-    */
-   void createConnectionFactory(String name,
-                                String liveTransportClassName,
-                                Map<String, Object> liveTransportParams,
-                                Object[] jndiBindings) throws Exception;
-
-   /**
-    * Create a JMS ConnectionFactory with the specified name connected to a single HornetQ server.
-    * <br>
-    * The ConnectionFactory is bound to JNDI for all the specified comma-separated bindings.
-    * <br>
-    * The {@code liveTransportParams} is a  comma-separated list of key=value for the transport parameters corresponding to the {@code TransportConfiguration} parameters.
-    */
-   @Operation(desc = "Create a JMS ConnectionFactory", impact = MBeanOperationInfo.ACTION)
-   void createConnectionFactory(@Parameter(name = "name") String name,
-                                @Parameter(name = "liveTransportClassName") String liveTransportClassName,
-                                @Parameter(name = "liveTransportParams", desc = "comma-separated list of key=value for the transport parameters") String liveTransportParams,
-                                @Parameter(name = "jndiBindings", desc = "comma-separated list of JNDI bindings") String jndiBindings) throws Exception;
-
-   /**
-    * Create a JMS ConnectionFactory with the specified name connected to a single HornetQ server.
-    * <br>
-    * The ConnectionFactory is bound to JNDI for all the specified comma-separated bindings.
-    * <br>
-    * Connections created by this ConnectionFactory will have their ClientID set to the specified ClientID.
-    */
-   void createConnectionFactory(String name,
-                                String liveTransportClassName,
-                                Map<String, Object> liveTransportParams,
-                                String clientID,
-                                Object[] jndiBindings) throws Exception;
-
-   /**
-    * Create a JMS ConnectionFactory with the specified name connected to a single HornetQ server.
-    * <br>
-    * The ConnectionFactory is bound to JNDI for all the specified comma-separated bindings.
-    * <br>
-    * The {@code liveTransportParams} is a  comma-separated list of key=value for the transport parameters corresponding to the {@code TransportConfiguration} parameters.
-    * <br>
-    * Connections created by this ConnectionFactory will have their ClientID set to the specified ClientID.
-    */
-   @Operation(desc = "Create a JMS ConnectionFactory", impact = MBeanOperationInfo.ACTION)
-   void createConnectionFactory(@Parameter(name = "name") String name,
-                                @Parameter(name = "liveTransportClassName") String liveTransportClassName,
-                                @Parameter(name = "liveTransportParams", desc = "comma-separated list of key=value for the transport parameters") String liveTransportParams,
-                                @Parameter(name = "clientID") String clientID,
-                                @Parameter(name = "jndiBindings", desc = "comma-separated list of JNDI bindings") String jndiBindings) throws Exception;
-
-   /**
-    * Create a JMS ConnectionFactory with the specified name connected to a static list of live-backup HornetQ servers.
-    * <br>
-    * The ConnectionFactory is bound to JNDI for all the specified comma-separated bindings.
-    */
-   void createConnectionFactory(String name,
-                                String liveTransportClassName,
-                                Map<String, Object> liveTransportParams,
-                                String backupTransportClassName,
-                                Map<String, Object> backupTransportParams,
-                                Object[] jndiBindings) throws Exception;
-
-   /**
-    * Create a JMS ConnectionFactory with the specified name connected to a static list of live-backup HornetQ servers.
-    * <br>
-    * The ConnectionFactory is bound to JNDI for all the specified comma-separated bindings.
-    * <br>
-    * Connections created by this ConnectionFactory will have their ClientID set to the specified ClientID.
-    */
-   void createConnectionFactory(String name,
-                                String liveTransportClassName,
-                                Map<String, Object> liveTransportParams,
-                                String backupTransportClassName,
-                                Map<String, Object> backupTransportParams,
-                                String clientID,
-                                Object[] jndiBindings) throws Exception;
-
-   /**
     * Destroy the ConnectionFactory corresponding to the specified name.
     */
    @Operation(desc = "Destroy a JMS ConnectionFactory", impact = MBeanOperationInfo.ACTION)

Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java	2010-02-18 23:12:11 UTC (rev 8889)
+++ trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java	2010-02-20 10:17:41 UTC (rev 8890)
@@ -19,6 +19,9 @@
 import javax.management.NotCompliantMBeanException;
 import javax.management.StandardMBean;
 
+import org.hornetq.api.core.Pair;
+import org.hornetq.api.core.TransportConfiguration;
+import org.hornetq.api.core.client.ClientSessionFactory;
 import org.hornetq.jms.client.HornetQConnectionFactory;
 import org.hornetq.api.jms.management.ConnectionFactoryControl;
 import org.hornetq.core.management.impl.MBeanInfoHelper;
@@ -74,6 +77,246 @@
       return cf.getClientFailureCheckPeriod();
    }
 
+   public long getDiscoveryRefreshTimeout()
+   {
+      return cf.getDiscoveryRefreshTimeout();
+   }
+
+   public String getConnectionLoadBalancingPolicyClassName()
+   {
+      return cf.getConnectionLoadBalancingPolicyClassName();
+   }
+
+   public void setDiscoveryRefreshTimeout(long discoveryRefreshTimeout)
+   {
+      cf.setDiscoveryRefreshTimeout(discoveryRefreshTimeout);
+   }
+
+   public long getDiscoveryInitialWaitTimeout()
+   {
+      return cf.getDiscoveryInitialWaitTimeout();
+   }
+
+   public void setDiscoveryInitialWaitTimeout(long discoveryInitialWaitTimeout)
+   {
+      cf.setDiscoveryInitialWaitTimeout(discoveryInitialWaitTimeout);
+   }
+
+   public void setClientID(String clientID)
+   {
+      cf.setClientID(clientID);
+   }
+
+   public void setDupsOKBatchSize(int dupsOKBatchSize)
+   {
+      cf.setDupsOKBatchSize(dupsOKBatchSize);
+   }
+
+   public void setTransactionBatchSize(int transactionBatchSize)
+   {
+      cf.setTransactionBatchSize(transactionBatchSize);
+   }
+
+   public void setClientFailureCheckPeriod(long clientFailureCheckPeriod)
+   {
+      cf.setClientFailureCheckPeriod(clientFailureCheckPeriod);
+   }
+
+   public void setConnectionTTL(long connectionTTL)
+   {
+      cf.setConnectionTTL(connectionTTL);
+   }
+
+   public void setCallTimeout(long callTimeout)
+   {
+      cf.setCallTimeout(callTimeout);
+   }
+
+   public void setConsumerWindowSize(int consumerWindowSize)
+   {
+      cf.setConsumerWindowSize(consumerWindowSize);
+   }
+
+   public void setConsumerMaxRate(int consumerMaxRate)
+   {
+      cf.setConsumerMaxRate(consumerMaxRate);
+   }
+
+   public void setConfirmationWindowSize(int confirmationWindowSize)
+   {
+      cf.setConfirmationWindowSize(confirmationWindowSize);
+   }
+
+   public void setProducerMaxRate(int producerMaxRate)
+   {
+      cf.setProducerMaxRate(producerMaxRate);
+   }
+
+   public int getProducerWindowSize()
+   {
+      return cf.getProducerWindowSize();
+   }
+
+   public void setProducerWindowSize(int producerWindowSize)
+   {
+      cf.setProducerWindowSize(producerWindowSize);
+   }
+
+   public void setCacheLargeMessagesClient(boolean cacheLargeMessagesClient)
+   {
+      cf.setCacheLargeMessagesClient(cacheLargeMessagesClient);
+   }
+
+   public boolean isCacheLargeMessagesClient()
+   {
+      return cf.isCacheLargeMessagesClient();
+   }
+
+   public void setMinLargeMessageSize(int minLargeMessageSize)
+   {
+      cf.setMinLargeMessageSize(minLargeMessageSize);
+   }
+
+   public void setBlockOnNonDurableSend(boolean blockOnNonDurableSend)
+   {
+      cf.setBlockOnNonDurableSend(blockOnNonDurableSend);
+   }
+
+   public void setBlockOnAcknowledge(boolean blockOnAcknowledge)
+   {
+      cf.setBlockOnAcknowledge(blockOnAcknowledge);
+   }
+
+   public void setBlockOnDurableSend(boolean blockOnDurableSend)
+   {
+      cf.setBlockOnDurableSend(blockOnDurableSend);
+   }
+
+   public void setAutoGroup(boolean autoGroup)
+   {
+      cf.setAutoGroup(autoGroup);
+   }
+
+   public void setPreAcknowledge(boolean preAcknowledge)
+   {
+      cf.setPreAcknowledge(preAcknowledge);
+   }
+
+   public void setMaxRetryInterval(long retryInterval)
+   {
+      cf.setMaxRetryInterval(retryInterval);
+   }
+
+   public void setRetryIntervalMultiplier(double retryIntervalMultiplier)
+   {
+      cf.setRetryIntervalMultiplier(retryIntervalMultiplier);
+   }
+
+   public void setReconnectAttempts(int reconnectAttempts)
+   {
+      cf.setReconnectAttempts(reconnectAttempts);
+   }
+
+   public void setFailoverOnServerShutdown(boolean failoverOnServerShutdown)
+   {
+      cf.setFailoverOnServerShutdown(failoverOnServerShutdown);
+   }
+
+   public boolean isUseGlobalPools()
+   {
+      return cf.isUseGlobalPools();
+   }
+
+   public void setScheduledThreadPoolMaxSize(int scheduledThreadPoolMaxSize)
+   {
+      cf.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize);
+   }
+
+   public int getThreadPoolMaxSize()
+   {
+      return cf.getThreadPoolMaxSize();
+   }
+
+   public void setThreadPoolMaxSize(int threadPoolMaxSize)
+   {
+      cf.setThreadPoolMaxSize(threadPoolMaxSize);
+   }
+
+   public int getInitialMessagePacketSize()
+   {
+      return cf.getInitialMessagePacketSize();
+   }
+
+   public void setGroupID(String groupID)
+   {
+      cf.setGroupID(groupID);
+   }
+
+   public String getGroupID()
+   {
+      return cf.getGroupID();
+   }
+
+   public void setInitialMessagePacketSize(int size)
+   {
+      cf.setInitialMessagePacketSize(size);
+   }
+
+   public void setUseGlobalPools(boolean useGlobalPools)
+   {
+      cf.setUseGlobalPools(useGlobalPools);
+   }
+
+   public int getScheduledThreadPoolMaxSize()
+   {
+      return cf.getScheduledThreadPoolMaxSize();
+   }
+
+   public void setRetryInterval(long retryInterval)
+   {
+      cf.setRetryInterval(retryInterval);
+   }
+
+   public long getMaxRetryInterval()
+   {
+      return cf.getMaxRetryInterval();
+   }
+
+   public void setConnectionLoadBalancingPolicyClassName(String connectionLoadBalancingPolicyClassName)
+   {
+      cf.setConnectionLoadBalancingPolicyClassName(connectionLoadBalancingPolicyClassName);
+   }
+
+   public List<Pair<TransportConfiguration, TransportConfiguration>> getStaticConnectors()
+   {
+      return cf.getStaticConnectors();
+   }
+
+   public void setStaticConnectors(List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors)
+   {
+      cf.setStaticConnectors(staticConnectors);
+   }
+
+   public String getDiscoveryAddress()
+   {
+      return cf.getDiscoveryAddress();
+   }
+
+   public void setDiscoveryAddress(String discoveryAddress)
+   {
+      cf.setDiscoveryAddress(discoveryAddress);
+   }
+
+   public int getDiscoveryPort()
+   {
+      return cf.getDiscoveryPort();
+   }
+
+   public void setDiscoveryPort(int discoveryPort)
+   {
+      cf.setDiscoveryPort(discoveryPort);
+   }
+
    public long getCallTimeout()
    {
       return cf.getCallTimeout();
@@ -144,7 +387,7 @@
       return cf.isFailoverOnServerShutdown();
    }
 
-   public long getMinLargeMessageSize()
+   public int getMinLargeMessageSize()
    {
       return cf.getMinLargeMessageSize();
    }
@@ -159,7 +402,7 @@
       return cf.getRetryIntervalMultiplier();
    }
 
-   public long getTransactionBatchSize()
+   public int getTransactionBatchSize()
    {
       return cf.getTransactionBatchSize();
    }

Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java	2010-02-18 23:12:11 UTC (rev 8889)
+++ trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java	2010-02-20 10:17:41 UTC (rev 8890)
@@ -148,56 +148,33 @@
    // Public --------------------------------------------------------
 
    // JMSServerControlMBean implementation --------------------------
-
    public void createConnectionFactory(final String name,
-                                       final Object[] liveConnectorsTransportClassNames,
-                                       final Object[] liveConnectorTransportParams,
-                                       final Object[] backupConnectorsTransportClassNames,
-                                       final Object[] backupConnectorTransportParams,
+                                       final String liveTransportClassName,
+                                       final Map<String, Object> liveTransportParams,
                                        final Object[] jndiBindings) throws Exception
    {
-      List<Pair<TransportConfiguration, TransportConfiguration>> pairs = JMSServerControlImpl.convertToConnectorPairs(liveConnectorsTransportClassNames,
-                                                                                                                      liveConnectorTransportParams,
-                                                                                                                      backupConnectorsTransportClassNames,
-                                                                                                                      backupConnectorTransportParams);
       List<String> jndiBindingsList = JMSServerControlImpl.convert(jndiBindings);
+      TransportConfiguration liveTC = new TransportConfiguration(liveTransportClassName, liveTransportParams);
 
-      server.createConnectionFactory(name, pairs, jndiBindingsList);
+      server.createConnectionFactory(name, liveTC, jndiBindingsList);
 
       sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
    }
 
    public void createConnectionFactory(final String name,
-                                       final String liveTransportClassNames,
-                                       final String liveTransportParams,
-                                       final String backupTransportClassNames,
-                                       final String backupTransportParams,
-                                       final String jndiBindings) throws Exception
-   {
-      Object[] liveClassNames = JMSServerControlImpl.toArray(liveTransportClassNames);
-      Object[] liveParams = ManagementHelper.fromCommaSeparatedArrayOfCommaSeparatedKeyValues(liveTransportParams);
-      Object[] backupClassNames = JMSServerControlImpl.toArray(backupTransportClassNames);
-      Object[] backupParams = ManagementHelper.fromCommaSeparatedArrayOfCommaSeparatedKeyValues(backupTransportParams);;
-      Object[] bindings = JMSServerControlImpl.toArray(jndiBindings);
-      createConnectionFactory(name, liveClassNames, liveParams, backupClassNames, backupParams, bindings);
-   }
-
-   public void createConnectionFactory(final String name,
                                        final Object[] liveConnectorsTransportClassNames,
                                        final Object[] liveConnectorTransportParams,
                                        final Object[] backupConnectorsTransportClassNames,
                                        final Object[] backupConnectorTransportParams,
-                                       final String clientID,
                                        final Object[] jndiBindings) throws Exception
    {
       List<Pair<TransportConfiguration, TransportConfiguration>> pairs = JMSServerControlImpl.convertToConnectorPairs(liveConnectorsTransportClassNames,
                                                                                                                       liveConnectorTransportParams,
                                                                                                                       backupConnectorsTransportClassNames,
                                                                                                                       backupConnectorTransportParams);
-
       List<String> jndiBindingsList = JMSServerControlImpl.convert(jndiBindings);
 
-      server.createConnectionFactory(name, pairs, clientID, jndiBindingsList);
+      server.createConnectionFactory(name, pairs, jndiBindingsList);
 
       sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
    }
@@ -207,7 +184,6 @@
                                        final String liveTransportParams,
                                        final String backupTransportClassNames,
                                        final String backupTransportParams,
-                                       final String clientID,
                                        final String jndiBindings) throws Exception
    {
       Object[] liveClassNames = JMSServerControlImpl.toArray(liveTransportClassNames);
@@ -215,173 +191,19 @@
       Object[] backupClassNames = JMSServerControlImpl.toArray(backupTransportClassNames);
       Object[] backupParams = ManagementHelper.fromCommaSeparatedArrayOfCommaSeparatedKeyValues(backupTransportParams);;
       Object[] bindings = JMSServerControlImpl.toArray(jndiBindings);
-
-      createConnectionFactory(name, liveClassNames, liveParams, backupClassNames, backupParams, clientID, bindings);
+      createConnectionFactory(name, liveClassNames, liveParams, backupClassNames, backupParams, bindings);
    }
 
-   public void createConnectionFactory(final String name,
-                                       final Object[] liveConnectorsTransportClassNames,
-                                       final Object[] liveConnectorTransportParams,
-                                       final Object[] backupConnectorsTransportClassNames,
-                                       final Object[] backupConnectorTransportParams,
-                                       final String clientID,
-                                       final long clientFailureCheckPeriod,
-                                       final long connectionTTL,
-                                       final long callTimeout,
-                                       final boolean cacheLargeMessageClient,
-                                       final int minLargeMessageSize,
-                                       final int consumerWindowSize,
-                                       final int consumerMaxRate,
-                                       final int confirmationWindowSize,
-                                       final int producerWindowSize,
-                                       final int producerMaxRate,
-                                       final boolean blockOnAcknowledge,
-                                       final boolean blockOnDurableSend,
-                                       final boolean blockOnNonDurableSend,
-                                       final boolean autoGroup,
-                                       final boolean preAcknowledge,
-                                       final String loadBalancingPolicyClassName,
-                                       final int transactionBatchSize,
-                                       final int dupsOKBatchSize,
-                                       final boolean useGlobalPools,
-                                       final int scheduledThreadPoolMaxSize,
-                                       final int threadPoolMaxSize,
-                                       final long retryInterval,
-                                       final double retryIntervalMultiplier,
-                                       final long maxRetryInterval,
-                                       final int reconnectAttempts,
-                                       final boolean failoverOnServerShutdown,
-                                       final String groupID,
-                                       final Object[] jndiBindings) throws Exception
-   {
-      List<Pair<TransportConfiguration, TransportConfiguration>> pairs = JMSServerControlImpl.convertToConnectorPairs(liveConnectorsTransportClassNames,
-                                                                                                                      liveConnectorTransportParams,
-                                                                                                                      backupConnectorsTransportClassNames,
-                                                                                                                      backupConnectorTransportParams);
 
-      List<String> jndiBindingsList = JMSServerControlImpl.convert(jndiBindings);
 
-      server.createConnectionFactory(name,
-                                     pairs,
-                                     clientID,
-                                     clientFailureCheckPeriod,
-                                     connectionTTL,
-                                     callTimeout,
-                                     cacheLargeMessageClient,
-                                     minLargeMessageSize,
-                                     consumerWindowSize,
-                                     consumerMaxRate,
-                                     confirmationWindowSize,
-                                     producerWindowSize,
-                                     producerMaxRate,
-                                     blockOnAcknowledge,
-                                     blockOnDurableSend,
-                                     blockOnNonDurableSend,
-                                     autoGroup,
-                                     preAcknowledge,
-                                     loadBalancingPolicyClassName,
-                                     transactionBatchSize,
-                                     dupsOKBatchSize,
-                                     useGlobalPools,
-                                     scheduledThreadPoolMaxSize,
-                                     threadPoolMaxSize,
-                                     retryInterval,
-                                     retryIntervalMultiplier,
-                                     maxRetryInterval,
-                                     reconnectAttempts,
-                                     failoverOnServerShutdown,
-                                     groupID,
-                                     jndiBindingsList);
-
-      sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
-   }
-
    public void createConnectionFactory(final String name,
-                                       final String liveTransportClassNames,
-                                       final String liveTransportParams,
-                                       final String backupTransportClassNames,
-                                       final String backupTransportParams,
-                                       final String clientID,
-                                       final long clientFailureCheckPeriod,
-                                       final long connectionTTL,
-                                       final long callTimeout,
-                                       final boolean cacheLargeMessageClient,
-                                       final int minLargeMessageSize,
-                                       final int consumerWindowSize,
-                                       final int consumerMaxRate,
-                                       final int confirmationWindowSize,
-                                       final int producerWindowSize,
-                                       final int producerMaxRate,
-                                       final boolean blockOnAcknowledge,
-                                       final boolean blockOnDurableSend,
-                                       final boolean blockOnNonDurableSend,
-                                       final boolean autoGroup,
-                                       final boolean preAcknowledge,
-                                       final String loadBalancingPolicyClassName,
-                                       final int transactionBatchSize,
-                                       final int dupsOKBatchSize,
-                                       final boolean useGlobalPools,
-                                       final int scheduledThreadPoolMaxSize,
-                                       final int threadPoolMaxSize,
-                                       final long retryInterval,
-                                       final double retryIntervalMultiplier,
-                                       final long maxRetryInterval,
-                                       final int reconnectAttempts,
-                                       final boolean failoverOnServerShutdown,
-                                       final String groupID,
-                                       final String jndiBindings) throws Exception
-   {
-      Object[] liveClassNames = JMSServerControlImpl.toArray(liveTransportClassNames);
-      Object[] liveParams = ManagementHelper.fromCommaSeparatedArrayOfCommaSeparatedKeyValues(liveTransportParams);
-      Object[] backupClassNames = JMSServerControlImpl.toArray(backupTransportClassNames);
-      Object[] backupParams = ManagementHelper.fromCommaSeparatedArrayOfCommaSeparatedKeyValues(backupTransportParams);
-      Object[] bindings = JMSServerControlImpl.toArray(jndiBindings);
-
-      createConnectionFactory(name,
-                              liveClassNames,
-                              liveParams,
-                              backupClassNames,
-                              backupParams,
-                              clientID,
-                              clientFailureCheckPeriod,
-                              connectionTTL,
-                              callTimeout,
-                              cacheLargeMessageClient,
-                              minLargeMessageSize,
-                              consumerWindowSize,
-                              consumerMaxRate,
-                              confirmationWindowSize,
-                              producerWindowSize,
-                              producerMaxRate,
-                              blockOnAcknowledge,
-                              blockOnDurableSend,
-                              blockOnNonDurableSend,
-                              autoGroup,
-                              preAcknowledge,
-                              loadBalancingPolicyClassName,
-                              transactionBatchSize,
-                              dupsOKBatchSize,
-                              useGlobalPools,
-                              scheduledThreadPoolMaxSize,
-                              threadPoolMaxSize,
-                              retryInterval,
-                              retryIntervalMultiplier,
-                              maxRetryInterval,
-                              reconnectAttempts,
-                              failoverOnServerShutdown,
-                              groupID,
-                              bindings);
-   }
-
-   public void createConnectionFactory(final String name,
                                        final String discoveryAddress,
                                        final int discoveryPort,
-                                       final String clientID,
                                        final Object[] jndiBindings) throws Exception
    {
       List<String> jndiBindingsList = JMSServerControlImpl.convert(jndiBindings);
 
-      server.createConnectionFactory(name, discoveryAddress, discoveryPort, clientID, jndiBindingsList);
+      server.createConnectionFactory(name, discoveryAddress, discoveryPort, jndiBindingsList);
 
       sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
    }
@@ -389,250 +211,14 @@
    public void createConnectionFactory(final String name,
                                        final String discoveryAddress,
                                        final int discoveryPort,
-                                       final String clientID,
                                        final String jndiBindings) throws Exception
    {
       Object[] bindings = JMSServerControlImpl.toArray(jndiBindings);
 
-      createConnectionFactory(name, discoveryAddress, discoveryPort, clientID, bindings);
+      createConnectionFactory(name, discoveryAddress, discoveryPort, bindings);
    }
 
-   public void createConnectionFactory(final String name,
-                                       final String discoveryAddress,
-                                       final int discoveryPort,
-                                       final String clientID,
-                                       final long discoveryRefreshTimeout,
-                                       final long clientFailureCheckPeriod,
-                                       final long connectionTTL,
-                                       final long callTimeout,
-                                       final boolean cacheLargeMessageClient,
-                                       final int minLargeMessageSize,
-                                       final int consumerWindowSize,
-                                       final int consumerMaxRate,
-                                       final int confirmationWindowSize,
-                                       final int producerWindowSize,
-                                       final int producerMaxRate,
-                                       final boolean blockOnAcknowledge,
-                                       final boolean blockOnDurableSend,
-                                       final boolean blockOnNonDurableSend,
-                                       final boolean autoGroup,
-                                       final boolean preAcknowledge,
-                                       final String loadBalancingPolicyClassName,
-                                       final int transactionBatchSize,
-                                       final int dupsOKBatchSize,
-                                       final long initialWaitTimeout,
-                                       final boolean useGlobalPools,
-                                       final int scheduledThreadPoolMaxSize,
-                                       final int threadPoolMaxSize,
-                                       final long retryInterval,
-                                       final double retryIntervalMultiplier,
-                                       final long maxRetryInterval,
-                                       final int reconnectAttempts,
-                                       final boolean failoverOnServerShutdown,
-                                       final String groupID,
-                                       final Object[] jndiBindings) throws Exception
-   {
-      List<String> jndiBindingsList = JMSServerControlImpl.convert(jndiBindings);
 
-      server.createConnectionFactory(name,
-                                     discoveryAddress,
-                                     discoveryPort,
-                                     clientID,
-                                     discoveryRefreshTimeout,
-                                     clientFailureCheckPeriod,
-                                     connectionTTL,
-                                     callTimeout,
-                                     cacheLargeMessageClient,
-                                     minLargeMessageSize,
-                                     consumerWindowSize,
-                                     consumerMaxRate,
-                                     confirmationWindowSize,
-                                     producerWindowSize,
-                                     producerMaxRate,
-                                     blockOnAcknowledge,
-                                     blockOnDurableSend,
-                                     blockOnNonDurableSend,
-                                     autoGroup,
-                                     preAcknowledge,
-                                     loadBalancingPolicyClassName,
-                                     transactionBatchSize,
-                                     dupsOKBatchSize,
-                                     initialWaitTimeout,
-                                     useGlobalPools,
-                                     scheduledThreadPoolMaxSize,
-                                     threadPoolMaxSize,
-                                     retryInterval,
-                                     retryIntervalMultiplier,
-                                     maxRetryInterval,
-                                     reconnectAttempts,
-                                     failoverOnServerShutdown,
-                                     groupID,
-                                     jndiBindingsList);
-
-      sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
-   }
-
-   public void createConnectionFactory(final String name,
-                                       final String discoveryAddress,
-                                       final int discoveryPort,
-                                       final String clientID,
-                                       final long discoveryRefreshTimeout,
-                                       final long clientFailureCheckPeriod,
-                                       final long connectionTTL,
-                                       final long callTimeout,
-                                       final boolean cacheLargeMessageClient,
-                                       final int minLargeMessageSize,
-                                       final int consumerWindowSize,
-                                       final int consumerMaxRate,
-                                       final int confirmationWindowSize,
-                                       final int producerWindowSize,
-                                       final int producerMaxRate,
-                                       final boolean blockOnAcknowledge,
-                                       final boolean blockOnDurableSend,
-                                       final boolean blockOnNonDurableSend,
-                                       final boolean autoGroup,
-                                       final boolean preAcknowledge,
-                                       final String loadBalancingPolicyClassName,
-                                       final int transactionBatchSize,
-                                       final int dupsOKBatchSize,
-                                       final long initialWaitTimeout,
-                                       final boolean useGlobalPools,
-                                       final int scheduledThreadPoolMaxSize,
-                                       final int threadPoolMaxSize,
-                                       final long retryInterval,
-                                       final double retryIntervalMultiplier,
-                                       final long maxRetryInterval,
-                                       final int reconnectAttempts,
-                                       final boolean failoverOnServerShutdown,
-                                       final String groupID,
-                                       final String jndiBindings) throws Exception
-   {
-      Object[] bindings = JMSServerControlImpl.toArray(jndiBindings);
-
-      createConnectionFactory(name,
-                              discoveryAddress,
-                              discoveryPort,
-                              clientID,
-                              discoveryRefreshTimeout,
-                              clientFailureCheckPeriod,
-                              connectionTTL,
-                              callTimeout,
-                              cacheLargeMessageClient,
-                              minLargeMessageSize,
-                              consumerWindowSize,
-                              consumerMaxRate,
-                              confirmationWindowSize,
-                              producerWindowSize,
-                              producerMaxRate,
-                              blockOnAcknowledge,
-                              blockOnDurableSend,
-                              blockOnNonDurableSend,
-                              autoGroup,
-                              preAcknowledge,
-                              loadBalancingPolicyClassName,
-                              transactionBatchSize,
-                              dupsOKBatchSize,
-                              initialWaitTimeout,
-                              useGlobalPools,
-                              scheduledThreadPoolMaxSize,
-                              threadPoolMaxSize,
-                              retryInterval,
-                              retryIntervalMultiplier,
-                              maxRetryInterval,
-                              reconnectAttempts,
-                              failoverOnServerShutdown,
-                              groupID,
-                              bindings);
-   }
-
-   public void createConnectionFactory(final String name,
-                                       final String liveTransportClassName,
-                                       final Map<String, Object> liveTransportParams,
-                                       final Object[] jndiBindings) throws Exception
-   {
-      List<String> jndiBindingsList = JMSServerControlImpl.convert(jndiBindings);
-      TransportConfiguration liveTC = new TransportConfiguration(liveTransportClassName, liveTransportParams);
-
-      server.createConnectionFactory(name, liveTC, jndiBindingsList);
-
-      sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
-   }
-
-   public void createConnectionFactory(final String name,
-                                       final String liveTransportClassName,
-                                       final String liveTransportParams,
-                                       final String jndiBindings) throws Exception
-   {
-      Map<String, Object> params = ManagementHelper.fromCommaSeparatedKeyValues(liveTransportParams);
-      String[] bindings = JMSServerControlImpl.toArray(jndiBindings);
-
-      createConnectionFactory(name, liveTransportClassName, params, bindings);
-   }
-
-   public void createConnectionFactory(final String name,
-                                       final String liveTransportClassName,
-                                       final Map<String, Object> liveTransportParams,
-                                       final String clientID,
-                                       final Object[] jndiBindings) throws Exception
-   {
-      List<String> jndiBindingsList = JMSServerControlImpl.convert(jndiBindings);
-
-      TransportConfiguration liveTC = new TransportConfiguration(liveTransportClassName, liveTransportParams);
-
-      server.createConnectionFactory(name, liveTC, clientID, jndiBindingsList);
-
-      sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
-   }
-
-   public void createConnectionFactory(final String name,
-                                       final String liveTransportClassName,
-                                       final String liveTransportParams,
-                                       final String clientID,
-                                       final String jndiBindings) throws Exception
-   {
-      Map<String, Object> params = ManagementHelper.fromCommaSeparatedKeyValues(liveTransportParams);
-      String[] bindings = JMSServerControlImpl.toArray(jndiBindings);
-
-      createConnectionFactory(name, liveTransportClassName, params, clientID, bindings);
-   }
-
-   public void createConnectionFactory(final String name,
-                                       final String liveTransportClassName,
-                                       final Map<String, Object> liveTransportParams,
-                                       final String backupTransportClassName,
-                                       final Map<String, Object> backupTransportParams,
-                                       final Object[] jndiBindings) throws Exception
-   {
-      TransportConfiguration liveTC = new TransportConfiguration(liveTransportClassName, liveTransportParams);
-
-      TransportConfiguration backupTC = new TransportConfiguration(backupTransportClassName, backupTransportParams);
-
-      List<String> jndiBindingsList = JMSServerControlImpl.convert(jndiBindings);
-
-      server.createConnectionFactory(name, liveTC, backupTC, jndiBindingsList);
-
-      sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
-   }
-
-   public void createConnectionFactory(final String name,
-                                       final String liveTransportClassName,
-                                       final Map<String, Object> liveTransportParams,
-                                       final String backupTransportClassName,
-                                       final Map<String, Object> backupTransportParams,
-                                       final String clientID,
-                                       final Object[] jndiBindings) throws Exception
-   {
-      TransportConfiguration liveTC = new TransportConfiguration(liveTransportClassName, liveTransportParams);
-
-      TransportConfiguration backupTC = new TransportConfiguration(backupTransportClassName, backupTransportParams);
-
-      List<String> jndiBindingsList = JMSServerControlImpl.convert(jndiBindings);
-
-      server.createConnectionFactory(name, liveTC, backupTC, clientID, jndiBindingsList);
-
-      sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
-   }
-
    public boolean createQueue(final String name, final String jndiBinding) throws Exception
    {
       boolean created = server.createQueue(name, jndiBinding, null, true);

Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java	2010-02-18 23:12:11 UTC (rev 8889)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java	2010-02-20 10:17:41 UTC (rev 8890)
@@ -208,99 +208,6 @@
       Assert.assertEquals(0, control.getTopicNames().length);
    }
 
-   public void testCreateConnectionFactory_1() throws Exception
-   {
-      doCreateConnectionFactory(new ConnectionFactoryCreator()
-      {
-         public void createConnectionFactory(final JMSServerControl control,
-                                             final String cfName,
-                                             final Object[] bindings) throws Exception
-         {
-            TransportConfiguration tcLive = new TransportConfiguration(InVMConnectorFactory.class.getName());
-
-            control.createConnectionFactory(cfName, tcLive.getFactoryClassName(), tcLive.getParams(), bindings);
-         }
-      });
-   }
-
-   public void testCreateConnectionFactory_1b() throws Exception
-   {
-      doCreateConnectionFactory(new ConnectionFactoryCreator()
-      {
-         public void createConnectionFactory(final JMSServerControl control,
-                                             final String cfName,
-                                             final Object[] bindings) throws Exception
-         {
-            String jndiBindings = JMSServerControlTest.toCSV(bindings);
-            String params = "\"" + TransportConstants.SERVER_ID_PROP_NAME + "\"=1";
-
-            control.createConnectionFactory(cfName, InVMConnectorFactory.class.getName(), params, jndiBindings);
-         }
-      });
-   }
-
-   public void testCreateConnectionFactory_2() throws Exception
-   {
-      doCreateConnectionFactory(new ConnectionFactoryCreator()
-      {
-         public void createConnectionFactory(final JMSServerControl control,
-                                             final String cfName,
-                                             final Object[] bindings) throws Exception
-         {
-            String clientID = RandomUtil.randomString();
-            TransportConfiguration tcLive = new TransportConfiguration(InVMConnectorFactory.class.getName());
-
-            control.createConnectionFactory(cfName,
-                                            tcLive.getFactoryClassName(),
-                                            tcLive.getParams(),
-                                            clientID,
-                                            bindings);
-         }
-      });
-   }
-
-   public void testCreateConnectionFactory_2b() throws Exception
-   {
-      doCreateConnectionFactory(new ConnectionFactoryCreator()
-      {
-         public void createConnectionFactory(final JMSServerControl control,
-                                             final String cfName,
-                                             final Object[] bindings) throws Exception
-         {
-            String clientID = RandomUtil.randomString();
-            String jndiBindings = JMSServerControlTest.toCSV(bindings);
-            String params = "\"" + TransportConstants.SERVER_ID_PROP_NAME + "\"=1";
-
-            control.createConnectionFactory(cfName,
-                                            InVMConnectorFactory.class.getName(),
-                                            params,
-                                            clientID,
-                                            jndiBindings);
-         }
-      });
-   }
-
-   public void testCreateConnectionFactory_3() throws Exception
-   {
-      doCreateConnectionFactory(new ConnectionFactoryCreator()
-      {
-         public void createConnectionFactory(final JMSServerControl control,
-                                             final String cfName,
-                                             final Object[] bindings) throws Exception
-         {
-            TransportConfiguration tcLive = new TransportConfiguration(InVMConnectorFactory.class.getName());
-            TransportConfiguration tcBackup = new TransportConfiguration(InVMConnectorFactory.class.getName());
-
-            control.createConnectionFactory(cfName,
-                                            tcLive.getFactoryClassName(),
-                                            tcLive.getParams(),
-                                            tcBackup.getFactoryClassName(),
-                                            tcBackup.getParams(),
-                                            bindings);
-         }
-      });
-   }
-
    public void testCreateConnectionFactory_3b() throws Exception
    {
       doCreateConnectionFactory(new ConnectionFactoryCreator()
@@ -344,52 +251,7 @@
       });
    }
 
-   public void testCreateConnectionFactory_4() throws Exception
-   {
-      doCreateConnectionFactory(new ConnectionFactoryCreator()
-      {
-         public void createConnectionFactory(final JMSServerControl control,
-                                             final String cfName,
-                                             final Object[] bindings) throws Exception
-         {
-            String clientID = RandomUtil.randomString();
-            TransportConfiguration tcLive = new TransportConfiguration(InVMConnectorFactory.class.getName());
-            TransportConfiguration tcBackup = new TransportConfiguration(InVMConnectorFactory.class.getName());
 
-            control.createConnectionFactory(cfName,
-                                            tcLive.getFactoryClassName(),
-                                            tcLive.getParams(),
-                                            tcBackup.getFactoryClassName(),
-                                            tcBackup.getParams(),
-                                            clientID,
-                                            bindings);
-         }
-      });
-   }
-
-   // with 1 live and 1 backup
-   public void testCreateConnectionFactory_4b() throws Exception
-   {
-      doCreateConnectionFactory(new ConnectionFactoryCreator()
-      {
-         public void createConnectionFactory(final JMSServerControl control,
-                                             final String cfName,
-                                             final Object[] bindings) throws Exception
-         {
-            String clientID = RandomUtil.randomString();
-            String jndiBindings = JMSServerControlTest.toCSV(bindings);
-
-            control.createConnectionFactory(cfName,
-                                            InVMConnectorFactory.class.getName(),
-                                            TransportConstants.SERVER_ID_PROP_NAME + "=0",
-                                            InVMConnectorFactory.class.getName(),
-                                            TransportConstants.SERVER_ID_PROP_NAME + "=1",
-                                            clientID,
-                                            jndiBindings);
-         }
-      });
-   }
-
    public void testCreateConnectionFactory_5() throws Exception
    {
       doCreateConnectionFactory(new ConnectionFactoryCreator()
@@ -411,217 +273,9 @@
       });
    }
 
-   public void testCreateConnectionFactory_6() throws Exception
-   {
-      doCreateConnectionFactory(new ConnectionFactoryCreator()
-      {
-         public void createConnectionFactory(final JMSServerControl control,
-                                             final String cfName,
-                                             final Object[] bindings) throws Exception
-         {
-            String clientID = RandomUtil.randomString();
-            TransportConfiguration tcLive = new TransportConfiguration(InVMConnectorFactory.class.getName());
-            TransportConfiguration tcBackup = new TransportConfiguration(InVMConnectorFactory.class.getName());
 
-            control.createConnectionFactory(cfName,
-                                            new Object[] { tcLive.getFactoryClassName() },
-                                            new Object[] { tcLive.getParams() },
-                                            new Object[] { tcBackup.getFactoryClassName() },
-                                            new Map[] { tcBackup.getParams() },
-                                            clientID,
-                                            bindings);
-         }
-      });
-   }
 
-   public void testCreateConnectionFactory_7() throws Exception
-   {
-      doCreateConnectionFactory(new ConnectionFactoryCreator()
-      {
-         public void createConnectionFactory(final JMSServerControl control,
-                                             final String cfName,
-                                             final Object[] bindings) throws Exception
-         {
-            String clientID = RandomUtil.randomString();
-            TransportConfiguration tcLive = new TransportConfiguration(InVMConnectorFactory.class.getName());
-            TransportConfiguration tcBackup = new TransportConfiguration(InVMConnectorFactory.class.getName());
 
-            control.createConnectionFactory(cfName,
-                                            new Object[] { tcLive.getFactoryClassName() },
-                                            new Object[] { tcLive.getParams() },
-                                            new Object[] { tcBackup.getFactoryClassName() },
-                                            new Object[] { tcBackup.getParams() },
-                                            clientID,
-                                            HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
-                                            HornetQClient.DEFAULT_CONNECTION_TTL,
-                                            HornetQClient.DEFAULT_CALL_TIMEOUT,
-                                            HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT,
-                                            HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
-                                            HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE,
-                                            HornetQClient.DEFAULT_CONSUMER_MAX_RATE,
-                                            HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE,
-                                            HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE,
-                                            HornetQClient.DEFAULT_PRODUCER_MAX_RATE,
-                                            HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
-                                            HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND,
-                                            HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
-                                            HornetQClient.DEFAULT_AUTO_GROUP,
-                                            HornetQClient.DEFAULT_PRE_ACKNOWLEDGE,
-                                            HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
-                                            HornetQClient.DEFAULT_ACK_BATCH_SIZE,
-                                            HornetQClient.DEFAULT_ACK_BATCH_SIZE,
-                                            HornetQClient.DEFAULT_USE_GLOBAL_POOLS,
-                                            HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE,
-                                            HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE,
-                                            HornetQClient.DEFAULT_RETRY_INTERVAL,
-                                            HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER,
-                                            HornetQClient.DEFAULT_MAX_RETRY_INTERVAL,
-                                            HornetQClient.DEFAULT_RECONNECT_ATTEMPTS,
-                                            HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN,
-                                            null,
-                                            bindings);
-         }
-      });
-   }
-
-   public void testCreateConnectionFactory_7b() throws Exception
-   {
-      doCreateConnectionFactory(new ConnectionFactoryCreator()
-      {
-         public void createConnectionFactory(final JMSServerControl control,
-                                             final String cfName,
-                                             final Object[] bindings) throws Exception
-         {
-            String clientID = RandomUtil.randomString();
-            String jndiBindings = JMSServerControlTest.toCSV(bindings);
-
-            control.createConnectionFactory(cfName,
-                                            InVMConnectorFactory.class.getName(),
-                                            "",
-                                            InVMConnectorFactory.class.getName(),
-                                            TransportConstants.SERVER_ID_PROP_NAME + "=1",
-                                            clientID,
-                                            HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
-                                            HornetQClient.DEFAULT_CONNECTION_TTL,
-                                            HornetQClient.DEFAULT_CALL_TIMEOUT,
-                                            HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT,
-                                            HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
-                                            HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE,
-                                            HornetQClient.DEFAULT_CONSUMER_MAX_RATE,
-                                            HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE,
-                                            HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE,
-                                            HornetQClient.DEFAULT_PRODUCER_MAX_RATE,
-                                            HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE,
-                                            HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND,
-                                            HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND,
-                                            HornetQClient.DEFAULT_AUTO_GROUP,
-                                            HornetQClient.DEFAULT_PRE_ACKNOWLEDGE,
-                                            HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME,
-                                            HornetQClient.DEFAULT_ACK_BATCH_SIZE,
-                                            HornetQClient.DEFAULT_ACK_BATCH_SIZE,
-                                            HornetQClient.DEFAULT_USE_GLOBAL_POOLS,
-                                            HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE,
-                                            HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE,
-                                            HornetQClient.DEFAULT_RETRY_INTERVAL,
-                                            HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER,
-                                            HornetQClient.DEFAULT_MAX_RETRY_INTERVAL,
-                                            HornetQClient.DEFAULT_RECONNECT_ATTEMPTS,
-                                            HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN,
-                                            null,
-                                            jndiBindings);
-         }
-      });
-   }
-
-   public void _testCreateConnectionFactoryWithDiscoveryGroup() throws Exception
-   {
-      String[] cfJNDIBindings = new String[] { RandomUtil.randomString(),
-                                              RandomUtil.randomString(),
-                                              RandomUtil.randomString() };
-      String cfName = RandomUtil.randomString();
-      String clientID = RandomUtil.randomString();
-
-      // restart the server with a discovery group configuration
-      serverManager.stop();
-      startHornetQServer(8765);
-
-      for (String cfJNDIBinding : cfJNDIBindings)
-      {
-         UnitTestCase.checkNoBinding(context, cfJNDIBinding);
-      }
-
-      JMSServerControl control = createManagementControl();
-
-      control.createConnectionFactory(cfName, "231.7.7.7", 8765, clientID, cfJNDIBindings);
-
-      for (String cfJNDIBinding : cfJNDIBindings)
-      {
-         Object o = UnitTestCase.checkBinding(context, cfJNDIBinding);
-         Assert.assertTrue(o instanceof ConnectionFactory);
-         ConnectionFactory cf = (ConnectionFactory)o;
-         Connection connection = cf.createConnection();
-         connection.close();
-      }
-   }
-
-   public void testDestroyConnectionFactory() throws Exception
-   {
-      String[] cfJNDIBindings = new String[] { RandomUtil.randomString(),
-                                              RandomUtil.randomString(),
-                                              RandomUtil.randomString() };
-      String cfName = RandomUtil.randomString();
-
-      for (String cfJNDIBinding : cfJNDIBindings)
-      {
-         UnitTestCase.checkNoBinding(context, cfJNDIBinding);
-      }
-
-      JMSServerControl control = createManagementControl();
-
-      TransportConfiguration tcLive = new TransportConfiguration(InVMConnectorFactory.class.getName());
-
-      control.createConnectionFactory(cfName, tcLive.getFactoryClassName(), tcLive.getParams(), cfJNDIBindings);
-
-      for (String cfJNDIBinding : cfJNDIBindings)
-      {
-         Object o = UnitTestCase.checkBinding(context, cfJNDIBinding);
-         Assert.assertTrue(o instanceof ConnectionFactory);
-         ConnectionFactory cf = (ConnectionFactory)o;
-         Connection connection = cf.createConnection();
-         connection.close();
-      }
-
-      control.destroyConnectionFactory(cfName);
-
-      for (String cfJNDIBinding : cfJNDIBindings)
-      {
-         UnitTestCase.checkNoBinding(context, cfJNDIBinding);
-      }
-
-   }
-
-   public void testGetConnectionFactoryNames() throws Exception
-   {
-      String cfBinding = RandomUtil.randomString();
-      String cfName = RandomUtil.randomString();
-
-      JMSServerControl control = createManagementControl();
-      Assert.assertEquals(0, control.getConnectionFactoryNames().length);
-
-      TransportConfiguration tcLive = new TransportConfiguration(InVMConnectorFactory.class.getName());
-      control.createConnectionFactory(cfName,
-                                      tcLive.getFactoryClassName(),
-                                      tcLive.getParams(),
-                                      new String[] { cfBinding });
-
-      String[] cfNames = control.getConnectionFactoryNames();
-      Assert.assertEquals(1, cfNames.length);
-      Assert.assertEquals(cfName, cfNames[0]);
-
-      control.destroyConnectionFactory(cfName);
-      Assert.assertEquals(0, control.getConnectionFactoryNames().length);
-   }
-
    // Package protected ---------------------------------------------
 
    // Protected -----------------------------------------------------

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-02-18 23:12:11 UTC (rev 8889)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java	2010-02-20 10:17:41 UTC (rev 8890)
@@ -20,6 +20,7 @@
 import javax.jms.Session;
 
 import org.hornetq.api.core.TransportConfiguration;
+import org.hornetq.api.core.management.Parameter;
 import org.hornetq.api.core.management.ResourceNames;
 import org.hornetq.api.jms.HornetQJMSClient;
 import org.hornetq.api.jms.management.JMSServerControl;
@@ -90,329 +91,37 @@
 
       return new JMSServerControl()
       {
-         public void createConnectionFactory(final String name,
-                                             final String discoveryAddress,
-                                             final int discoveryPort,
-                                             final String clientID,
-                                             final long discoveryRefreshTimeout,
-                                             final long clientFailureCheckPeriod,
-                                             final long connectionTTL,
-                                             final long callTimeout,
-                                             final boolean cacheLargeMessageClient,
-                                             final int minLargeMessageSize,
-                                             final int consumerWindowSize,
-                                             final int consumerMaxRate,
-                                             final int confirmationWindowSize,
-                                             final int producerWindowSize,
-                                             final int producerMaxRate,
-                                             final boolean blockOnAcknowledge,
-                                             final boolean blockOnDurableSend,
-                                             final boolean blockOnNonDurableSend,
-                                             final boolean autoGroup,
-                                             final boolean preAcknowledge,
-                                             final String loadBalancingPolicyClassName,
-                                             final int transactionBatchSize,
-                                             final int dupsOKBatchSize,
-                                             final long initialWaitTimeout,
-                                             final boolean useGlobalPools,
-                                             final int scheduledThreadPoolMaxSize,
-                                             final int threadPoolMaxSize,
-                                             final long retryInterval,
-                                             final double retryIntervalMultiplier,
-                                             final long maxRetryInterval,
-                                             final int reconnectAttempts,
-                                             final boolean failoverOnServerShutdown,
-                                             final String groupId,
-                                             final Object[] jndiBindings) throws Exception
-         {
-            proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  discoveryAddress,
-                                  discoveryPort,
-                                  clientID,
-                                  clientFailureCheckPeriod,
-                                  connectionTTL,
-                                  callTimeout,
-                                  cacheLargeMessageClient,
-                                  minLargeMessageSize,
-                                  consumerWindowSize,
-                                  consumerMaxRate,
-                                  confirmationWindowSize,
-                                  producerWindowSize,
-                                  producerMaxRate,
-                                  blockOnAcknowledge,
-                                  blockOnDurableSend,
-                                  blockOnNonDurableSend,
-                                  autoGroup,
-                                  preAcknowledge,
-                                  loadBalancingPolicyClassName,
-                                  transactionBatchSize,
-                                  dupsOKBatchSize,
-                                  initialWaitTimeout,
-                                  useGlobalPools,
-                                  scheduledThreadPoolMaxSize,
-                                  threadPoolMaxSize,
-                                  retryInterval,
-                                  retryIntervalMultiplier,
-                                  maxRetryInterval,
-                                  reconnectAttempts,
-                                  failoverOnServerShutdown,
-                                  groupId,
-                                  jndiBindings);
-         }
 
-         public void createConnectionFactory(final String name,
-                                             final String discoveryAddress,
-                                             final int discoveryPort,
-                                             final String clientID,
-                                             final long discoveryRefreshTimeout,
-                                             final long clientFailureCheckPeriod,
-                                             final long connectionTTL,
-                                             final long callTimeout,
-                                             final boolean cacheLargeMessageClient,
-                                             final int minLargeMessageSize,
-                                             final int consumerWindowSize,
-                                             final int consumerMaxRate,
-                                             final int confirmationWindowSize,
-                                             final int producerWindowSize,
-                                             final int producerMaxRate,
-                                             final boolean blockOnAcknowledge,
-                                             final boolean blockOnDurableSend,
-                                             final boolean blockOnNonDurableSend,
-                                             final boolean autoGroup,
-                                             final boolean preAcknowledge,
-                                             final String loadBalancingPolicyClassName,
-                                             final int transactionBatchSize,
-                                             final int dupsOKBatchSize,
-                                             final long initialWaitTimeout,
-                                             final boolean useGlobalPools,
-                                             final int scheduledThreadPoolMaxSize,
-                                             final int threadPoolMaxSize,
-                                             final long retryInterval,
-                                             final double retryIntervalMultiplier,
-                                             final long maxRetryInterval,
-                                             final int reconnectAttempts,
-                                             final boolean failoverOnServerShutdown,
-                                             final String groupId,
-                                             final String jndiBindings) throws Exception
-         {
-            proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  discoveryAddress,
-                                  discoveryPort,
-                                  clientID,
-                                  clientFailureCheckPeriod,
-                                  connectionTTL,
-                                  callTimeout,
-                                  cacheLargeMessageClient,
-                                  minLargeMessageSize,
-                                  consumerWindowSize,
-                                  consumerMaxRate,
-                                  confirmationWindowSize,
-                                  producerWindowSize,
-                                  producerMaxRate,
-                                  blockOnAcknowledge,
-                                  blockOnDurableSend,
-                                  blockOnNonDurableSend,
-                                  autoGroup,
-                                  preAcknowledge,
-                                  loadBalancingPolicyClassName,
-                                  transactionBatchSize,
-                                  dupsOKBatchSize,
-                                  initialWaitTimeout,
-                                  useGlobalPools,
-                                  scheduledThreadPoolMaxSize,
-                                  threadPoolMaxSize,
-                                  retryInterval,
-                                  retryIntervalMultiplier,
-                                  maxRetryInterval,
-                                  reconnectAttempts,
-                                  failoverOnServerShutdown,
-                                  groupId,
-                                  jndiBindings);
-         }
 
          public void createConnectionFactory(final String name,
                                              final String discoveryAddress,
                                              final int discoveryPort,
-                                             final String clientID,
                                              final Object[] jndiBindings) throws Exception
          {
             proxy.invokeOperation("createConnectionFactory",
                                   name,
                                   discoveryAddress,
                                   discoveryPort,
-                                  clientID,
                                   jndiBindings);
          }
 
          public void createConnectionFactory(final String name,
                                              final String discoveryAddress,
                                              final int discoveryPort,
-                                             final String clientID,
                                              final String jndiBindings) throws Exception
          {
             proxy.invokeOperation("createConnectionFactory",
                                   name,
                                   discoveryAddress,
                                   discoveryPort,
-                                  clientID,
                                   jndiBindings);
          }
 
          public void createConnectionFactory(final String name,
-                                             final String liveTransportClassName,
-                                             final Map<String, Object> liveTransportParams,
-                                             final String backupTransportClassName,
-                                             final Map<String, Object> backupTransportParams,
-                                             final String clientID,
-                                             final Object[] jndiBindings) throws Exception
-         {
-            proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  liveTransportClassName,
-                                  liveTransportParams,
-                                  backupTransportClassName,
-                                  backupTransportParams,
-                                  clientID,
-                                  jndiBindings);
-         }
-
-         public void createConnectionFactory(final String name,
-                                             final String liveTransportClassNames,
-                                             final String liveTransportParams,
-                                             final String backupTransportClassNames,
-                                             final String backupTransportParams,
-                                             final String clientID,
-                                             final String jndiBindings) throws Exception
-         {
-            proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  liveTransportClassNames,
-                                  liveTransportParams,
-                                  backupTransportClassNames,
-                                  backupTransportParams,
-                                  clientID,
-                                  jndiBindings);
-         }
-
-         public void createConnectionFactory(final String name,
-                                             final String liveTransportClassName,
-                                             final Map<String, Object> liveTransportParams,
-                                             final String backupTransportClassName,
-                                             final Map<String, Object> backupTransportParams,
-                                             final Object[] jndiBindings) throws Exception
-         {
-            proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  liveTransportClassName,
-                                  liveTransportParams,
-                                  backupTransportClassName,
-                                  backupTransportParams,
-                                  jndiBindings);
-         }
-
-         public void createConnectionFactory(final String name,
-                                             final String liveTransportClassNames,
-                                             final String liveTransportParams,
-                                             final String backupTransportClassNames,
-                                             final String backupTransportParams,
-                                             final String jndiBindings) throws Exception
-         {
-            proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  liveTransportClassNames,
-                                  liveTransportParams,
-                                  backupTransportClassNames,
-                                  backupTransportParams,
-                                  jndiBindings);
-         }
-
-         public void createConnectionFactory(final String name,
-                                             final String liveTransportClassName,
-                                             final Map<String, Object> liveTransportParams,
-                                             final String clientID,
-                                             final Object[] jndiBindings) throws Exception
-         {
-            proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  liveTransportClassName,
-                                  liveTransportParams,
-                                  clientID,
-                                  jndiBindings);
-         }
-
-         public void createConnectionFactory(final String name,
-                                             final String liveTransportClassName,
-                                             final String liveTransportParams,
-                                             final String clientID,
-                                             final String jndiBindings) throws Exception
-         {
-            proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  liveTransportClassName,
-                                  liveTransportParams,
-                                  clientID,
-                                  jndiBindings);
-         }
-
-         public void createConnectionFactory(final String name,
-                                             final String liveTransportClassName,
-                                             final Map<String, Object> liveTransportParams,
-                                             final Object[] jndiBindings) throws Exception
-         {
-            proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  liveTransportClassName,
-                                  liveTransportParams,
-                                  jndiBindings);
-         }
-
-         public void createConnectionFactory(final String name,
-                                             final String liveTransportClassName,
-                                             final String liveTransportParams,
-                                             final String jndiBindings) throws Exception
-         {
-            proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  liveTransportClassName,
-                                  liveTransportParams,
-                                  jndiBindings);
-         }
-
-         public void createConnectionFactory(final String name,
                                              final Object[] liveConnectorsTransportClassNames,
                                              final Object[] liveConnectorTransportParams,
                                              final Object[] backupConnectorsTransportClassNames,
                                              final Object[] backupConnectorTransportParams,
-                                             final String clientID,
-                                             final long clientFailureCheckPeriod,
-                                             final long connectionTTL,
-                                             final long callTimeout,
-                                             final boolean cacheLargeMessageClient,
-                                             final int minLargeMessageSize,
-                                             final int consumerWindowSize,
-                                             final int consumerMaxRate,
-                                             final int confirmationWindowSize,
-                                             final int producerWindowSize,
-                                             final int producerMaxRate,
-                                             final boolean blockOnAcknowledge,
-                                             final boolean blockOnDurableSend,
-                                             final boolean blockOnNonDurableSend,
-                                             final boolean autoGroup,
-                                             final boolean preAcknowledge,
-                                             final String loadBalancingPolicyClassName,
-                                             final int transactionBatchSize,
-                                             final int dupsOKBatchSize,
-                                             final boolean useGlobalPools,
-                                             final int scheduledThreadPoolMaxSize,
-                                             final int threadPoolMaxSize,
-                                             final long retryInterval,
-                                             final double retryIntervalMultiplier,
-                                             final long maxRetryInterval,
-                                             final int reconnectAttempts,
-                                             final boolean failoverOnServerShutdown,
-                                             final String groupId,
                                              final Object[] jndiBindings) throws Exception
          {
             proxy.invokeOperation("createConnectionFactory",
@@ -421,145 +130,25 @@
                                   liveConnectorTransportParams,
                                   backupConnectorsTransportClassNames,
                                   backupConnectorTransportParams,
-                                  clientID,
-                                  clientFailureCheckPeriod,
-                                  connectionTTL,
-                                  callTimeout,
-                                  cacheLargeMessageClient,
-                                  minLargeMessageSize,
-                                  consumerWindowSize,
-                                  consumerMaxRate,
-                                  confirmationWindowSize,
-                                  producerWindowSize,
-                                  producerMaxRate,
-                                  blockOnAcknowledge,
-                                  blockOnDurableSend,
-                                  blockOnNonDurableSend,
-                                  autoGroup,
-                                  preAcknowledge,
-                                  loadBalancingPolicyClassName,
-                                  transactionBatchSize,
-                                  dupsOKBatchSize,
-                                  useGlobalPools,
-                                  scheduledThreadPoolMaxSize,
-                                  threadPoolMaxSize,
-                                  retryInterval,
-                                  retryIntervalMultiplier,
-                                  maxRetryInterval,
-                                  reconnectAttempts,
-                                  failoverOnServerShutdown,
-                                  groupId,
                                   jndiBindings);
-
          }
 
-         public void createConnectionFactory(final String name,
-                                             final String liveConnectorsTransportClassNames,
-                                             final String liveConnectorTransportParams,
-                                             final String backupConnectorsTransportClassNames,
-                                             final String backupConnectorTransportParams,
-                                             final String clientID,
-                                             final long clientFailureCheckPeriod,
-                                             final long connectionTTL,
-                                             final long callTimeout,
-                                             final boolean cacheLargeMessageClient,
-                                             final int minLargeMessageSize,
-                                             final int consumerWindowSize,
-                                             final int consumerMaxRate,
-                                             final int confirmationWindowSize,
-                                             final int producerWindowSize,
-                                             final int producerMaxRate,
-                                             final boolean blockOnAcknowledge,
-                                             final boolean blockOnDurableSend,
-                                             final boolean blockOnNonDurableSend,
-                                             final boolean autoGroup,
-                                             final boolean preAcknowledge,
-                                             final String loadBalancingPolicyClassName,
-                                             final int transactionBatchSize,
-                                             final int dupsOKBatchSize,
-                                             final boolean useGlobalPools,
-                                             final int scheduledThreadPoolMaxSize,
-                                             final int threadPoolMaxSize,
-                                             final long retryInterval,
-                                             final double retryIntervalMultiplier,
-                                             final long maxRetryInterval,
-                                             final int reconnectAttempts,
-                                             final boolean failoverOnServerShutdown,
-                                             final String groupId,
-                                             final String jndiBindings) throws Exception
+         public void createConnectionFactory(String name,
+                                             String liveTransportClassNames,
+                                             String liveTransportParams,
+                                             String backupTransportClassNames,
+                                             String backupTransportParams,
+                                             String jndiBindings) throws Exception
          {
             proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  liveConnectorsTransportClassNames,
-                                  liveConnectorTransportParams,
-                                  backupConnectorsTransportClassNames,
-                                  backupConnectorTransportParams,
-                                  clientID,
-                                  clientFailureCheckPeriod,
-                                  connectionTTL,
-                                  callTimeout,
-                                  cacheLargeMessageClient,
-                                  minLargeMessageSize,
-                                  consumerWindowSize,
-                                  consumerMaxRate,
-                                  confirmationWindowSize,
-                                  producerWindowSize,
-                                  producerMaxRate,
-                                  blockOnAcknowledge,
-                                  blockOnDurableSend,
-                                  blockOnNonDurableSend,
-                                  autoGroup,
-                                  preAcknowledge,
-                                  loadBalancingPolicyClassName,
-                                  transactionBatchSize,
-                                  dupsOKBatchSize,
-                                  useGlobalPools,
-                                  scheduledThreadPoolMaxSize,
-                                  threadPoolMaxSize,
-                                  retryInterval,
-                                  retryIntervalMultiplier,
-                                  maxRetryInterval,
-                                  reconnectAttempts,
-                                  failoverOnServerShutdown,
-                                  groupId,
-                                  jndiBindings);
-
+                  name,
+                  liveTransportClassNames,
+                  liveTransportParams,
+                  backupTransportClassNames,
+                  backupTransportParams,
+                  jndiBindings);
          }
 
-         public void createConnectionFactory(final String name,
-                                             final Object[] liveConnectorsTransportClassNames,
-                                             final Object[] liveConnectorTransportParams,
-                                             final Object[] backupConnectorsTransportClassNames,
-                                             final Object[] backupConnectorTransportParams,
-                                             final String clientID,
-                                             final Object[] jndiBindings) throws Exception
-         {
-            proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  liveConnectorsTransportClassNames,
-                                  liveConnectorTransportParams,
-                                  backupConnectorsTransportClassNames,
-                                  backupConnectorTransportParams,
-                                  clientID,
-                                  jndiBindings);
-         }
-
-         public void createConnectionFactory(final String name,
-                                             final Object[] liveConnectorsTransportClassNames,
-                                             final Object[] liveConnectorTransportParams,
-                                             final Object[] backupConnectorsTransportClassNames,
-                                             final Object[] backupConnectorTransportParams,
-                                             final Object[] jndiBindings) throws Exception
-         {
-            proxy.invokeOperation("createConnectionFactory",
-                                  name,
-                                  liveConnectorsTransportClassNames,
-                                  liveConnectorTransportParams,
-                                  backupConnectorsTransportClassNames,
-                                  backupConnectorTransportParams,
-                                  jndiBindings);
-         }
-
          public boolean closeConnectionsForAddress(final String ipAddress) throws Exception
          {
             return (Boolean)proxy.invokeOperation("closeConnectionsForAddress", ipAddress);



More information about the hornetq-commits mailing list