[jboss-cvs] JBossAS SVN: r102912 - in trunk: hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 24 13:10:12 EDT 2010
Author: ataylor
Date: 2010-03-24 13:10:11 -0400 (Wed, 24 Mar 2010)
New Revision: 102912
Modified:
trunk/component-matrix/pom.xml
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerComponent.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueDiscoveryComponent.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSResourceComponent.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java
trunk/hornetq-int/src/resources/META-INF/rhq-plugin.xml
Log:
fixed add new role issue and upgraded hornetq version
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-03-24 16:55:17 UTC (rev 102911)
+++ trunk/component-matrix/pom.xml 2010-03-24 17:10:11 UTC (rev 102912)
@@ -48,7 +48,7 @@
<version.jboss.jbossws-framework>3.3.0.CR1</version.jboss.jbossws-framework>
<version.jboss.jbossws-spi>1.3.0.CR1</version.jboss.jbossws-spi>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
- <version.hornetq>2.1.0.r8945</version.hornetq>
+ <version.hornetq>2.1.0.r8956</version.hornetq>
<version.jboss.web>3.0.0-beta-3</version.jboss.web>
<version.jgroups>2.6.13.GA</version.jgroups>
<version.jsr181.api>1.0-MR1</version.jsr181.api>
@@ -1375,7 +1375,7 @@
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.1.5.GA</version>
+ <version>3.2.0.BETA1</version>
</dependency>
<dependency>
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerComponent.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerComponent.java 2010-03-24 16:55:17 UTC (rev 102911)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerComponent.java 2010-03-24 17:10:11 UTC (rev 102912)
@@ -283,7 +283,7 @@
private void createRoles(CreateResourceReport configurationUpdateReport, String name, StringBuffer sendRoles, StringBuffer consumeRoles)
{
- PropertyList propertyList = (PropertyList) configurationUpdateReport.getResourceConfiguration().get("securityConfig");
+ PropertyList propertyList = (PropertyList) configurationUpdateReport.getResourceConfiguration().get("roles");
List<Property> roles = propertyList.getList();
for (Property role : roles)
{
@@ -317,7 +317,7 @@
private void createRoles(CreateResourceReport configurationUpdateReport, String name, StringBuffer sendRoles, StringBuffer consumeRoles, StringBuffer createNonDurableRoles, StringBuffer deleteNonDurableRoles, StringBuffer createDurableRoles, StringBuffer deleteDurableRoles)
{
- PropertyList propertyList = (PropertyList) configurationUpdateReport.getResourceConfiguration().get("securityConfig");
+ PropertyList propertyList = (PropertyList) configurationUpdateReport.getResourceConfiguration().get("roles");
List<Property> roles = propertyList.getList();
for (Property role : roles)
{
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueDiscoveryComponent.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueDiscoveryComponent.java 2010-03-24 16:55:17 UTC (rev 102911)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueDiscoveryComponent.java 2010-03-24 17:10:11 UTC (rev 102912)
@@ -60,7 +60,7 @@
set.add(new DiscoveredResourceDetails(resourceType,
queueName,
queueName,
- "a JMS ConnectionFactory",
+ "a JMS Queue",
"",
configuration,
null));
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSResourceComponent.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSResourceComponent.java 2010-03-24 16:55:17 UTC (rev 102911)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSResourceComponent.java 2010-03-24 17:10:11 UTC (rev 102912)
@@ -61,7 +61,7 @@
public AvailabilityType getAvailability()
{
- return null;
+ return AvailabilityType.UP;
}
public void deleteResource() throws Exception
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java 2010-03-24 16:55:17 UTC (rev 102911)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java 2010-03-24 17:10:11 UTC (rev 102912)
@@ -60,7 +60,6 @@
public void deleteConnectionFactory(String name) throws Exception
{
jmsServerControl.destroyConnectionFactory(name);
- jmsServerControl.removeSecuritySettings(name);
}
@ManagementOperation(name = "getConfiguration", description = "returns the JMS Connection Factory configuration",
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java 2010-03-24 16:55:17 UTC (rev 102911)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java 2010-03-24 17:10:11 UTC (rev 102912)
@@ -21,6 +21,7 @@
*/
package org.jboss.as.integration.hornetq.management.jms;
+import org.hornetq.api.core.management.HornetQServerControl;
import org.hornetq.api.core.management.ResourceNames;
import org.hornetq.api.jms.management.JMSServerControl;
import org.hornetq.core.server.HornetQServer;
@@ -34,8 +35,10 @@
{
protected JMSServerControl jmsServerControl;
protected ManagementService managementService;
+ protected HornetQServerControl hornetQServerControl;
private HornetQServer server;
+
public JMSManageMO(HornetQServer server)
{
this.server = server;
@@ -45,6 +48,7 @@
{
managementService = server.getManagementService();
jmsServerControl = (JMSServerControl) managementService.getResource(ResourceNames.JMS_SERVER);
+ hornetQServerControl = (HornetQServerControl) managementService.getResource(ResourceNames.CORE_SERVER);
}
protected Object[] getParams(String[] params, Class[] classes)
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java 2010-03-24 16:55:17 UTC (rev 102911)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java 2010-03-24 17:10:11 UTC (rev 102912)
@@ -21,12 +21,9 @@
*/
package org.jboss.as.integration.hornetq.management.jms;
-import org.hornetq.api.core.management.ResourceNames;
import org.hornetq.api.jms.management.JMSQueueControl;
-import org.hornetq.api.jms.management.JMSServerControl;
import org.hornetq.core.security.Role;
import org.hornetq.core.server.HornetQServer;
-import org.hornetq.core.server.management.ManagementService;
import org.hornetq.jms.server.config.JMSQueueConfiguration;
import org.hornetq.jms.server.config.impl.JMSQueueConfigurationImpl;
import org.jboss.managed.api.annotation.*;
@@ -44,21 +41,11 @@
properties = ManagementProperties.EXPLICIT, isRuntime = true)
public class QueueManageMO extends JMSManageMO
{
- private JMSServerControl jmsServerControl;
- private ManagementService managementService;
- private HornetQServer server;
-
public QueueManageMO(HornetQServer server)
{
super(server);
- this.server = server;
}
- public void start()
- {
- managementService = server.getManagementService();
- jmsServerControl = (JMSServerControl) managementService.getResource(ResourceNames.JMS_SERVER);
- }
@ManagementOperation(name = "createQueue", description = "Creates a new Queue",
params = {
@@ -94,7 +81,7 @@
{
//update the address settings
- jmsServerControl.addAddressSettings("jms.queue." + name,
+ hornetQServerControl.addAddressSettings("jms.queue." + name,
DLA,
expiryAddress,
lastValueQueue,
@@ -108,7 +95,7 @@
//create the queue
jmsServerControl.createQueue(name, jndiName);
//update security
- jmsServerControl.addSecuritySettings("jms.queue." + name, sendRoles, consumeRoles, "", "", "", "", "");
+ hornetQServerControl.addSecuritySettings("jms.queue." + name, sendRoles, consumeRoles, "", "", "", "", "");
}
@ManagementOperation(name = "deleteQueue", description = "delete the queue",
@@ -116,7 +103,8 @@
public void deleteQueue(String name) throws Exception
{
jmsServerControl.destroyQueue(name.replace("jms.queue.", ""));
- jmsServerControl.removeSecuritySettings(name);
+ hornetQServerControl.removeSecuritySettings(name);
+ hornetQServerControl.removeAddressSettings(name);
}
@ManagementOperation(name = "getQueueConfiguration", description = "Returns a queues configuration",
@@ -128,8 +116,8 @@
JMSQueueControl control = (JMSQueueControl) managementService.getResource(name);
JMSQueueConfiguration queueConfiguration = new JMSQueueConfigurationImpl(control.getName(), control.getSelector(), !control.isTemporary(), control.getJNDIBinding());
config[0] = queueConfiguration;
- config[1] = jmsServerControl.getAddressSettings(name);
- Set<Role> roles = jmsServerControl.getSecuritySettings(name);
+ config[1] = hornetQServerControl.getAddressSettings(name);
+ Set<Role> roles = hornetQServerControl.getSecuritySettings(name);
config[2] = roles;
return config;
}
@@ -167,7 +155,7 @@
String consumeRoles) throws Exception
{
//update the address settings
- jmsServerControl.addAddressSettings(name,
+ hornetQServerControl.addAddressSettings(name,
dla,
expiryAddress,
lastValueQueue,
@@ -179,7 +167,7 @@
sendToDLAOnNoRoute,
addressFullMessagePolicy);
//update security
- jmsServerControl.addSecuritySettings(name, sendRoles, consumeRoles, "", "", "", "", "");
+ hornetQServerControl.addSecuritySettings(name, sendRoles, consumeRoles, "", "", "", "", "");
}
@ManagementOperation(name = "getQueueMeasurements", description = "updates a queues configuration",
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java 2010-03-24 16:55:17 UTC (rev 102911)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java 2010-03-24 17:10:11 UTC (rev 102912)
@@ -21,12 +21,9 @@
*/
package org.jboss.as.integration.hornetq.management.jms;
-import org.hornetq.api.core.management.ResourceNames;
-import org.hornetq.api.jms.management.JMSServerControl;
import org.hornetq.api.jms.management.TopicControl;
import org.hornetq.core.security.Role;
import org.hornetq.core.server.HornetQServer;
-import org.hornetq.core.server.management.ManagementService;
import org.hornetq.jms.server.config.TopicConfiguration;
import org.hornetq.jms.server.config.impl.TopicConfigurationImpl;
import org.jboss.managed.api.annotation.*;
@@ -44,28 +41,19 @@
properties = ManagementProperties.EXPLICIT, isRuntime = true)
public class TopicManageMO extends JMSManageMO
{
- private JMSServerControl jmsServerControl;
- private ManagementService managementService;
- private HornetQServer server;
public TopicManageMO(HornetQServer server)
{
super(server);
- this.server = server;
}
- public void start()
- {
- managementService = server.getManagementService();
- jmsServerControl = (JMSServerControl) managementService.getResource(ResourceNames.JMS_SERVER);
- }
-
@ManagementOperation(name = "deleteTopic", description = "delete the topic",
params = {@ManagementParameter(name = "name", description = "the queue name")})
public void deleteTopic(String name) throws Exception
{
jmsServerControl.destroyTopic(name.replace("jms.topic.", ""));
- jmsServerControl.removeSecuritySettings(name);
+ hornetQServerControl.removeSecuritySettings(name);
+ hornetQServerControl.removeAddressSettings(name);
}
@ManagementOperation(name = "getTopicConfiguration", description = "Returns a topics configuration",
@@ -77,8 +65,8 @@
TopicControl control = (TopicControl) managementService.getResource(name);
TopicConfiguration topicConfiguration = new TopicConfigurationImpl(control.getName(), control.getJNDIBinding());
config[0] = topicConfiguration;
- config[1] = jmsServerControl.getAddressSettings(name);
- Set<Role> roles = jmsServerControl.getSecuritySettings(name);
+ config[1] = hornetQServerControl.getAddressSettings(name);
+ Set<Role> roles = hornetQServerControl.getSecuritySettings(name);
config[2] = roles;
return config;
}
@@ -124,7 +112,7 @@
{
//update the address settings
- jmsServerControl.addAddressSettings("jms.queue." + name,
+ hornetQServerControl.addAddressSettings("jms.queue." + name,
DLA,
expiryAddress,
lastValueQueue,
@@ -138,7 +126,7 @@
//create the queue
jmsServerControl.createTopic(name, jndiName);
//update security
- jmsServerControl.addSecuritySettings(name, sendRoles, consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, createTempQueueRoles, deleteTempQueueRoles, "");
+ hornetQServerControl.addSecuritySettings(name, sendRoles, consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, createTempQueueRoles, deleteTempQueueRoles, "");
}
@ManagementOperation(name = "updateQueueConfiguration", description = "updates a queues configuration",
@@ -182,7 +170,7 @@
final String deleteTempQueueRoles) throws Exception
{
//update the address settings
- jmsServerControl.addAddressSettings(name,
+ hornetQServerControl.addAddressSettings(name,
dla,
expiryAddress,
lastValueQueue,
@@ -194,7 +182,7 @@
sendToDLAOnNoRoute,
addressFullMessagePolicy);
//update security
- jmsServerControl.addSecuritySettings(name, sendRoles, consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, createTempQueueRoles, deleteTempQueueRoles, "");
+ hornetQServerControl.addSecuritySettings(name, sendRoles, consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, createTempQueueRoles, deleteTempQueueRoles, "");
}
@ManagementOperation(name = "getTopicMeasurements", description = "updates a queues configuration",
Modified: trunk/hornetq-int/src/resources/META-INF/rhq-plugin.xml
===================================================================
--- trunk/hornetq-int/src/resources/META-INF/rhq-plugin.xml 2010-03-24 16:55:17 UTC (rev 102911)
+++ trunk/hornetq-int/src/resources/META-INF/rhq-plugin.xml 2010-03-24 17:10:11 UTC (rev 102912)
@@ -282,12 +282,12 @@
displayName="Address Full Message Policy" required="true">
<c:description>The policy to use when this Address is full (PAGE,DROP,BLOCK)</c:description>
</c:simple-property>
- <c:list-property name="securityConfig"
- displayName="Security Configurations"
- description="These are the attributes that define a role for this specific address. The 'name' of the role, 'send' allows a producer to send a message, 'consume' allows a consumer or subscriber to receive a message.">
+ <c:list-property name="roles"
+ displayName="Roles"
+ description="These are the roles for this queue. The 'name' of the role, 'send' allows a producer to send a message, 'consume' allows a consumer to receive a message.">
<c:map-property name="role"
- displayName="Security Configuration Attributes"
- description="These are the attributes that define the role name, and if the role is allowed to read, write or create Messages on this Queue">
+ displayName="Role Attributes"
+ description="These are the attributes that define the role name, and if the role is allowed to send and consume messages on this queue">
<c:simple-property name="name"
displayName="name"
description="The name of the role?"
@@ -296,13 +296,13 @@
type="string"/>
<c:simple-property name="send"
displayName="send"
- description="Is this role allowed to write messages to this address?"
+ description="Is this role allowed to send messages to this queue?"
summary="true"
required="true"
type="boolean"/>
<c:simple-property name="consume"
displayName="consume"
- description="Is this role allowed to read messages from this address?"
+ description="Is this role allowed to consume messages from this queue?"
summary="true"
required="true"
type="boolean"/>
@@ -473,51 +473,51 @@
displayName="Address Full Message Policy" required="true">
<c:description>The policy to use when this Address is full (PAGE,DROP,BLOCK)</c:description>
</c:simple-property>
- <c:list-property name="securityConfig"
- displayName="Security Configurations"
- description="These are the attributes that define a role for this specific address. The 'name' of the role, 'send' allows a producer to send a message, 'consume' allows a consumer or subscriber to receive a message. The create/delete (non) durable subscriber specifies whether the queue representing the subscription can be created or deleted">
+ <c:list-property name="roles"
+ displayName="Roles"
+ description="These are the role defined for this topic. The 'name' of the role, 'send' allows a producer to send a message, 'consume' allows a consumer or subscriber to receive a message. The create/delete (non) durable subscriber specifies whether the queue representing the subscription can be created or deleted">
<c:map-property name="role"
- displayName="Security Configuration Attributes"
- description="These are the attributes that define a role for this specific address.">
+ displayName="Role Attributes"
+ description="These are the attributes that define a role for this topic.">
<c:simple-property name="name"
displayName="name"
- description="The name of the role?"
+ description="The name of the role"
summary="true"
required="true"
type="string"/>
<c:simple-property name="send"
displayName="send"
- description="Is this role allowed to write messages to this address?"
+ description="Is this role allowed to send messages to this topic?"
summary="true"
required="true"
type="boolean"/>
<c:simple-property name="consume"
displayName="consume"
- description="Is this role allowed to read messages from this address?"
+ description="Is this role allowed to consume messages from this topic?"
summary="true"
required="true"
type="boolean"/>
<c:simple-property name="createNonDurableQueue"
displayName="create subscriber"
- description="Are Non Durable Subscribers allowed to be created on this address?"
+ description="Is this role allowed to create non durable subscribers for this topic?"
summary="true"
required="true"
type="boolean"/>
<c:simple-property name="deleteNonDurableQueue"
displayName="delete subscriber"
- description="Are Non Durable Subscribers allowed to be deleted on this address?"
+ description="Is this role allowed to delete non durable subscribers for this topic?"
summary="true"
required="true"
type="boolean"/>
<c:simple-property name="createDurableQueue"
displayName="create durable subscriber"
- description="Are Durable Subscribers allowed to be created on this address?"
+ description="Is this role allowed to create durable subscribers for this topic?"
summary="true"
required="true"
type="boolean"/>
<c:simple-property name="deleteDurableQueue"
displayName="delete durable subscriber"
- description="Are Durable Subscribers allowed to be deleted on this address?"
+ description="Is this role allowed to delete durable subscribers for this topic?"
summary="true"
required="true"
type="boolean"/>
More information about the jboss-cvs-commits
mailing list