[hornetq-commits] JBoss hornetq SVN: r8952 - in trunk: src/main/org/hornetq/api/jms/management and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Mar 24 08:46:39 EDT 2010
Author: ataylor
Date: 2010-03-24 08:46:38 -0400 (Wed, 24 Mar 2010)
New Revision: 8952
Modified:
trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java
trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java
trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
Log:
moved address and security management methods from jms to core where they belong
Modified: trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java
===================================================================
--- trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-03-24 11:56:47 UTC (rev 8951)
+++ trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-03-24 12:46:38 UTC (rev 8952)
@@ -17,11 +17,13 @@
import org.hornetq.api.core.HornetQException;
import org.hornetq.api.core.Interceptor;
+import org.hornetq.core.security.Role;
import org.hornetq.core.settings.impl.AddressFullMessagePolicy;
import org.hornetq.core.settings.impl.AddressSettings;
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
/**
* A HornetQServerControl is used to manage HornetQ servers.
@@ -496,13 +498,38 @@
@Operation(desc = "Remove security settings for an address", impact = MBeanOperationInfo.ACTION)
void removeSecuritySettings(@Parameter(desc = "an address match", name = "addressMatch") String addressMatch) throws Exception;
+ Set<Role> getSecuritySettings(String addressMatch);
+
@Operation(desc = "get roles for a specific address match", impact = MBeanOperationInfo.INFO)
Object[] getRoles(@Parameter(desc = "an address match", name = "addressMatch") String addressMatch) throws Exception;
@Operation(desc = "get roles (as a JSON string) for a specific address match", impact = MBeanOperationInfo.INFO)
String getRolesAsJSON(@Parameter(desc = "an address match", name = "addressMatch") String addressMatch) throws Exception;
- @Operation(desc = "get address settings (as a JSON string) for a specific address match", impact = MBeanOperationInfo.INFO)
- String getAddressSettingsAsJSON(@Parameter(desc = "an address match", name = "addressMatch") String addressMatch) throws Exception;
+ /**
+ * adds a new address setting for a specific address
+ */
+ @Operation(desc= "Add address settings for addresses matching the addressMatch", impact = MBeanOperationInfo.ACTION)
+ 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;
+ AddressSettings getAddressSettings(String address);
+
+ void removeAddressSettings(String addressMatch);
+
+ /**
+ * returns the address settings as a JSON string
+ */
+ @Operation(desc = "returns the address settings as a JSON string for an address match", impact = MBeanOperationInfo.INFO)
+ String getAddressSettingsAsJSON(@Parameter(desc="an address match", name="addressMatch") String addressMatch) throws Exception;
+
}
Modified: trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java
===================================================================
--- trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java 2010-03-24 11:56:47 UTC (rev 8951)
+++ trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java 2010-03-24 12:46:38 UTC (rev 8952)
@@ -204,48 +204,5 @@
@Operation(desc = "List the sessions for the given connectionID", impact = MBeanOperationInfo.INFO)
String[] listSessions(@Parameter(desc = "a connection ID", name = "connectionID") String connectionID) throws Exception;
- /**
- * adds a new address setting for a specific address
- */
- @Operation(desc= "Add address settings for addresses matching the addressMatch", impact = MBeanOperationInfo.ACTION)
- 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;
- AddressSettings getAddressSettings(String address);
-
- /**
- * returns the address settings as a JSON string
- */
- @Operation(desc = "returns the address settings as a JSON string for an address match", impact = MBeanOperationInfo.INFO)
- String getAddressSettingsAsJSON(@Parameter(desc="an address match", name="addressMatch") String addressMatch) throws Exception;
-
- @Operation(desc= "Add security settings for addresses matching the addressMatch", impact = MBeanOperationInfo.ACTION)
- void addSecuritySettings(
- @Parameter(desc="an address match", name="addressMatch") String addressMatch,
- @Parameter(desc="a comma-separated list of roles allowed to send messages", name="send") String sendRoles,
- @Parameter(desc="a comma-separated list of roles allowed to consume messages", name="consume") String consumeRoles,
- @Parameter(desc="a comma-separated list of roles allowed to create durable queues", name="createDurableQueueRoles") String createDurableQueueRoles,
- @Parameter(desc="a comma-separated list of roles allowed to delete durable queues", name="deleteDurableQueueRoles") String deleteDurableQueueRoles,
- @Parameter(desc="a comma-separated list of roles allowed to create temporary queues", name="createTempQueueRoles") String createTempQueueRoles,
- @Parameter(desc="a comma-separated list of roles allowed to delete temporary queues", name="deleteTempQueueRoles") String deleteTempQueueRoles,
- @Parameter(desc="a comma-separated list of roles allowed to send management messages messages", name="manage") String manageRoles) throws Exception;
-
- /**
- * removes the address settings as a JSON string
- */
- @Operation(desc = "removes the address settings for an address match", impact = MBeanOperationInfo.INFO)
- void removeSecuritySettings(@Parameter(desc="an address match", name="addressMatch") String addressMatch) throws Exception;
-
- Set<Role> getSecuritySettings(final String addressMatch) throws Exception;
-
- String getSecuritySettingsAsJSON(String destination) throws Exception;
}
Modified: trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-03-24 11:56:47 UTC (rev 8951)
+++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-03-24 12:46:38 UTC (rev 8952)
@@ -1088,7 +1088,19 @@
blockOnIO();
}
}
-
+
+ public Set<Role> getSecuritySettings(String addressMatch)
+ {
+ clearIO();
+ try
+ {
+ return server.getSecurityRepository().getMatch(addressMatch);
+ }
+ finally
+ {
+ blockOnIO();
+ }
+ }
public Object[] getRoles(String addressMatch) throws Exception
{
clearIO();
@@ -1164,6 +1176,57 @@
return jsonObject.toString();
}
+ public void addAddressSettings(final String address,
+ final String DLA,
+ final String expiryAddress,
+ final boolean lastValueQueue,
+ final int deliveryAttempts,
+ final long maxSizeBytes,
+ final int pageSizeBytes,
+ final long redeliveryDelay,
+ final long redistributionDelay,
+ final boolean sendToDLAOnNoRoute,
+ final String addressFullMessagePolicy) throws Exception
+ {
+ AddressSettings addressSettings = new AddressSettings();
+ addressSettings.setDeadLetterAddress(DLA == null?null:new SimpleString(DLA));
+ addressSettings.setExpiryAddress(expiryAddress == null?null:new SimpleString(expiryAddress));
+ addressSettings.setLastValueQueue(lastValueQueue);
+ addressSettings.setMaxDeliveryAttempts(deliveryAttempts);
+ addressSettings.setMaxSizeBytes(maxSizeBytes);
+ addressSettings.setPageSizeBytes(pageSizeBytes);
+ addressSettings.setRedeliveryDelay(redeliveryDelay);
+ addressSettings.setRedistributionDelay(redistributionDelay);
+ addressSettings.setSendToDLAOnNoRoute(sendToDLAOnNoRoute);
+ if(addressFullMessagePolicy == null)
+ {
+ addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
+ }
+ else if(addressFullMessagePolicy.equalsIgnoreCase("PAGE"))
+ {
+ addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
+ }
+ else if(addressFullMessagePolicy.equalsIgnoreCase("DROP"))
+ {
+ addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.DROP);
+ }
+ else if(addressFullMessagePolicy.equalsIgnoreCase("BLOCK"))
+ {
+ addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK);
+ }
+ server.getAddressSettingsRepository().addMatch(address, addressSettings);
+ }
+
+ public AddressSettings getAddressSettings(final String address)
+ {
+ return server.getAddressSettingsRepository().getMatch(address);
+ }
+
+ public void removeAddressSettings(String addressMatch)
+ {
+ server.getAddressSettingsRepository().removeMatch(addressMatch);
+ }
+
public void sendQueueInfoToQueue(final String queueName, final String address) throws Exception
{
clearIO();
Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-03-24 11:56:47 UTC (rev 8951)
+++ trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-03-24 12:46:38 UTC (rev 8952)
@@ -376,92 +376,8 @@
}
- public void addAddressSettings(final String address,
- final String DLA,
- final String expiryAddress,
- final boolean lastValueQueue,
- final int deliveryAttempts,
- final long maxSizeBytes,
- final int pageSizeBytes,
- final long redeliveryDelay,
- final long redistributionDelay,
- final boolean sendToDLAOnNoRoute,
- final String addressFullMessagePolicy) throws Exception
- {
- AddressSettings addressSettings = new AddressSettings();
- addressSettings.setDeadLetterAddress(DLA == null?null:new SimpleString(DLA));
- addressSettings.setExpiryAddress(expiryAddress == null?null:new SimpleString(expiryAddress));
- addressSettings.setLastValueQueue(lastValueQueue);
- addressSettings.setMaxDeliveryAttempts(deliveryAttempts);
- addressSettings.setMaxSizeBytes(maxSizeBytes);
- addressSettings.setPageSizeBytes(pageSizeBytes);
- addressSettings.setRedeliveryDelay(redeliveryDelay);
- addressSettings.setRedistributionDelay(redistributionDelay);
- addressSettings.setSendToDLAOnNoRoute(sendToDLAOnNoRoute);
- if(addressFullMessagePolicy == null)
- {
- addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
- }
- else if(addressFullMessagePolicy.equalsIgnoreCase("PAGE"))
- {
- addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
- }
- else if(addressFullMessagePolicy.equalsIgnoreCase("DROP"))
- {
- addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.DROP);
- }
- else if(addressFullMessagePolicy.equalsIgnoreCase("BLOCK"))
- {
- addressSettings.setAddressFullMessagePolicy(AddressFullMessagePolicy.BLOCK);
- }
- server.addAddressSettings(address, addressSettings);
- }
- public AddressSettings getAddressSettings(final String address)
- {
- return server.getAddressSettings(address);
- }
- public String getAddressSettingsAsJSON(final String address) throws Exception
- {
- return server.getHornetQServer().getHornetQServerControl().getAddressSettingsAsJSON(address);
- }
-
- public void addSecuritySettings(final String addressMatch,
- final String sendRoles,
- final String consumeRoles,
- final String createDurableQueueRoles,
- final String deleteDurableQueueRoles,
- final String createTempQueueRoles,
- final String deleteTempQueueRoles,
- final String manageRoles) throws Exception
- {
- Set<Role> roles = SecurityFormatter.createSecurity(sendRoles, consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, createTempQueueRoles, deleteTempQueueRoles, manageRoles);
- server.addSecurity(addressMatch, roles);
- }
-
- public Set<Role> getSecuritySettings(final String addressMatch)
- {
- return server.getSecurity(addressMatch);
- }
-
- public String getSecuritySettingsAsJSON(final String addressMatch) throws Exception
- {
- JSONArray json = new JSONArray();
- Set<Role> roles = server.getSecurity(addressMatch);
-
- for (Role role : roles)
- {
- json.put(new JSONObject(role));
- }
- return json.toString();
- }
-
- public void removeSecuritySettings(String addressMatch) throws Exception
- {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
@Override
public MBeanInfo getMBeanInfo()
{
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-03-24 11:56:47 UTC (rev 8951)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2010-03-24 12:46:38 UTC (rev 8952)
@@ -238,53 +238,6 @@
return (String[])proxy.invokeOperation("listSessions", connectionID);
}
- public void addAddressSettings(String addressMatch,
- String DLA,
- String expiryAddress,
- boolean lastValueQueue,
- int deliveryAttempts,
- long maxSizeBytes,
- int pageSizeBytes,
- long redeliveryDelay,
- long redistributionDelay,
- boolean sendToDLAOnNoRoute,
- String addressFullMessagePolicy) throws Exception
- {
- // TODO Auto-generated method stub
-
- }
-
- public void addSecuritySettings(String addressMatch,
- String sendRoles,
- String consumeRoles,
- String createDurableQueueRoles,
- String deleteDurableQueueRoles,
- String createTempQueueRoles,
- String deleteTempQueueRoles,
- String manageRoles) throws Exception
- {
- proxy.invokeOperation("addSecuritySettings", addressMatch,
- sendRoles,
- consumeRoles,
- createDurableQueueRoles,
- deleteDurableQueueRoles,
- createTempQueueRoles,
- deleteTempQueueRoles,
- manageRoles);
- }
-
- public AddressSettings getAddressSettings(String address)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getAddressSettingsAsJSON(String addressMatch) throws Exception
- {
- // TODO Auto-generated method stub
- return null;
- }
-
public void removeSecuritySettings(String addressMatch) throws Exception
{
proxy.invokeOperation("removeSecuritySettings", addressMatch);
More information about the hornetq-commits
mailing list