3:21 a.m.
Author: jmesnil
Date: 2010-03-30 04:21:34 -0400 (Tue, 30 Mar 2010)
New Revision: 9011
Modified:
trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java
trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java
Log:
fix HornetQServetControlUsingCoreTest
Modified: trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java
===================================================================
--- trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-03-30
08:04:18 UTC (rev 9010)
+++ trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-03-30
08:21:34 UTC (rev 9011)
@@ -519,7 +519,7 @@
@Parameter(desc="do we send to the DLA when there is no
where to route the message", name="sendToDLAOnNoRoute") boolean
sendToDLAOnNoRoute,
@Parameter(desc="the ploicy to use when the address is
full", name="addressFullMessagePolicy") String addressFullMessagePolicy)
throws Exception;
- AddressSettings getAddressSettings(String address);
+ AddressSettings getAddressSettings(String address) throws Exception;
void removeAddressSettings(String addressMatch) throws Exception;
Modified:
trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java
===================================================================
---
trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-03-30
08:04:18 UTC (rev 9010)
+++
trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-03-30
08:21:34 UTC (rev 9011)
@@ -13,6 +13,7 @@
package org.hornetq.tests.integration.management;
+import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.ClientSession;
import org.hornetq.api.core.client.ClientSessionFactory;
@@ -23,7 +24,9 @@
import org.hornetq.core.config.Configuration;
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
import org.hornetq.core.security.Role;
+import org.hornetq.core.settings.impl.AddressFullMessagePolicy;
import org.hornetq.core.settings.impl.AddressSettings;
+import org.hornetq.utils.json.JSONObject;
import java.util.Set;
@@ -499,19 +502,42 @@
return (String)proxy.invokeOperation("getRolesAsJSON",
addressMatch);
}
- public void addAddressSettings(@Parameter(desc = "an address match",
name = "addressMatch") String addressMatch, @Parameter(desc = "the dead
letter address setting", name = "DLA") String DLA, @Parameter(desc =
"the expiry address setting", name = "expiryAddress") String
expiryAddress, @Parameter(desc = "are any queues created for this address a last
value queue", name = "lastValueQueue") boolean lastValueQueue,
@Parameter(desc = "the delivery attempts", name = "deliveryAttempts")
int deliveryAttempts, @Parameter(desc = "the max size in bytes", name =
"maxSizeBytes") long maxSizeBytes, @Parameter(desc = "the page size in
bytes", name = "pageSizeBytes") int pageSizeBytes, @Parameter(desc =
"the redelivery delay", name = "redeliveryDelay") long
redeliveryDelay, @Parameter(desc = "the redistribution delay", name =
"redistributionDelay") long redistributionDelay, @Parameter(desc = "do we
send to the DLA when there is no where to route the message", name =
"sendToDLAOnNo!
Route") boolean sendToDLAOnNoRoute, @Parameter(desc = "the ploicy to use when
the address is full", name = "addressFullMessagePolicy") String
addressFullMessagePolicy) throws Exception
+ public void addAddressSettings(@Parameter(desc = "an address match",
name = "addressMatch") String addressMatch,
+ @Parameter(desc = "the dead letter address
setting", name = "DLA") String DLA,
+ @Parameter(desc = "the expiry address
setting", name = "expiryAddress") String expiryAddress,
+ @Parameter(desc = "are any queues created
for this address a last value queue", name = "lastValueQueue") boolean
lastValueQueue,
+ @Parameter(desc = "the delivery
attempts", name = "deliveryAttempts") int deliveryAttempts,
+ @Parameter(desc = "the max size in
bytes", name = "maxSizeBytes") long maxSizeBytes,
+ @Parameter(desc = "the page size in
bytes", name = "pageSizeBytes") int pageSizeBytes,
+ @Parameter(desc = "the redelivery
delay", name = "redeliveryDelay") long redeliveryDelay,
+ @Parameter(desc = "the redistribution
delay", name = "redistributionDelay") long redistributionDelay,
+ @Parameter(desc = "do we send to the DLA
when there is no where to route the message", name = "sendToDLAOnNoRoute")
boolean sendToDLAOnNoRoute,
+ @Parameter(desc = "the ploicy to use when
the address is full", name = "addressFullMessagePolicy") String
addressFullMessagePolicy) throws Exception
{
- //To change body of implemented methods use File | Settings | File
Templates.
+ proxy.invokeOperation("addAddressSettings", addressMatch, DLA,
expiryAddress, lastValueQueue, deliveryAttempts, maxSizeBytes, pageSizeBytes,
redeliveryDelay, redistributionDelay, sendToDLAOnNoRoute, addressFullMessagePolicy);
}
- public AddressSettings getAddressSettings(String address)
+ public AddressSettings getAddressSettings(String address) throws Exception
{
- return null; //To change body of implemented methods use File | Settings |
File Templates.
+ String res =
(String)proxy.invokeOperation("getAddressSettingsAsJSON", address);
+ JSONObject object = new JSONObject(res);
+ AddressSettings settings = new AddressSettings();
+
settings.setDeadLetterAddress(SimpleString.toSimpleString(object.getString("DLA")));
+
settings.setExpiryAddress(SimpleString.toSimpleString(object.getString("expiryAddress")));
+ settings.setLastValueQueue(object.getBoolean("lastValueQueue"));
+
settings.setMaxDeliveryAttempts(object.getInt("maxDeliveryAttempts"));
+ settings.setMaxSizeBytes(object.getLong("maxSizeBytes"));
+ settings.setPageSizeBytes(object.getInt("pageSizeBytes"));
+ settings.setRedeliveryDelay(object.getLong("redeliveryDelay"));
+
settings.setRedistributionDelay(object.getLong("redistributionDelay"));
+
settings.setSendToDLAOnNoRoute(object.getBoolean("sendToDLAOnNoRoute"));
+
settings.setAddressFullMessagePolicy(AddressFullMessagePolicy.valueOf(object.getString("addressFullMessagePolicy")));
+ return settings;
}
- public void removeAddressSettings(String addressMatch)
+ public void removeAddressSettings(String addressMatch) throws Exception
{
- //To change body of implemented methods use File | Settings | File
Templates.
+ proxy.invokeOperation("removeAddressSettings", addressMatch);
}
public String getAddressSettingsAsJSON(@Parameter(desc = "an address
match", name = "addressMatch") String addressMatch) throws Exception