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

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