You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/05/26 19:59:22 UTC
svn commit: r660255 - in /activemq/camel/trunk/camel-core/src:
main/java/org/apache/camel/management/ test/java/org/apache/camel/management/
Author: davsclaus
Date: Mon May 26 10:59:20 2008
New Revision: 660255
URL: http://svn.apache.org/viewvc?rev=660255&view=rev
Log:
CAMEL-517: xxxImpl renamed to DefaultXXX according to the Camel class naming standard
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java (contents, props changed)
- copied, changed from r660231, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationAgentImpl.java
Removed:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationAgentImpl.java
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java (from r660231, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationAgentImpl.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationAgentImpl.java&r1=660231&r2=660255&rev=660255&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationAgentImpl.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java Mon May 26 10:59:20 2008
@@ -51,7 +51,10 @@
import org.springframework.jmx.export.annotation.AnnotationJmxAttributeSource;
import org.springframework.jmx.export.assembler.MetadataMBeanInfoAssembler;
-public class InstrumentationAgentImpl extends ServiceSupport implements InstrumentationAgent,
+/**
+ * Default implementation of the Camel JMX service agent
+ */
+public class DefaultInstrumentationAgent extends ServiceSupport implements InstrumentationAgent,
CamelContextAware {
public static final String SYSTEM_PROPERTY_JMX = "org.apache.camel.jmx";
public static final String SYSTEM_PROPERTY_JMX_USE_PLATFORM_MBS = SYSTEM_PROPERTY_JMX + ".usePlatformMBeanServer";
@@ -59,7 +62,7 @@
public static final String DEFAULT_HOST = "localhost";
public static final int DEFAULT_PORT = 1099;
public static final String DEFAULT_CONNECTOR_PATH = "/jmxrmi";
- private static final transient Log LOG = LogFactory.getLog(InstrumentationAgentImpl.class);
+ private static final transient Log LOG = LogFactory.getLog(DefaultInstrumentationAgent.class);
private MBeanServer server;
@@ -74,7 +77,7 @@
private boolean createConnector = true;
private boolean usePlatformMBeanServer;
- public InstrumentationAgentImpl() {
+ public DefaultInstrumentationAgent() {
assembler = new MetadataMBeanInfoAssembler();
assembler.setAttributeSource(new AnnotationJmxAttributeSource());
}
@@ -151,7 +154,9 @@
}
}
- LOG.debug("Starting JMX agent on server: " + getMBeanServer());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Starting JMX agent on server: " + getMBeanServer());
+ }
if (context instanceof DefaultCamelContext) {
DefaultCamelContext dc = (DefaultCamelContext)context;
@@ -188,8 +193,8 @@
}
if (caught > 0) {
LOG.warn("A number of " + caught
- + " exceptions caught while unregistering MBeans during stop operation. "
- + "See INFO log for details.");
+ + " exceptions caught while unregistering MBeans during stop operation."
+ + " See INFO log for details.");
}
}
@@ -217,7 +222,7 @@
enableJmx(DEFAULT_DOMAIN, DEFAULT_CONNECTOR_PATH, DEFAULT_PORT);
}
- public void enableJmx(String domainName, String connectorPath, int port) {
+ public void enableJmx(String domainName, String connectorPath, int port) {
jmxEnabled = true;
jmxDomainName = domainName;
jmxConnectorPath = connectorPath;
@@ -255,7 +260,7 @@
jmxConnectorPort = Integer.parseInt(portValue);
} catch (NumberFormatException nfe) {
LOG.info("Invalid port number specified via System property [" + portKey + "="
- + portValue + "]. Using default: " + DEFAULT_PORT);
+ + portValue + "]. Using default: " + DEFAULT_PORT);
jmxConnectorPort = DEFAULT_PORT;
}
}
@@ -264,7 +269,7 @@
try {
hostName = InetAddress.getLocalHost().getHostName();
} catch (UnknownHostException uhe) {
- LOG.info("Cannot determine host name. Using default: " + DEFAULT_PORT, uhe);
+ LOG.info("Cannot determine localhost name. Using default: " + DEFAULT_PORT, uhe);
hostName = DEFAULT_HOST;
}
} else {
@@ -329,7 +334,7 @@
};
connectorThread.setName("JMX Connector Thread [" + url + "]");
connectorThread.start();
- LOG.info("Jmx connector thread started on " + url);
+ LOG.info("JMX connector thread started on " + url);
}
}
}
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java?rev=660255&r1=660254&r2=660255&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java Mon May 26 10:59:20 2008
@@ -31,8 +31,8 @@
public static final int DEFAULT_PORT = 1099;
- protected InstrumentationAgentImpl iAgent;
- protected String domainName = InstrumentationAgentImpl.DEFAULT_DOMAIN;
+ protected DefaultInstrumentationAgent iAgent;
+ protected String domainName = DefaultInstrumentationAgent.DEFAULT_DOMAIN;
protected boolean sleepSoYouCanBrowseInJConsole;
public void testMBeansRegistered() throws Exception {
@@ -130,7 +130,7 @@
}
protected void createInstrumentationAgent(CamelContext context, int port) throws Exception {
- iAgent = new InstrumentationAgentImpl();
+ iAgent = new DefaultInstrumentationAgent();
iAgent.setCamelContext(context);
enableJmx();
iAgent.start();
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java?rev=660255&r1=660254&r2=660255&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java Mon May 26 10:59:20 2008
@@ -25,14 +25,14 @@
@Override
protected void setUp() throws Exception {
- System.setProperty(InstrumentationAgentImpl.SYSTEM_PROPERTY_JMX_USE_PLATFORM_MBS, "True");
+ System.setProperty(DefaultInstrumentationAgent.SYSTEM_PROPERTY_JMX_USE_PLATFORM_MBS, "True");
super.setUp();
}
@Override
protected void tearDown() throws Exception {
// restore environment to original state
- System.setProperty(InstrumentationAgentImpl.SYSTEM_PROPERTY_JMX_USE_PLATFORM_MBS, "");
+ System.setProperty(DefaultInstrumentationAgent.SYSTEM_PROPERTY_JMX_USE_PLATFORM_MBS, "");
super.tearDown();
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java?rev=660255&r1=660254&r2=660255&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java Mon May 26 10:59:20 2008
@@ -25,18 +25,18 @@
@Override
protected void setUp() throws Exception {
domainName = "org.apache.camel-properties";
- System.setProperty(InstrumentationAgentImpl.SYSTEM_PROPERTY_JMX, "");
- System.setProperty(InstrumentationAgentImpl.SYSTEM_PROPERTY_JMX + ".domain", domainName);
- System.setProperty(InstrumentationAgentImpl.SYSTEM_PROPERTY_JMX + ".port", "1099");
+ System.setProperty(DefaultInstrumentationAgent.SYSTEM_PROPERTY_JMX, "");
+ System.setProperty(DefaultInstrumentationAgent.SYSTEM_PROPERTY_JMX + ".domain", domainName);
+ System.setProperty(DefaultInstrumentationAgent.SYSTEM_PROPERTY_JMX + ".port", "1099");
super.setUp();
}
@Override
protected void tearDown() throws Exception {
// restore environment to original state
- System.setProperty(InstrumentationAgentImpl.SYSTEM_PROPERTY_JMX, "");
- System.setProperty(InstrumentationAgentImpl.SYSTEM_PROPERTY_JMX + ".domain", "");
- System.setProperty(InstrumentationAgentImpl.SYSTEM_PROPERTY_JMX + ".port", "");
+ System.setProperty(DefaultInstrumentationAgent.SYSTEM_PROPERTY_JMX, "");
+ System.setProperty(DefaultInstrumentationAgent.SYSTEM_PROPERTY_JMX + ".domain", "");
+ System.setProperty(DefaultInstrumentationAgent.SYSTEM_PROPERTY_JMX + ".port", "");
super.tearDown();
}