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 2009/08/25 08:46:17 UTC
svn commit: r807498 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/management/
camel-core/src/main/java/org/apache/camel/spi/
components/camel-spring/src/test/java/org/apache/camel/spring/managment/
Author: davsclaus
Date: Tue Aug 25 06:46:16 2009
New Revision: 807498
URL: http://svn.apache.org/viewvc?rev=807498&view=rev
Log:
CAMEL-1933: JMX management overhaul. Renamed some classes.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java (contents, props changed)
- copied, changed from r807496, camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedCounter.java (contents, props changed)
- copied, changed from r807496, camel/trunk/camel-core/src/main/java/org/apache/camel/management/Counter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedPerformanceCounter.java (contents, props changed)
- copied, changed from r807496, camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementAgent.java (contents, props changed)
- copied, changed from r807496, camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InstrumentationAgent.java
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/Counter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InstrumentationAgent.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedRoute.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/JmxInstrumentationWithConnectorTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java?rev=807498&r1=807497&r2=807498&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultInstrumentationAgent.java Tue Aug 25 06:46:16 2009
@@ -40,7 +40,7 @@
import javax.management.remote.JMXServiceURL;
import org.apache.camel.impl.ServiceSupport;
-import org.apache.camel.spi.InstrumentationAgent;
+import org.apache.camel.spi.ManagementAgent;
import org.apache.camel.util.concurrent.ExecutorServiceHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -50,7 +50,7 @@
/**
* Default implementation of the Camel JMX service agent
*/
-public class DefaultInstrumentationAgent extends ServiceSupport implements InstrumentationAgent {
+public class DefaultInstrumentationAgent extends ServiceSupport implements ManagementAgent {
public static final String DEFAULT_DOMAIN = "org.apache.camel";
public static final String DEFAULT_HOST = "localhost";
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java (from r807496, camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java&r1=807496&r2=807498&rev=807498&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/CamelNamingStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java Tue Aug 25 06:46:16 2009
@@ -33,7 +33,7 @@
/**
* Naming strategy used when registering MBeans.
*/
-public class CamelNamingStrategy {
+public class DefaultManagementNamingStrategy {
public static final String VALUE_UNKNOWN = "unknown";
public static final String KEY_NAME = "name";
public static final String KEY_TYPE = "type";
@@ -50,11 +50,11 @@
protected String domainName;
protected String hostName = "localhost";
- public CamelNamingStrategy() {
+ public DefaultManagementNamingStrategy() {
this("org.apache.camel");
}
- public CamelNamingStrategy(String domainName) {
+ public DefaultManagementNamingStrategy(String domainName) {
if (domainName != null) {
this.domainName = domainName;
}
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java?rev=807498&r1=807497&r2=807498&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationInterceptStrategy.java Tue Aug 25 06:46:16 2009
@@ -26,7 +26,7 @@
/**
* This strategy class wraps targeted processors with a
* {@link InstrumentationProcessor}. Each InstrumentationProcessor has an
- * embedded {@link PerformanceCounter} for monitoring performance metrics.
+ * embedded {@link ManagedPerformanceCounter} for monitoring performance metrics.
* <p/>
* This class looks up a map to determine which PerformanceCounter should go into the
* InstrumentationProcessor for any particular target processor.
@@ -35,9 +35,9 @@
*/
public class InstrumentationInterceptStrategy implements InterceptStrategy {
- private Map<ProcessorDefinition, PerformanceCounter> registeredCounters;
+ private Map<ProcessorDefinition, ManagedPerformanceCounter> registeredCounters;
- public InstrumentationInterceptStrategy(Map<ProcessorDefinition, PerformanceCounter> registeredCounters) {
+ public InstrumentationInterceptStrategy(Map<ProcessorDefinition, ManagedPerformanceCounter> registeredCounters) {
this.registeredCounters = registeredCounters;
}
@@ -49,7 +49,7 @@
}
// only wrap a performance counter if we have it registered in JMX by the jmx agent
- PerformanceCounter counter = registeredCounters.get(definition);
+ ManagedPerformanceCounter counter = registeredCounters.get(definition);
if (counter != null) {
InstrumentationProcessor wrapper = new InstrumentationProcessor(counter);
wrapper.setProcessor(target);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java?rev=807498&r1=807497&r2=807498&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationLifecycleStrategy.java Tue Aug 25 06:46:16 2009
@@ -38,7 +38,7 @@
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.ClassResolver;
-import org.apache.camel.spi.InstrumentationAgent;
+import org.apache.camel.spi.ManagementAgent;
import org.apache.camel.spi.InterceptStrategy;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.RouteContext;
@@ -55,8 +55,8 @@
private static final transient Log LOG = LogFactory.getLog(InstrumentationProcessor.class);
private static final String MANAGED_RESOURCE_CLASSNAME = "org.springframework.jmx.export.annotation.ManagedResource";
- private InstrumentationAgent agent;
- private CamelNamingStrategy namingStrategy;
+ private ManagementAgent agent;
+ private DefaultManagementNamingStrategy namingStrategy;
private boolean initialized;
private final Map<Endpoint, InstrumentationProcessor> registeredRoutes = new HashMap<Endpoint, InstrumentationProcessor>();
@@ -64,7 +64,7 @@
this(new DefaultInstrumentationAgent());
}
- public InstrumentationLifecycleStrategy(InstrumentationAgent agent) {
+ public InstrumentationLifecycleStrategy(ManagementAgent agent) {
this.agent = agent;
}
/**
@@ -73,7 +73,7 @@
* @param agent the agent
* @param context the camel context
*/
- public InstrumentationLifecycleStrategy(InstrumentationAgent agent, CamelContext context) {
+ public InstrumentationLifecycleStrategy(ManagementAgent agent, CamelContext context) {
this.agent = agent;
onContextStart(context);
}
@@ -86,7 +86,7 @@
DefaultCamelContext dc = (DefaultCamelContext)context;
// call addService so that context will start and stop the agent
dc.addService(agent);
- namingStrategy = new CamelNamingStrategy(agent.getMBeanObjectDomainName());
+ namingStrategy = new DefaultManagementNamingStrategy(agent.getMBeanObjectDomainName());
ManagedService ms = new ManagedService(dc);
agent.register(ms, getNamingStrategy().getObjectName(dc));
} catch (Exception e) {
@@ -210,8 +210,8 @@
// Create a map (ProcessorType -> PerformanceCounter)
// to be passed to InstrumentationInterceptStrategy.
- Map<ProcessorDefinition, PerformanceCounter> registeredCounters =
- new HashMap<ProcessorDefinition, PerformanceCounter>();
+ Map<ProcessorDefinition, ManagedPerformanceCounter> registeredCounters =
+ new HashMap<ProcessorDefinition, ManagedPerformanceCounter>();
// Each processor in a route will have its own performance counter
// The performance counter are MBeans that we register with MBeanServer.
@@ -238,7 +238,7 @@
name = getNamingStrategy().getObjectName(routeContext, processor);
// register mbean wrapped in the performance counter mbean
- PerformanceCounter pc = new PerformanceCounter();
+ ManagedPerformanceCounter pc = new ManagedPerformanceCounter();
agent.register(pc, name);
// add to map now that it has been registered
@@ -323,15 +323,15 @@
return true;
}
- public CamelNamingStrategy getNamingStrategy() {
+ public DefaultManagementNamingStrategy getNamingStrategy() {
return namingStrategy;
}
- public void setNamingStrategy(CamelNamingStrategy strategy) {
+ public void setNamingStrategy(DefaultManagementNamingStrategy strategy) {
this.namingStrategy = strategy;
}
- public void setAgent(InstrumentationAgent agent) {
+ public void setAgent(ManagementAgent agent) {
this.agent = agent;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java?rev=807498&r1=807497&r2=807498&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java Tue Aug 25 06:46:16 2009
@@ -22,7 +22,7 @@
import org.apache.commons.logging.LogFactory;
/**
- * JMX enabled processor that uses the {@link Counter} for instrumenting
+ * JMX enabled processor that uses the {@link ManagedCounter} for instrumenting
* processing of exchanges.
*
* @version $Revision$
@@ -30,13 +30,13 @@
public class InstrumentationProcessor extends DelegateProcessor {
private static final transient Log LOG = LogFactory.getLog(InstrumentationProcessor.class);
- private PerformanceCounter counter;
+ private ManagedPerformanceCounter counter;
private String type;
public InstrumentationProcessor() {
}
- public InstrumentationProcessor(PerformanceCounter counter) {
+ public InstrumentationProcessor(ManagedPerformanceCounter counter) {
this.counter = counter;
}
@@ -45,7 +45,7 @@
return "Instrumention" + (type != null ? ":" + type : "") + "[" + processor + "]";
}
- public void setCounter(PerformanceCounter counter) {
+ public void setCounter(ManagedPerformanceCounter counter) {
this.counter = counter;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedCounter.java (from r807496, camel/trunk/camel-core/src/main/java/org/apache/camel/management/Counter.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedCounter.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedCounter.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/management/Counter.java&r1=807496&r2=807498&rev=807498&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/Counter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedCounter.java Tue Aug 25 06:46:16 2009
@@ -23,7 +23,7 @@
import org.springframework.jmx.export.annotation.ManagedResource;
@ManagedResource(description = "Counter", currencyTimeLimit = 15)
-public class Counter {
+public class ManagedCounter {
protected AtomicLong numExchanges = new AtomicLong(0L);
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedCounter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedCounter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedPerformanceCounter.java (from r807496, camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedPerformanceCounter.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedPerformanceCounter.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java&r1=807496&r2=807498&rev=807498&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedPerformanceCounter.java Tue Aug 25 06:46:16 2009
@@ -24,7 +24,7 @@
import org.springframework.jmx.export.annotation.ManagedResource;
@ManagedResource(description = "PerformanceCounter", currencyTimeLimit = 15)
-public class PerformanceCounter extends Counter {
+public class ManagedPerformanceCounter extends ManagedCounter {
private AtomicLong numCompleted = new AtomicLong(0L);
private double minProcessingTime;
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedPerformanceCounter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedPerformanceCounter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedRoute.java?rev=807498&r1=807497&r2=807498&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedRoute.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedRoute.java Tue Aug 25 06:46:16 2009
@@ -25,7 +25,7 @@
import org.springframework.jmx.export.annotation.ManagedResource;
@ManagedResource(description = "Managed Route", currencyTimeLimit = 15)
-public class ManagedRoute extends PerformanceCounter {
+public class ManagedRoute extends ManagedPerformanceCounter {
public static final String VALUE_UNKNOWN = "Unknown";
private Route route;
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementAgent.java (from r807496, camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InstrumentationAgent.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementAgent.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementAgent.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InstrumentationAgent.java&r1=807496&r2=807498&rev=807498&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/spi/InstrumentationAgent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementAgent.java Tue Aug 25 06:46:16 2009
@@ -25,7 +25,7 @@
/**
* Camel JMX service agent
*/
-public interface InstrumentationAgent extends Service {
+public interface ManagementAgent extends Service {
/**
* Registers object with management infrastructure with a specific name. Object must be annotated or
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementAgent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ManagementAgent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/JmxInstrumentationWithConnectorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/JmxInstrumentationWithConnectorTest.java?rev=807498&r1=807497&r2=807498&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/JmxInstrumentationWithConnectorTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/JmxInstrumentationWithConnectorTest.java Tue Aug 25 06:46:16 2009
@@ -17,7 +17,7 @@
package org.apache.camel.spring.managment;
import org.apache.camel.management.DefaultInstrumentationAgent;
-import org.apache.camel.spi.InstrumentationAgent;
+import org.apache.camel.spi.ManagementAgent;
import org.apache.camel.spring.EndpointReferenceTest;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -25,7 +25,7 @@
public class JmxInstrumentationWithConnectorTest extends EndpointReferenceTest {
public void testJmxConfiguration() throws Exception {
- InstrumentationAgent agent = getMandatoryBean(DefaultInstrumentationAgent.class, "agent");
+ ManagementAgent agent = getMandatoryBean(DefaultInstrumentationAgent.class, "agent");
assertNotNull("SpringInstrumentationAgent must be configured for JMX support", agent);
assertNotNull("MBeanServer must be configured for JMX support", agent.getMBeanServer());
assertEquals("org.apache.camel.test", agent.getMBeanServer().getDefaultDomain());