[jboss-cvs] JBossAS SVN: r102869 - in trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq: management/jms and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 24 06:37:11 EDT 2010
Author: ataylor
Date: 2010-03-24 06:37:10 -0400 (Wed, 24 Mar 2010)
New Revision: 102869
Added:
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConstants.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java
Removed:
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSDestinationManageMO.java
Modified:
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConnectionFactoryComponent.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConnectionFactoryDiscoveryComponent.java
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/JMSQueueComponent.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/jopr/JMSTopicComponent.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicDiscoveryComponent.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/QueueManageMO.java
trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java
Log:
renamed class and added constants
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConnectionFactoryComponent.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConnectionFactoryComponent.java 2010-03-24 10:06:38 UTC (rev 102868)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConnectionFactoryComponent.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -24,16 +24,16 @@
import java.util.Map;
+import static org.jboss.as.integration.hornetq.jopr.JMSConstants.ConnectionFactory.COMPONENT_NAME;
+import static org.jboss.as.integration.hornetq.jopr.JMSConstants.ConnectionFactory.COMPONENT_TYPE;
+
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
* Created Mar 19, 2010
*/
public class JMSConnectionFactoryComponent extends JMSResourceComponent
{
- private static ComponentType componentType = new ComponentType("JMSManage", "ConnectionFactoryManage");
- private static String componentName = "JMSConnectionFactoryManageMO";
-
@Override
protected String getInvokeOperationSubscriptionMessage()
{
@@ -55,13 +55,13 @@
@Override
String getComponentName()
{
- return componentName;
+ return COMPONENT_NAME;
}
@Override
ComponentType getComponentType()
{
- return componentType;
+ return COMPONENT_TYPE;
}
@Override
@@ -164,7 +164,7 @@
long retryInterval,
String connectionLoadBalancingPolicyClassName) throws Exception
{
- ManagedOperation operation = ManagementSupport.getOperation(managementView, "JMSConnectionFactoryManageMO", "updateConnectionFactory", new ComponentType("JMSManage", "ConnectionFactoryManage"));
+ ManagedOperation operation = ManagementSupport.getOperation(managementView, COMPONENT_NAME, "updateConnectionFactory", new ComponentType("JMSManage", "ConnectionFactoryManage"));
operation.invoke(new SimpleValueSupport(SimpleMetaType.STRING, name),
new SimpleValueSupport(SimpleMetaType.LONG_PRIMITIVE, discoveryRefreshTimeout),
new SimpleValueSupport(SimpleMetaType.STRING, clientId),
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConnectionFactoryDiscoveryComponent.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConnectionFactoryDiscoveryComponent.java 2010-03-24 10:06:38 UTC (rev 102868)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConnectionFactoryDiscoveryComponent.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -14,7 +14,6 @@
import org.jboss.as.integration.hornetq.jopr.util.ManagementSupport;
import org.jboss.deployers.spi.management.ManagementView;
-import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.metatype.api.values.ArrayValueSupport;
import org.jboss.metatype.api.values.SimpleValueSupport;
@@ -28,20 +27,22 @@
import java.util.HashSet;
import java.util.Set;
+import static org.jboss.as.integration.hornetq.jopr.JMSConstants.ConnectionFactory.COMPONENT_NAME;
+import static org.jboss.as.integration.hornetq.jopr.JMSConstants.ConnectionFactory.COMPONENT_TYPE;
+
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
* Created Mar 19, 2010
*/
public class JMSConnectionFactoryDiscoveryComponent implements ResourceDiscoveryComponent
{
- private static final ComponentType componentType = new ComponentType("JMSManage", "ConnectionFactoryManage");
public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext resourceDiscoveryContext) throws InvalidPluginConfigurationException, Exception
{
Set<DiscoveredResourceDetails> set = new HashSet<DiscoveredResourceDetails>();
JMSComponent context = (JMSComponent) resourceDiscoveryContext.getParentResourceComponent();
ManagementView managementView = context.getProfileService();
- ManagedOperation operation = ManagementSupport.getOperation(managementView, "JMSConnectionFactoryManageMO", "getJMSConnectionFactories", componentType);
+ ManagedOperation operation = ManagementSupport.getOperation(managementView, COMPONENT_NAME, "getJMSConnectionFactories", COMPONENT_TYPE);
ArrayValueSupport value = (ArrayValueSupport) operation.invoke();
Added: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConstants.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConstants.java (rev 0)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSConstants.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2009 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.jboss.as.integration.hornetq.jopr;
+
+import org.jboss.managed.api.ComponentType;
+
+/**
+ * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ * Created Mar 24, 2010
+ */
+public class JMSConstants
+{
+ interface ConnectionFactory
+ {
+ public static final String COMPONENT_NAME = "JMSConnectionFactoryManageMO";
+
+ public static final ComponentType COMPONENT_TYPE = new ComponentType("JMSManage", "ConnectionFactoryManage");
+ }
+
+ interface Queue
+ {
+ public static final String COMPONENT_NAME = "JMSQueueManageMO";
+
+ public static final ComponentType COMPONENT_TYPE = new ComponentType("JMSDestinationManage", "QueueManage");
+ }
+
+ interface Topic
+ {
+ public static final String COMPONENT_NAME = "JMSTopicManageMO";
+
+ public static final ComponentType COMPONENT_TYPE = new ComponentType("JMSDestinationManage", "TopicManage");
+ }
+}
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 10:06:38 UTC (rev 102868)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSManagerComponent.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -23,7 +23,6 @@
import org.jboss.as.integration.hornetq.jopr.util.ManagementSupport;
import org.jboss.deployers.spi.management.ManagementView;
-import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.metatype.api.types.SimpleMetaType;
import org.jboss.metatype.api.values.SimpleValueSupport;
@@ -39,6 +38,7 @@
import java.util.List;
import java.util.Map;
+
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
* Created 11-Mar-2010
@@ -123,7 +123,7 @@
long redistributionDelay = simpleProps.get("redistributionDelay").getLongValue();
boolean sendToDLAOnNoRoute = simpleProps.get("sendToDLAOnNoRoute").getBooleanValue();
String addressFullMessagePolicy = simpleProps.get("addressFullMessagePolicy").getStringValue();
- if ("JMS Queue".equalsIgnoreCase(createResourceReport.getResourceType().getName()))
+ if ("JMS ConnectionFactory".equalsIgnoreCase(createResourceReport.getResourceType().getName()))
{
createQueue(createResourceReport, managementView, name, jndiName, DLA, expiryAddress, maxSize, pageSize, maxDeliveryAttempts, redeliveryDelay, lastValueQueue, redistributionDelay, sendToDLAOnNoRoute, addressFullMessagePolicy);
}
@@ -147,7 +147,7 @@
private void createConnectionFactory(CreateResourceReport createResourceReport, ManagementView managementView, String name,String liveTransportClassNames, String liveTransportParams, String backupTransportClassNames, String backupTransportParams, String bindings, String discoveryAddress, int discoveryPort, long discoveryRefreshTimeout, String clientId, int dupsOkBatchSize, int transactionBatchSize, long clientFailureCheckPeriod, long connectionTTL, long callTimeout, int consumerWindowSize, int confirmationWindowSize, int producerMaxRate, int producerWindowSize, boolean cacheLargeMessageClient, int minLargeMessageSize, boolean blockOnNonDurableSend, boolean blockOnAcknowledge, boolean blockOnDurableSend, boolean autoGroup, boolean preAcknowledge, long maxRetryInterval, double retryIntervalMultiplier, int reconnectAttempts, boolean failoverOnShutdown, int scheduledThreadPoolMaxSize, int threadPoolMaxSize, String groupId, int initialMessagePacketSize, boolean useGlobalPool!
s, long retryInterval, String connectionLoadBalancingPolicyClassName)
throws Exception
{
- ManagedOperation operation = ManagementSupport.getOperation(managementView, "JMSConnectionFactoryManageMO", "createConnectionFactory", new ComponentType("JMSManage", "ConnectionFactoryManage"));
+ ManagedOperation operation = ManagementSupport.getOperation(managementView, JMSConstants.ConnectionFactory.COMPONENT_NAME, "createConnectionFactory", JMSConstants.ConnectionFactory.COMPONENT_TYPE);
operation.invoke(new SimpleValueSupport(SimpleMetaType.STRING, name),
new SimpleValueSupport(SimpleMetaType.STRING, liveTransportClassNames),
new SimpleValueSupport(SimpleMetaType.STRING, liveTransportParams),
@@ -194,7 +194,7 @@
private void createQueue(CreateResourceReport createResourceReport, ManagementView managementView, String name, String jndiName, String DLA, String expiryAddress, int maxSize, int pageSize, int maxDeliveryAttempts, long redeliveryDelay, boolean lastValueQueue, long redistributionDelay, boolean sendToDLAOnNoRoute, String addressFullMessagePolicy)
throws Exception
{
- ManagedOperation operation = ManagementSupport.getOperation(managementView, "JMSQueueManageMO", "createQueue", new ComponentType("JMSDestinationManage", "QueueManage"));
+ ManagedOperation operation = ManagementSupport.getOperation(managementView, JMSConstants.Queue.COMPONENT_NAME, "createQueue", JMSConstants.Queue.COMPONENT_TYPE);
StringBuffer sendRoles = new StringBuffer();
StringBuffer consumeRoles = new StringBuffer();
@@ -222,7 +222,8 @@
private void createTopic(CreateResourceReport createResourceReport, ManagementView managementView, String name, String jndiName, String DLA, String expiryAddress, int maxSize, int pageSize, int maxDeliveryAttempts, long redeliveryDelay, boolean lastValueQueue, long redistributionDelay, boolean sendToDLAOnNoRoute, String addressFullMessagePolicy)
throws Exception
{
- ManagedOperation operation = ManagementSupport.getOperation(managementView, "JMSTopicManageMO", "createTopic", new ComponentType("JMSDestinationManage", "TopicManage"));
+ ManagedOperation operation = ManagementSupport.getOperation(managementView, JMSConstants.Topic.COMPONENT_NAME,
+ "createTopic", JMSConstants.Topic.COMPONENT_TYPE);
StringBuffer sendRoles = new StringBuffer();
StringBuffer consumeRoles = new StringBuffer();
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java 2010-03-24 10:06:38 UTC (rev 102868)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueComponent.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -35,9 +35,7 @@
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
-import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.operation.OperationFacet;
import org.rhq.core.pluginapi.operation.OperationResult;
@@ -47,19 +45,14 @@
import java.util.Map;
import java.util.Set;
+import static org.jboss.as.integration.hornetq.jopr.JMSConstants.Queue.COMPONENT_NAME;
+
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
* Created: 17-Mar-2010
*/
public class JMSQueueComponent extends JMSResourceComponent implements ResourceComponent, MeasurementFacet, OperationFacet, ConfigurationFacet
{
- private ResourceContext resourceContext;
-
- private static ComponentType queueComponentType = new ComponentType("JMSDestinationManage", "QueueManage");
-
- private static String queueComponentName = "JMSQueueManageMO";
- private JMSComponent jmsComponent;
-
@Override
String getMeasurementsOperationName()
{
@@ -74,13 +67,13 @@
@Override
String getComponentName()
{
- return queueComponentName;
+ return COMPONENT_NAME;
}
@Override
ComponentType getComponentType()
{
- return queueComponentType;
+ return JMSConstants.Queue.COMPONENT_TYPE;
}
@Override
@@ -149,7 +142,7 @@
createRoles(configurationUpdateReport, name, sendRoles, consumeRoles);
try
{
- ManagedOperation operation = ManagementSupport.getOperation(view, queueComponentName, "updateQueueConfiguration", queueComponentType);
+ ManagedOperation operation = ManagementSupport.getOperation(view, JMSConstants.Queue.COMPONENT_NAME, "updateQueueConfiguration", JMSConstants.Queue.COMPONENT_TYPE);
operation.invoke(new SimpleValueSupport(SimpleMetaType.STRING, resourceContext.getResourceKey()),
new SimpleValueSupport(SimpleMetaType.STRING, jndiName),
new SimpleValueSupport(SimpleMetaType.STRING, DLA),
@@ -209,18 +202,6 @@
}
}
- public void start(ResourceContext resourceContext) throws InvalidPluginConfigurationException, Exception
- {
- super.start(resourceContext);
- this.resourceContext = resourceContext;
- }
-
- public void stop()
- {
- super.stop();
- this.resourceContext = null;
- }
-
private void populateParams(final Collection<PropertySimple> props, final SimpleValueSupport[] params, final SimpleValueSupport[] signature)
{
int pos = 0;
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 10:06:38 UTC (rev 102868)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSQueueDiscoveryComponent.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -23,7 +23,6 @@
import org.jboss.as.integration.hornetq.jopr.util.ManagementSupport;
import org.jboss.deployers.spi.management.ManagementView;
-import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.metatype.api.values.ArrayValueSupport;
import org.jboss.metatype.api.values.SimpleValueSupport;
@@ -42,14 +41,13 @@
*/
public class JMSQueueDiscoveryComponent implements ResourceDiscoveryComponent
{
- private static final ComponentType componentType = new ComponentType("JMSDestinationManage", "QueueManage");
public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext resourceDiscoveryContext) throws InvalidPluginConfigurationException, Exception
{
Set<DiscoveredResourceDetails> set = new HashSet<DiscoveredResourceDetails>();
JMSComponent context = (JMSComponent) resourceDiscoveryContext.getParentResourceComponent();
ManagementView managementView = context.getProfileService();
- ManagedOperation operation = ManagementSupport.getOperation(managementView, "JMSQueueManageMO", "getJMSQueues", componentType);
+ ManagedOperation operation = ManagementSupport.getOperation(managementView, JMSConstants.Queue.COMPONENT_NAME, "getJMSQueues", JMSConstants.Queue.COMPONENT_TYPE);
ArrayValueSupport value = (ArrayValueSupport) operation.invoke();
@@ -62,7 +60,7 @@
set.add(new DiscoveredResourceDetails(resourceType,
queueName,
queueName,
- "a JMS Queue",
+ "a JMS ConnectionFactory",
"",
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 10:06:38 UTC (rev 102868)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSResourceComponent.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -37,7 +37,6 @@
import org.rhq.core.domain.configuration.definition.PropertyDefinition;
import org.rhq.core.domain.measurement.*;
import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
-import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
@@ -57,7 +56,7 @@
*/
public abstract class JMSResourceComponent implements ResourceComponent, MeasurementFacet, OperationFacet, ConfigurationFacet, JMSComponent, DeleteResourceFacet
{
- private ResourceContext resourceContext;
+ protected ResourceContext resourceContext;
private JMSComponent jmsComponent;
public AvailabilityType getAvailability()
@@ -72,13 +71,6 @@
operation.invoke(new SimpleValueSupport(SimpleMetaType.STRING, resourceContext.getResourceKey()));
}
-
-
- public void updateResourceConfiguration(ConfigurationUpdateReport configurationUpdateReport)
- {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> measurementScheduleRequests) throws Exception
{
ArrayValueSupport support = new ArrayValueSupport(new ArrayMetaType(SimpleMetaType.STRING, false));
@@ -192,12 +184,6 @@
return formatResults(result, oper.getResultsType());
}
- protected abstract String getInvokeOperationSubscriptionMessage();
-
- protected abstract String getInvokeOperationJMSMessage();
-
- protected abstract String getInvokeOperation();
-
public void start(ResourceContext resourceContext) throws InvalidPluginConfigurationException, Exception
{
this.resourceContext = resourceContext;
@@ -209,7 +195,14 @@
{
this.resourceContext = null;
}
+
+ protected abstract String getInvokeOperationSubscriptionMessage();
+ protected abstract String getInvokeOperationJMSMessage();
+
+ protected abstract String getInvokeOperation();
+
+
abstract String getComponentName();
abstract ComponentType getComponentType();
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicComponent.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicComponent.java 2010-03-24 10:06:38 UTC (rev 102868)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicComponent.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -30,8 +30,6 @@
import org.rhq.core.domain.configuration.*;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
-import org.rhq.core.pluginapi.inventory.ResourceContext;
import java.util.List;
import java.util.Map;
@@ -42,12 +40,6 @@
*/
public class JMSTopicComponent extends JMSResourceComponent
{
- private ResourceContext resourceContext;
-
- private static ComponentType topicComponentType = new ComponentType("JMSDestinationManage", "TopicManage");
-
- private static String topicComponentName = "JMSTopicManageMO";
-
public AvailabilityType getAvailability()
{
return null; //To change body of implemented methods use File | Settings | File Templates.
@@ -56,13 +48,13 @@
@Override
String getComponentName()
{
- return topicComponentName;
+ return JMSConstants.Topic.COMPONENT_NAME;
}
@Override
ComponentType getComponentType()
{
- return topicComponentType;
+ return JMSConstants.Topic.COMPONENT_TYPE;
}
@Override
@@ -142,7 +134,8 @@
createRoles(configurationUpdateReport, name, sendRoles, consumeRoles, createNonDurableRoles, deleteNonDurableRoles, createDurableRoles, deleteDurableRoles);
try
{
- ManagedOperation operation = ManagementSupport.getOperation(view, topicComponentName, "updateTopicConfiguration", topicComponentType);
+ ManagedOperation operation = ManagementSupport.getOperation(view, JMSConstants.Topic.COMPONENT_NAME,
+ "updateTopicConfiguration", JMSConstants.Topic.COMPONENT_TYPE);
operation.invoke(new SimpleValueSupport(SimpleMetaType.STRING, resourceContext.getResourceKey()),
new SimpleValueSupport(SimpleMetaType.STRING, jndiName),
new SimpleValueSupport(SimpleMetaType.STRING, DLA),
@@ -250,10 +243,4 @@
}
}
- @Override
- public void start(ResourceContext resourceContext) throws InvalidPluginConfigurationException, Exception
- {
- super.start(resourceContext);
- this.resourceContext = resourceContext;
- }
}
Modified: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicDiscoveryComponent.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicDiscoveryComponent.java 2010-03-24 10:06:38 UTC (rev 102868)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/jopr/JMSTopicDiscoveryComponent.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -23,7 +23,6 @@
import org.jboss.as.integration.hornetq.jopr.util.ManagementSupport;
import org.jboss.deployers.spi.management.ManagementView;
-import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedOperation;
import org.jboss.metatype.api.values.ArrayValueSupport;
import org.jboss.metatype.api.values.SimpleValueSupport;
@@ -42,14 +41,14 @@
*/
public class JMSTopicDiscoveryComponent implements ResourceDiscoveryComponent
{
- private static final ComponentType componentType = new ComponentType("JMSDestinationManage", "TopicManage");
public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext resourceDiscoveryContext) throws InvalidPluginConfigurationException, Exception
{
Set<DiscoveredResourceDetails> set = new HashSet<DiscoveredResourceDetails>();
JMSComponent context = (JMSComponent) resourceDiscoveryContext.getParentResourceComponent();
ManagementView managementView = context.getProfileService();
- ManagedOperation operation = ManagementSupport.getOperation(managementView, "JMSTopicManageMO", "getJMSTopics", componentType);
+ ManagedOperation operation = ManagementSupport.getOperation(managementView, JMSConstants.Topic.COMPONENT_NAME,
+ "getJMSTopics", JMSConstants.Topic.COMPONENT_TYPE);
ArrayValueSupport value = (ArrayValueSupport) operation.invoke();
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 10:06:38 UTC (rev 102868)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/ConnectionFactoryManageMO.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -35,7 +35,7 @@
*/
@ManagementObject(componentType = @ManagementComponent(type = "JMSManage", subtype = "ConnectionFactoryManage"),
properties = ManagementProperties.EXPLICIT, isRuntime = true)
-public class ConnectionFactoryManageMO extends JMSDestinationManageMO
+public class ConnectionFactoryManageMO extends JMSManageMO
{
public ConnectionFactoryManageMO(HornetQServer server)
{
Deleted: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSDestinationManageMO.java
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSDestinationManageMO.java 2010-03-24 10:06:38 UTC (rev 102868)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSDestinationManageMO.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -1,108 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2009, Red Hat Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-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.core.server.HornetQServer;
-import org.hornetq.core.server.management.ManagementService;
-
-/**
- * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
- * Created: 17-Mar-2010
- */
-public class JMSDestinationManageMO
-{
- protected JMSServerControl jmsServerControl;
- protected ManagementService managementService;
- private HornetQServer server;
-
- public JMSDestinationManageMO(HornetQServer server)
- {
- this.server = server;
- }
-
- public void start()
- {
- managementService = server.getManagementService();
- jmsServerControl = (JMSServerControl) managementService.getResource(ResourceNames.JMS_SERVER);
- }
-
- protected Object[] getParams(String[] params, Class[] classes)
- {
- Object[] objects = new Object[params.length];
- for (int i = 0, objectsLength = objects.length; i < objectsLength; i++)
- {
- if("null".equalsIgnoreCase(params[i]))
- {
- objects[i] = null;
- }
- else if (classes[i] == String.class)
- {
- objects[i] = params[i];
- }
- else if (classes[i] == Double.class)
- {
- objects[i] = Double.valueOf(params[i]);
- }
- else if (classes[i] == double.class)
- {
- objects[i] = Double.valueOf(params[i]);
- }
- else if (classes[i] == Long.class)
- {
- objects[i] = Long.valueOf(params[i]);
- }
- else if (classes[i] == long.class)
- {
- objects[i] = Long.valueOf(params[i]);
- }
- else if (classes[i] == Integer.class)
- {
- objects[i] = Integer.valueOf(params[i]);
- }
- else if (classes[i] == int.class)
- {
- objects[i] = Integer.valueOf(params[i]);
- }
- else if (classes[i] == Float.class)
- {
- objects[i] = Float.valueOf(params[i]);
- }
- else if (classes[i] == float.class)
- {
- objects[i] = Float.valueOf(params[i]);
- }
- }
- return objects;
- }
-
- protected Class[] getClassTypes(String[] type) throws Exception
- {
- Class[] classes = new Class[type.length];
- for (int i = 0, typeLength = type.length; i < typeLength; i++)
- {
- classes[i] = Class.forName(type[i]);
- }
- return classes;
- }
-}
Copied: trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java (from rev 102861, trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSDestinationManageMO.java)
===================================================================
--- trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java (rev 0)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/JMSManageMO.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -0,0 +1,108 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, Red Hat Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+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.core.server.HornetQServer;
+import org.hornetq.core.server.management.ManagementService;
+
+/**
+ * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ * Created: 17-Mar-2010
+ */
+public class JMSManageMO
+{
+ protected JMSServerControl jmsServerControl;
+ protected ManagementService managementService;
+ private HornetQServer server;
+
+ public JMSManageMO(HornetQServer server)
+ {
+ this.server = server;
+ }
+
+ public void start()
+ {
+ managementService = server.getManagementService();
+ jmsServerControl = (JMSServerControl) managementService.getResource(ResourceNames.JMS_SERVER);
+ }
+
+ protected Object[] getParams(String[] params, Class[] classes)
+ {
+ Object[] objects = new Object[params.length];
+ for (int i = 0, objectsLength = objects.length; i < objectsLength; i++)
+ {
+ if("null".equalsIgnoreCase(params[i]))
+ {
+ objects[i] = null;
+ }
+ else if (classes[i] == String.class)
+ {
+ objects[i] = params[i];
+ }
+ else if (classes[i] == Double.class)
+ {
+ objects[i] = Double.valueOf(params[i]);
+ }
+ else if (classes[i] == double.class)
+ {
+ objects[i] = Double.valueOf(params[i]);
+ }
+ else if (classes[i] == Long.class)
+ {
+ objects[i] = Long.valueOf(params[i]);
+ }
+ else if (classes[i] == long.class)
+ {
+ objects[i] = Long.valueOf(params[i]);
+ }
+ else if (classes[i] == Integer.class)
+ {
+ objects[i] = Integer.valueOf(params[i]);
+ }
+ else if (classes[i] == int.class)
+ {
+ objects[i] = Integer.valueOf(params[i]);
+ }
+ else if (classes[i] == Float.class)
+ {
+ objects[i] = Float.valueOf(params[i]);
+ }
+ else if (classes[i] == float.class)
+ {
+ objects[i] = Float.valueOf(params[i]);
+ }
+ }
+ return objects;
+ }
+
+ protected Class[] getClassTypes(String[] type) throws Exception
+ {
+ Class[] classes = new Class[type.length];
+ for (int i = 0, typeLength = type.length; i < typeLength; i++)
+ {
+ classes[i] = Class.forName(type[i]);
+ }
+ return 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 10:06:38 UTC (rev 102868)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/QueueManageMO.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -42,7 +42,7 @@
*/
@ManagementObject(componentType = @ManagementComponent(type = "JMSDestinationManage", subtype = "QueueManage"),
properties = ManagementProperties.EXPLICIT, isRuntime = true)
-public class QueueManageMO extends JMSDestinationManageMO
+public class QueueManageMO extends JMSManageMO
{
private JMSServerControl jmsServerControl;
private ManagementService managementService;
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 10:06:38 UTC (rev 102868)
+++ trunk/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/management/jms/TopicManageMO.java 2010-03-24 10:37:10 UTC (rev 102869)
@@ -42,7 +42,7 @@
*/
@ManagementObject(componentType = @ManagementComponent(type = "JMSDestinationManage", subtype = "TopicManage"),
properties = ManagementProperties.EXPLICIT, isRuntime = true)
-public class TopicManageMO extends JMSDestinationManageMO
+public class TopicManageMO extends JMSManageMO
{
private JMSServerControl jmsServerControl;
private ManagementService managementService;
More information about the jboss-cvs-commits
mailing list