[jboss-svn-commits] JBL Code SVN: r16931 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Nov 30 01:52:18 EST 2007
Author: tcunning
Date: 2007-11-30 01:52:18 -0500 (Fri, 30 Nov 2007)
New Revision: 16931
Modified:
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollectorAction.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java
labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollectorAction.java
Log:
bug:JBESB-1354
Allow users to specify javax.naming properties within the action properties in order to allow JMX authentication.
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollectorAction.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollectorAction.java 2007-11-30 06:21:40 UTC (rev 16930)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/DataCollectorAction.java 2007-11-30 06:52:18 UTC (rev 16931)
@@ -22,9 +22,11 @@
package org.jboss.soa.esb.monitoring.client;
import java.net.URI;
+import java.util.Hashtable;
import java.util.List;
import java.util.UUID;
+import javax.naming.Context;
import javax.naming.InitialContext;
import org.apache.log4j.Logger;
@@ -66,9 +68,19 @@
*/
public Message collectStatistics(Message message) throws Exception {
if (message.getProperties().getProperty(MessageBodyTypeNames.COMMAND_TYPE) != null) {
- InitialContext ic = new InitialContext();
-
+ // Send any properties of this action into the InitialContext
+ // If authentication is required, this allows the user to set the SECURITY_CREDENTIALS
+ // and SECURITY_PRINCIPAL
+ Hashtable<String,String> env = new Hashtable<String, String>();
+ for (String key : _config.getAttributeNames()) {
+ String value = _config.getAttribute(key);
+ if (key.startsWith("java.naming")) {
+ env.put(key, value);
+ }
+ }
+ InitialContext ic = new InitialContext(env);
DataCollector dcollector = new DataCollector(ic);
+
dcollector.collectData();
StatisticsData data = dcollector.getData();
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java 2007-11-30 06:21:40 UTC (rev 16930)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/Invoker.java 2007-11-30 06:52:18 UTC (rev 16931)
@@ -13,15 +13,20 @@
import javax.naming.NamingException;
import org.apache.log4j.Logger;
-import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.soa.esb.message.body.content.ServiceControlCommand;
public class Invoker {
Logger logger = Logger.getLogger(Invoker.class);
+ private Context context;
private MBeanServerConnection server;
- public Invoker() {
- server = MBeanServerLocator.locateJBoss();
+ public Invoker(InitialContext f_context) {
+ try {
+ context = f_context;
+ server = (MBeanServerConnection) context.lookup("jmx/invoker/RMIAdaptor");
+ } catch (NamingException e) {
+ logger.error("", e);
+ }
}
public Object invoke(ServiceControlCommand obean) {
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java 2007-11-30 06:21:40 UTC (rev 16930)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/InvokerAction.java 2007-11-30 06:52:18 UTC (rev 16931)
@@ -24,9 +24,12 @@
import java.net.URI;
import java.util.Date;
+import java.util.Hashtable;
import java.util.List;
import java.util.UUID;
+import javax.naming.InitialContext;
+
import org.apache.log4j.Logger;
import org.jboss.internal.soa.esb.couriers.DeliverOnlyCourier;
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
@@ -69,7 +72,18 @@
public Message invokeOperation(Message message) throws Exception {
if (message.getProperties().getProperty(MessageBodyTypeNames.COMMAND_TYPE) != null) {
ServiceControlCommand obean = (ServiceControlCommand) message.getBody().get();
- Invoker inv = new Invoker();
+ // Send any properties of this action into the InitialContext
+ // If authentication is required, this allows the user to set the SECURITY_CREDENTIALS
+ // and SECURITY_PRINCIPAL
+ Hashtable<String,String> env = new Hashtable<String, String>();
+ for (String key : _config.getAttributeNames()) {
+ String value = _config.getAttribute(key);
+ if (key.startsWith("java.naming")) {
+ env.put(key, value);
+ }
+ }
+ InitialContext context = new InitialContext(env);
+ Invoker inv = new Invoker(context);
Object result = inv.invoke(obean);
JMXOperation jmxo = new JMXOperation(obean.getObjectName(), obean.getServer(),
obean.getOperation(), obean.getDescription(), obean.getReturntype(),
Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollectorAction.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollectorAction.java 2007-11-30 06:21:40 UTC (rev 16930)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/tools/console/management/src/main/java/org/jboss/soa/esb/monitoring/client/OperationsCollectorAction.java 2007-11-30 06:52:18 UTC (rev 16931)
@@ -22,9 +22,11 @@
*/
import java.net.URI;
+import java.util.Hashtable;
import java.util.List;
import java.util.UUID;
+import javax.naming.Context;
import javax.naming.InitialContext;
import org.apache.log4j.Logger;
@@ -66,7 +68,17 @@
*/
public Message collectOperations(Message message) throws Exception {
if (message.getProperties().getProperty(MessageBodyTypeNames.COMMAND_TYPE) != null) {
- InitialContext ic = new InitialContext();
+ // Send any properties of this action into the InitialContext
+ // If authentication is required, this allows the user to set the SECURITY_CREDENTIALS
+ // and SECURITY_PRINCIPAL
+ Hashtable<String,String> env = new Hashtable<String, String>();
+ for (String key : _config.getAttributeNames()) {
+ String value = _config.getAttribute(key);
+ if (key.startsWith("java.naming")) {
+ env.put(key, value);
+ }
+ }
+ InitialContext ic = new InitialContext(env);
OperationsCollector dcollector = new OperationsCollector(ic);
dcollector.collectData();
More information about the jboss-svn-commits
mailing list