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 2010/12/18 10:47:56 UTC
svn commit: r1050604 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/management/
components/camel-spring/src/main/java/org/apache/camel/spring/handler/
Author: davsclaus
Date: Sat Dec 18 09:47:56 2010
New Revision: 1050604
URL: http://svn.apache.org/viewvc?rev=1050604&view=rev
Log:
CAMEL-3437: Thread pools now use better naming in JMX, so its much easier for end user to spot whats the thread pool is used for.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java?rev=1050604&r1=1050603&r2=1050604&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceStrategy.java Sat Dec 18 09:47:56 2010
@@ -361,7 +361,7 @@ public class DefaultExecutorServiceStrat
// add to internal list of thread pools
executorServices.add(executorService);
- String id = null; //threadPoolProfileId;
+ String id = null;
String sourceId = null;
String routeId = null;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java?rev=1050604&r1=1050603&r2=1050604&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java Sat Dec 18 09:47:56 2010
@@ -605,7 +605,6 @@ public class DefaultManagementLifecycleS
return;
}
- // use a String representation of source
ManagedThreadPool mtp = new ManagedThreadPool(camelContext, threadPool, id, sourceId, routeId, threadPoolProfileId);
mtp.init(getManagementStrategy());
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java?rev=1050604&r1=1050603&r2=1050604&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java Sat Dec 18 09:47:56 2010
@@ -256,15 +256,17 @@ public class DefaultManagementNamingStra
buffer.append(KEY_TYPE + "=" + TYPE_THREAD_POOL + ",");
buffer.append(KEY_NAME + "=");
if (id == null) {
- // if no id then use class name as source id
+ // if no id then use class name as id
buffer.append(threadPool.getClass().getSimpleName());
} else {
buffer.append(id);
}
if (id == null && sourceId == null) {
- // if we dont really know the id or source id then use hashcode so its unique
+ // if we don't really know the id or source id then use instance hashcode so the name is unique
+ // for this particular thread pool
buffer.append("(").append(ObjectHelper.getIdentityHashCode(threadPool)).append(")");
} else if (sourceId != null) {
+ // provide source if we know it, this helps end user to know where the pool is used
buffer.append("(").append(sourceId).append(")");
}
return createObjectName(buffer);
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java?rev=1050604&r1=1050603&r2=1050604&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java Sat Dec 18 09:47:56 2010
@@ -16,14 +16,15 @@
*/
package org.apache.camel.spring.handler;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.core.Conventions;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
/**
* A base class for a parser for a bean.
@@ -85,13 +86,12 @@ public class BeanDefinitionParser extend
Attr attribute = (Attr) attributes.item(x);
String name = attribute.getLocalName();
String fullName = attribute.getName();
- // assign id as we want them as well
+ // assign id if we want them
if (fullName.equals("id") && assignId) {
- // for some id is optional as we have convention over configuration
if (attribute.getValue() != null) {
builder.addPropertyValue("id", attribute.getValue());
}
- // assign other attributes if eligible
+ // assign other attributes if eligible
} else if (!fullName.startsWith("xmlns:") && !fullName.equals("xmlns") && isEligibleAttribute(name)) {
String propertyName = extractPropertyName(name);
Assert.state(StringUtils.hasText(propertyName),