You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by in...@apache.org on 2008/01/07 11:45:29 UTC
svn commit: r609564 - in /webservices/synapse/branches/1.1.1:
modules/samples/src/main/scripts/axis2server.bat
modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
src/main/bin/synapse.bat
Author: indika
Date: Mon Jan 7 02:45:27 2008
New Revision: 609564
URL: http://svn.apache.org/viewvc?rev=609564&view=rev
Log:
improve JMX management support
Modified:
webservices/synapse/branches/1.1.1/modules/samples/src/main/scripts/axis2server.bat
webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
webservices/synapse/branches/1.1.1/src/main/bin/synapse.bat
Modified: webservices/synapse/branches/1.1.1/modules/samples/src/main/scripts/axis2server.bat
URL: http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/modules/samples/src/main/scripts/axis2server.bat?rev=609564&r1=609563&r2=609564&view=diff
==============================================================================
--- webservices/synapse/branches/1.1.1/modules/samples/src/main/scripts/axis2server.bat (original)
+++ webservices/synapse/branches/1.1.1/modules/samples/src/main/scripts/axis2server.bat Mon Jan 7 02:45:27 2008
@@ -111,7 +111,7 @@
echo Using AXIS2_HOME %AXIS2_HOME%
cd %AXIS2_HOME%
-"%_JAVACMD%" %_HTTPPORT% %_HTTPSPORT% %_SERVERNAME% %JAVA_OPTS% -cp "%AXIS2_CLASS_PATH%" -Djava.io.tmpdir=$AXIS2_HOME\..\..\work\temp\sampleServer -Djava.endorsed.dirs="%AXIS2_ENDORSED%" samples.util.SampleAxis2Server -repo "%AXIS2_HOME%\repository" -conf "%AXIS2_HOME%\repository\conf\axis2.xml"
+"%_JAVACMD%" %_HTTPPORT% %_HTTPSPORT% %_SERVERNAME% %JAVA_OPTS% -cp "%AXIS2_CLASS_PATH%" -Djava.io.tmpdir=%AXIS2_HOME%\..\..\work\temp\sampleServer -Djava.endorsed.dirs="%AXIS2_ENDORSED%" samples.util.SampleAxis2Server -repo "%AXIS2_HOME%\repository" -conf "%AXIS2_HOME%\repository\conf\axis2.xml"
goto end
:end
Modified: webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java
URL: http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java?rev=609564&r1=609563&r2=609564&view=diff
==============================================================================
--- webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java (original)
+++ webservices/synapse/branches/1.1.1/modules/transports/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListener.java Mon Jan 7 02:45:27 2008
@@ -24,6 +24,7 @@
import java.net.UnknownHostException;
import java.net.InetAddress;
import java.lang.management.ManagementFactory;
+import java.util.Set;
import javax.net.ssl.SSLContext;
import javax.management.*;
@@ -197,12 +198,16 @@
// register with JMX
MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
- ObjectName name = null;
+ String jmxAgentName = System.getProperty("jmx.agent.name");
+ if (jmxAgentName == null || "".equals(jmxAgentName)) {
+ jmxAgentName = "org.apache.synapse";
+ }
+ String name;
try {
- name = new ObjectName("org.apache.axis2:Type=Transport,ConnectorName=" +
- "nio-http" + (sslContext == null ? "" : "s"));
+ name = jmxAgentName + ":Type=Transport,ConnectorName=" +
+ "nio-http" + (sslContext == null ? "" : "s");
TransportView tBean = new TransportView(this, null);
- mbs.registerMBean(tBean, name);
+ registerMBean(mbs, tBean, name);
} catch (Exception e) {
log.warn("Error registering the non-blocking http" +
(sslContext == null ? "" : "s") + " transport for JMX management", e);
@@ -419,5 +424,21 @@
public long getBytesSent() {
return -1;
+ }
+
+ 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);
+ }
}
}
Modified: webservices/synapse/branches/1.1.1/src/main/bin/synapse.bat
URL: http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/src/main/bin/synapse.bat?rev=609564&r1=609563&r2=609564&view=diff
==============================================================================
--- webservices/synapse/branches/1.1.1/src/main/bin/synapse.bat (original)
+++ webservices/synapse/branches/1.1.1/src/main/bin/synapse.bat Mon Jan 7 02:45:27 2008
@@ -126,7 +126,7 @@
echo Using JAVA_HOME: %JAVA_HOME%
echo Using SYNAPSE_XML: %_SYNAPSE_XML%
-%_JAVACMD% %_PORT% %_SYNAPSE_XML% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration -Dsynapse.home="%SYNAPSE_HOME%" -Daxis2.xml="%SYNAPSE_HOME%\repository\conf\axis2.xml" -Djava.endorsed.dirs=%SYNAPSE_ENDORSED% -Djava.io.tmpdir=$SYNAPSE_HOME\work\temp\synapse %_XDEBUG% -cp %SYNAPSE_CLASS_PATH% org.apache.synapse.SynapseServer "%SYNAPSE_HOME%\repository"
+%_JAVACMD% %_PORT% %_SYNAPSE_XML% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XMLGrammarCachingConfiguration -Dsynapse.home="%SYNAPSE_HOME%" -Daxis2.xml="%SYNAPSE_HOME%\repository\conf\axis2.xml" -Djava.endorsed.dirs=%SYNAPSE_ENDORSED% -Djava.io.tmpdir=%SYNAPSE_HOME%\work\temp\synapse %_XDEBUG% -cp %SYNAPSE_CLASS_PATH% org.apache.synapse.SynapseServer "%SYNAPSE_HOME%\repository"
goto end
:end
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org