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 2013/07/29 22:33:30 UTC
git commit: CAMEL-4974: Added santizie option to JMX to hide
sensitive information like password in URIs exposed in JMX MBean names and
attributes.
Updated Branches:
refs/heads/master 9f3b95f9a -> 1fb74e0cc
CAMEL-4974: Added santizie option to JMX to hide sensitive information like password in URIs exposed in JMX MBean names and attributes.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1fb74e0c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1fb74e0c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1fb74e0c
Branch: refs/heads/master
Commit: 1fb74e0cc2b9f31f32ef69abecf3b56a96034f4b
Parents: 9f3b95f
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 29 22:33:17 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 29 22:33:17 2013 +0200
----------------------------------------------------------------------
.../apache/camel/impl/DefaultCamelContext.java | 3 +-
.../DefaultManagementMBeanAssembler.java | 30 +++-----------
.../impl/MultipleLifecycleStrategyTest.java | 2 +-
.../management/ManagedRouteAddRemoveTest.java | 42 ++++++++++----------
.../jt400/Jt400DataQueueEndpointTest.java | 2 +-
.../component/jt400/Jt400PgmEndpointTest.java | 2 +-
6 files changed, 30 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1fb74e0c/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 88a7de0..fdd238a 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -1550,7 +1550,6 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
if (managementMBeanAssembler == null) {
managementMBeanAssembler = createManagementMBeanAssembler();
}
- addService(managementMBeanAssembler);
if (log.isDebugEnabled()) {
log.debug("Using ClassResolver={}, PackageScanClassResolver={}, ApplicationContextClassLoader={}",
@@ -2281,7 +2280,7 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
* Lazily create a default implementation
*/
protected ManagementMBeanAssembler createManagementMBeanAssembler() {
- return new DefaultManagementMBeanAssembler();
+ return new DefaultManagementMBeanAssembler(this);
}
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/1fb74e0c/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java
index 034d577..0687474 100644
--- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java
+++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementMBeanAssembler.java
@@ -25,15 +25,11 @@ import javax.management.modelmbean.ModelMBeanInfo;
import javax.management.modelmbean.RequiredModelMBean;
import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.StaticService;
import org.apache.camel.api.management.ManagedInstance;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.NotificationSenderAware;
import org.apache.camel.spi.ManagementMBeanAssembler;
-import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.ServiceHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,20 +40,14 @@ import org.slf4j.LoggerFactory;
*
* @version
*/
-public class DefaultManagementMBeanAssembler extends ServiceSupport implements ManagementMBeanAssembler, CamelContextAware, StaticService {
+public class DefaultManagementMBeanAssembler implements ManagementMBeanAssembler {
protected final Logger log = LoggerFactory.getLogger(getClass());
- private MBeanInfoAssembler assembler;
- private CamelContext camelContext;
+ private final MBeanInfoAssembler assembler;
+ private final CamelContext camelContext;
- public DefaultManagementMBeanAssembler() {
- }
-
- public CamelContext getCamelContext() {
- return camelContext;
- }
-
- public void setCamelContext(CamelContext camelContext) {
+ public DefaultManagementMBeanAssembler(CamelContext camelContext) {
this.camelContext = camelContext;
+ this.assembler = new MBeanInfoAssembler(camelContext);
}
public ModelMBean assemble(MBeanServer mBeanServer, Object obj, ObjectName name) throws JMException {
@@ -103,14 +93,4 @@ public class DefaultManagementMBeanAssembler extends ServiceSupport implements M
return mbean;
}
- protected void doStart() throws Exception {
- if (assembler == null) {
- assembler = new MBeanInfoAssembler(camelContext);
- }
- ServiceHelper.startService(assembler);
- }
-
- protected void doStop() throws Exception {
- ServiceHelper.stopService(assembler);
- }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1fb74e0c/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java b/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
index 460e72f..5486d77 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
@@ -51,7 +51,7 @@ public class MultipleLifecycleStrategyTest extends TestSupport {
context.stop();
List<String> expectedEvents = Arrays.asList("onContextStart", "onServiceAdd", "onServiceAdd", "onServiceAdd",
- "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd",
+ "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd",
"onThreadPoolAdd", "onComponentAdd", "onEndpointAdd", "onComponentRemove", "onContextStop", "onThreadPoolRemove");
assertEquals(expectedEvents, dummy1.getEvents());
http://git-wip-us.apache.org/repos/asf/camel/blob/1fb74e0c/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
index 7e4ddb6..280cb3d 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
@@ -53,7 +53,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Adding 2nd route");
@@ -73,7 +73,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Removing 2nd route");
@@ -84,7 +84,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Shutting down...");
}
@@ -100,7 +100,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Adding 2nd route");
@@ -120,7 +120,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Removing 2nd route");
@@ -131,7 +131,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Shutting down...");
}
@@ -147,7 +147,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Adding 2nd route");
@@ -167,7 +167,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Removing 2nd route");
@@ -178,7 +178,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Shutting down...");
}
@@ -194,7 +194,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Adding 2nd route");
@@ -224,7 +224,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
// now stop and remove the 2nd route
log.info("Stopping 2nd route");
@@ -236,7 +236,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Shutting down...");
}
@@ -252,7 +252,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Adding 2nd route");
@@ -283,7 +283,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
// now stop and remove the 2nd route
log.info("Stopping 2nd route");
@@ -295,7 +295,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Shutting down...");
}
@@ -311,7 +311,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Adding 2nd route");
@@ -340,7 +340,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
// now stop and remove the 2nd route
log.info("Stopping 2nd route");
@@ -352,7 +352,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Shutting down...");
}
@@ -368,7 +368,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// number of services
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Adding 2nd route");
@@ -398,7 +398,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
// now stop and remove the 2nd route
log.info("Stopping 2nd route");
@@ -410,7 +410,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
// there should still be the same number of services
names = mbeanServer.queryNames(on, null);
- assertEquals(9, names.size());
+ assertEquals(8, names.size());
log.info("Shutting down...");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1fb74e0c/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueEndpointTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueEndpointTest.java
index 06c7275..211f76b 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueEndpointTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400DataQueueEndpointTest.java
@@ -48,6 +48,6 @@ public class Jt400DataQueueEndpointTest extends Jt400TestSupport {
@Test
public void testToString() {
- assertEquals("Endpoint[jt400://user:******@host/qsys.lib/library.lib/queue.dtaq?ccsid=500&connectionPool=%23mockPool&format=binary&guiAvailable=true]", endpoint.toString());
+ assertEquals("Endpoint[jt400://user:xxxxxx@host/qsys.lib/library.lib/queue.dtaq?ccsid=500&connectionPool=%23mockPool&format=binary&guiAvailable=true]", endpoint.toString());
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1fb74e0c/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java
index b44dd53..b8d6cdd 100644
--- a/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java
+++ b/components/camel-jt400/src/test/java/org/apache/camel/component/jt400/Jt400PgmEndpointTest.java
@@ -61,7 +61,7 @@ public class Jt400PgmEndpointTest extends Jt400TestSupport {
@Test
public void testToString() {
- assertEquals("Endpoint[jt400://USER:******@host/qsys.lib/library.lib/prog.pgm?connectionPool=%23mockPool&fieldsLength=10%2C512%2C255&format=binary&guiAvailable=true&outputFieldsIdx=1%2C2]",
+ assertEquals("Endpoint[jt400://USER:xxxxxx@host/qsys.lib/library.lib/prog.pgm?connectionPool=%23mockPool&fieldsLength=10%2C512%2C255&format=binary&guiAvailable=true&outputFieldsIdx=1%2C2]",
endpoint.toString());
}
}