You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2008/12/23 18:32:19 UTC
svn commit: r729043 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints:
AbstractEndpoint.java algorithms/AlgorithmContext.java
Author: indika
Date: Tue Dec 23 09:32:18 2008
New Revision: 729043
URL: http://svn.apache.org/viewvc?rev=729043&view=rev
Log:
remove local MBean registration method
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/AlgorithmContext.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java?rev=729043&r1=729042&r2=729043&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java Tue Dec 23 09:32:18 2008
@@ -23,6 +23,7 @@
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.FaultHandler;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.commons.util.MBeanRegistrar;
import org.apache.synapse.audit.statistics.StatisticsReporter;
import org.apache.axis2.transport.base.BaseConstants;
import org.apache.synapse.core.axis2.Axis2MessageContext;
@@ -126,20 +127,8 @@
public void setName(String endpointName) {
this.endpointName = endpointName;
- // register with JMX
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
- String jmxAgentName = System.getProperty("jmx.agent.name");
- if (jmxAgentName == null || "".equals(jmxAgentName)) {
- jmxAgentName = "org.apache.synapse";
- }
- String name;
- try {
- name = jmxAgentName + ":Type=Endpoint,Name=" + endpointName;
- metricsMBean = new EndpointView(endpointName, this);
- registerMBean(mbs, metricsMBean, name);
- } catch (Exception e) {
- log.warn("Error registering endpoint : " + endpointName + " for JMX management", e);
- }
+ metricsMBean = new EndpointView(endpointName, this);
+ MBeanRegistrar.getInstance().registerMBean(metricsMBean, "Endpoint", endpointName);
}
//----------------------- default method implementations and common code -----------------------
@@ -377,28 +366,6 @@
throw new SynapseException(msg, e);
}
- /**
- * Utiliry method to register an MBean
- * @param mbs server
- * @param mbeanInstance bean
- * @param objectName name
- */
- private void registerMBean(MBeanServer mbs, Object mbeanInstance, String objectName) {
- try {
- ObjectName name = new ObjectName(objectName);
- Set set = mbs.queryNames(name, null);
- if (set != null && set.isEmpty()) {
- mbs.registerMBean(mbeanInstance, name);
- } else {
- mbs.unregisterMBean(name);
- mbs.registerMBean(mbeanInstance, name);
- }
- } catch (Exception e) {
- log.warn("Error registering a MBean with objectname ' " + objectName +
- " ' for JMX management", e);
- }
- }
-
protected void logOnChildEndpointFail(Endpoint endpoint, MessageContext synMessageContext) {
if (log.isDebugEnabled()) {
log.debug(this + " Detect a Failure in a child endpoint : " + endpoint);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/AlgorithmContext.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/AlgorithmContext.java?rev=729043&r1=729042&r2=729043&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/AlgorithmContext.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/AlgorithmContext.java Tue Dec 23 09:32:18 2008
@@ -21,7 +21,6 @@
import org.apache.axis2.context.ConfigurationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.SynapseException;
import org.apache.synapse.util.Replicator;
import java.util.HashMap;
@@ -43,7 +42,7 @@
/* Are we supporting clustering ? */
private boolean isClusteringEnabled = false;
- /* The key for 'currentEPR' attribute when replicated in a clsuter */
+ /* The key for 'currentEPR' attribute when replicated in a cluster */
private String CURRENT_EPR_PROP_KEY;
/* Prefix for uniquely identify properties of a particular endpoint */