You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/11/06 16:03:40 UTC
[1/2] git commit: Add BeanManager as parameter - will be injected by
@Observes & PassivationCapable
Updated Branches:
refs/heads/master 61312f51c -> 5de774cb1
Add BeanManager as parameter - will be injected by @Observes & PassivationCapable
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c97601f5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c97601f5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c97601f5
Branch: refs/heads/master
Commit: c97601f546323279931ea9a0f1ff8df72b3d1b7e
Parents: 71758b5
Author: Charles Mouliard <cm...@apache.org>
Authored: Wed Nov 6 16:01:51 2013 +0100
Committer: Charles Mouliard <cm...@apache.org>
Committed: Wed Nov 6 16:01:51 2013 +0100
----------------------------------------------------------------------
.../org/apache/camel/cdi/internal/BeanAdapter.java | 14 +++++++++-----
.../apache/camel/cdi/internal/CamelContextBean.java | 11 +++++++++--
.../apache/camel/cdi/internal/CamelExtension.java | 15 ++++++++++-----
3 files changed, 28 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c97601f5/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java
index db986f6..504ac11 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/BeanAdapter.java
@@ -20,6 +20,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
import org.apache.camel.Consume;
import org.apache.camel.EndpointInject;
@@ -38,6 +40,8 @@ public class BeanAdapter {
private final List<Field> endpointFields = new ArrayList<Field>();
private final ContextName startup;
+ @Inject BeanManager beanManager;
+
public BeanAdapter(ContextName startup) {
this.startup = startup;
}
@@ -80,7 +84,7 @@ public class BeanAdapter {
if (annotation != null) {
String contextName = CamelExtension.getCamelContextName(annotation.context(), startup);
DefaultCamelBeanPostProcessor postProcessor = camelExtension.getPostProcessor(
- contextName);
+ contextName, beanManager);
if (postProcessor != null) {
postProcessor.getPostProcessorHelper().consumerInjection(method, reference, beanName);
}
@@ -91,7 +95,7 @@ public class BeanAdapter {
if (annotation != null) {
String contextName = CamelExtension.getCamelContextName(annotation.context(), startup);
DefaultCamelBeanPostProcessor postProcessor = camelExtension.getPostProcessor(
- contextName);
+ contextName, beanManager);
if (postProcessor != null && postProcessor.getPostProcessorHelper().matchContext(contextName)) {
postProcessor.setterInjection(method, reference, beanName, annotation.uri(), annotation.ref(),
annotation.property());
@@ -103,7 +107,7 @@ public class BeanAdapter {
if (annotation != null) {
String contextName = CamelExtension.getCamelContextName(annotation.context(), startup);
DefaultCamelBeanPostProcessor postProcessor = camelExtension.getPostProcessor(
- contextName);
+ contextName, beanManager);
if (postProcessor != null && postProcessor.getPostProcessorHelper().matchContext(contextName)) {
postProcessor.setterInjection(method, reference, beanName, annotation.uri(), annotation.ref(),
annotation.property());
@@ -116,7 +120,7 @@ public class BeanAdapter {
if (annotation != null) {
String contextName = CamelExtension.getCamelContextName(annotation.context(), startup);
DefaultCamelBeanPostProcessor postProcessor = camelExtension.getPostProcessor(
- contextName);
+ contextName, beanManager);
if (postProcessor != null && postProcessor.getPostProcessorHelper().matchContext(contextName)) {
postProcessor.injectField(field, annotation.uri(), annotation.ref(),
annotation.property(), reference, beanName);
@@ -127,7 +131,7 @@ public class BeanAdapter {
EndpointInject annotation = field.getAnnotation(EndpointInject.class);
String contextName = CamelExtension.getCamelContextName(annotation.context(), startup);
DefaultCamelBeanPostProcessor postProcessor = camelExtension.getPostProcessor(
- contextName);
+ contextName, beanManager);
if (postProcessor != null && postProcessor.getPostProcessorHelper().matchContext(contextName)) {
postProcessor.injectField(field, annotation.uri(), annotation.ref(),
annotation.property(), reference, beanName);
http://git-wip-us.apache.org/repos/asf/camel/blob/c97601f5/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java
index 7e97f66..f94d371 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java
@@ -21,13 +21,14 @@ import java.lang.reflect.Type;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-
+import java.util.UUID;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
+import javax.enterprise.inject.spi.PassivationCapable;
import org.apache.camel.CamelContext;
import org.apache.camel.cdi.CdiCamelContext;
@@ -39,7 +40,9 @@ import org.apache.deltaspike.core.api.literal.DefaultLiteral;
* Description of camel context bean.
*/
@SuppressWarnings("unchecked")
-public class CamelContextBean implements Bean<CdiCamelContext> {
+public class CamelContextBean implements Bean<CdiCamelContext>, PassivationCapable {
+
+ private static final UUID uniqueId = UUID.randomUUID();
private final BeanManager beanManager;
private final String name;
@@ -130,4 +133,8 @@ public class CamelContextBean implements Bean<CdiCamelContext> {
public void configureCamelContext(CdiCamelContext camelContext) {
config.configure(camelContext, beanManager);
}
+
+ @Override public String getId() {
+ return uniqueId.toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c97601f5/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
index a05f9c2..44a44b5 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
@@ -63,6 +63,7 @@ import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
* Set of camel specific hooks for CDI.
*/
public class CamelExtension implements Extension {
+
private static class InjectLiteral extends AnnotationLiteral<Inject> implements Inject {
private static final long serialVersionUID = 1L;
}
@@ -223,7 +224,7 @@ public class CamelExtension implements Extension {
throws Exception {
for (CamelContextBean bean : camelContextBeans) {
String name = bean.getCamelContextName();
- CamelContext context = getCamelContext(name);
+ CamelContext context = getCamelContext(name, beanManager);
if (context == null) {
throw new IllegalStateException(
"CamelContext '" + name + "' has not been injected into the CamelContextMap");
@@ -317,8 +318,8 @@ public class CamelExtension implements Extension {
return adapter;
}
- protected DefaultCamelBeanPostProcessor getPostProcessor(String context) {
- CamelContext camelContext = getCamelContext(context);
+ protected DefaultCamelBeanPostProcessor getPostProcessor(String context, BeanManager beanManager) {
+ CamelContext camelContext = getCamelContext(context, beanManager);
if (camelContext != null) {
return new DefaultCamelBeanPostProcessor(camelContext);
} else {
@@ -326,9 +327,13 @@ public class CamelExtension implements Extension {
}
}
- protected CamelContext getCamelContext(String context) {
+ protected CamelContext getCamelContext(String context, BeanManager beanManager) {
if (camelContextMap == null) {
- camelContextMap = BeanProvider.getContextualReference(CamelContextMap.class);
+ //camelContextMap = BeanProvider.getContextualReference(CamelContextMap.class);
+ Set<Bean<?>> beans = beanManager.getBeans(CamelContextMap.class);
+ Bean<?> bean = beanManager.resolve(beans);
+ CreationalContext<?> creationalContext = beanManager.createCreationalContext(bean);
+ camelContextMap = (CamelContextMap) beanManager.getReference(bean, bean.getBeanClass(), creationalContext);
ObjectHelper.notNull(camelContextMap, "Could not resolve CamelContextMap");
}
return camelContextMap.getCamelContext(context);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel
Posted by cm...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5de774cb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5de774cb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5de774cb
Branch: refs/heads/master
Commit: 5de774cb1eb5467a8917fe36e37f0f7fc180f93d
Parents: c97601f 61312f5
Author: Charles Mouliard <cm...@apache.org>
Authored: Wed Nov 6 16:02:23 2013 +0100
Committer: Charles Mouliard <cm...@apache.org>
Committed: Wed Nov 6 16:02:23 2013 +0100
----------------------------------------------------------------------
.../camel/converter/jaxp/XmlConverter.java | 19 +++++-
.../management/DefaultManagementAgent.java | 12 ++++
.../DefaultManagementNamingStrategy.java | 7 +-
.../camel/management/JmxSystemPropertyKeys.java | 3 +
.../management/mbean/ManagedCamelContext.java | 8 ++-
.../camel/management/mbean/ManagedRoute.java | 6 +-
.../org/apache/camel/spi/ManagementAgent.java | 19 ++++++
.../camel/management/BacklogDebuggerTest.java | 12 ++--
.../management/BacklogTracerFilterTest.java | 2 +-
.../BacklogTracerIdOnAllNodesTest.java | 2 +-
.../BacklogTracerPatternRouteTest.java | 2 +-
.../management/BacklogTracerPatternTest.java | 2 +-
.../camel/management/BacklogTracerTest.java | 14 ++--
.../DualManagedThreadPoolProfileTest.java | 4 +-
.../DualManagedThreadPoolWithIdTest.java | 4 +-
.../management/EndpointCompletionTest.java | 4 +-
.../JmxInstrumentationCustomMBeanTest.java | 3 -
.../JmxNotificationEventNotifierTest.java | 8 +--
.../camel/management/JmxRecipientListTest.java | 20 +++---
.../ManagedBrowsableEndpointAsXmlTest.java | 14 ++--
.../ManagedBrowsableEndpointEmptyTest.java | 2 +-
.../ManagedBrowsableEndpointTest.java | 2 +-
.../apache/camel/management/ManagedCBRTest.java | 16 ++---
.../ManagedCamelContextAutoStartupTest.java | 4 +-
.../ManagedCamelContextDumpRoutesAsXmlTest.java | 2 +-
.../ManagedCamelContextDumpStatsAsXmlTest.java | 2 +-
.../ManagedCamelContextPropertiesTest.java | 2 +-
.../ManagedCamelContextRestartTest.java | 2 +-
.../ManagedCamelContextSuspendResumeTest.java | 2 +-
.../ManagedCamelContextSuspendStartTest.java | 2 +-
.../management/ManagedCamelContextTest.java | 12 ++--
.../ManagedCamelContextTracerTest.java | 4 +-
...agedCamelContextUpdateRoutesFromXmlTest.java | 2 +-
...nagedCanekContextExchangeStatisticsTest.java | 6 +-
.../camel/management/ManagedCustomBeanTest.java | 2 +-
.../management/ManagedCustomPolicyTest.java | 6 +-
.../management/ManagedCustomProcessorTest.java | 2 +-
.../camel/management/ManagedDelayerTest.java | 4 +-
.../management/ManagedDualCamelContextTest.java | 7 +-
.../camel/management/ManagedEndpointTest.java | 4 +-
.../camel/management/ManagedInterceptTest.java | 6 +-
.../management/ManagedLoadBalancerTest.java | 6 +-
.../management/ManagedLogEndpointTest.java | 2 +-
.../camel/management/ManagedMulticastTest.java | 6 +-
.../management/ManagedNamePatternFixedTest.java | 2 +-
.../ManagedNamePatternIncludeHostNameTest.java | 63 ++++++++++++++++++
.../management/ManagedNamePatternTest.java | 2 +-
.../ManagedRedeliverRouteOnlyTest.java | 2 +-
.../camel/management/ManagedRedeliverTest.java | 4 +-
.../ManagedRegisterCamelContextTest.java | 2 +-
.../management/ManagedRegisterEndpointTest.java | 6 +-
.../ManagedRegisterExchangeStatisticsTest.java | 2 +-
...nagedRemoveRouteAggregateThreadPoolTest.java | 2 +-
.../ManagedResetIncludeRoutesTest.java | 2 +-
.../camel/management/ManagedResourceTest.java | 4 +-
.../ManagedRouteAddFromRouteTest.java | 4 +-
.../management/ManagedRouteAddRemoveTest.java | 14 ++--
...eAddSecondRouteNotRegisterNewRoutesTest.java | 4 +-
.../ManagedRouteAddSecondRouteTest.java | 4 +-
.../management/ManagedRouteAutoStartupTest.java | 6 +-
.../ManagedRouteContextTracerTest.java | 4 +-
.../ManagedRouteDumpStatsAsXmlTest.java | 2 +-
.../ManagedRoutePerformanceCounterTest.java | 2 +-
...outeRemoveWireTapExplicitThreadPoolTest.java | 2 +-
.../ManagedRouteRemoveWireTapTest.java | 2 +-
.../camel/management/ManagedSanitizeTest.java | 2 +-
.../management/ManagedSedaEndpointTest.java | 2 +-
.../management/ManagedSendProcessorTest.java | 2 +-
.../management/ManagedServiceUrlPathTest.java | 6 +-
.../management/ManagedShutdownStrategyTest.java | 2 +-
.../camel/management/ManagedStatisticsTest.java | 4 +-
.../ManagedStatisticsWithSplitterTest.java | 10 +--
.../ManagedStreamCachingStrategyTest.java | 2 +-
.../ManagedThreadPoolProfileTest.java | 2 +-
.../camel/management/ManagedThreadPoolTest.java | 2 +-
.../management/ManagedThreadPoolWithIdTest.java | 2 +-
.../camel/management/ManagedThrottlerTest.java | 24 +++----
.../camel/management/ManagedTimerTest.java | 2 +-
.../management/ManagedTracerOptionsTest.java | 2 +-
.../ManagedTypeConverterRegistryTest.java | 2 +-
.../ManagedUnregisterCamelContextTest.java | 2 +-
.../ManagedUnregisterEndpointTest.java | 2 +-
.../management/ManagedUnregisterRouteTest.java | 2 +-
.../camel/management/ManagementTestSupport.java | 3 -
...edCamelContextAutoAssignedNameClashTest.java | 7 +-
.../TwoManagedCamelContextClashTest.java | 13 ++--
.../management/TwoManagedCamelContextTest.java | 7 +-
.../management/TwoManagedNamePatternTest.java | 7 +-
.../xml/AbstractCamelContextFactoryBean.java | 1 +
.../camel/core/xml/CamelJMXAgentDefinition.java | 17 +++++
.../camel/component/dns/DnsDigEndpoint.java | 10 ++-
.../camel/component/dns/DnsDigEndpointTest.java | 13 ++--
.../camel/component/http4/HttpProducer.java | 7 +-
.../http4/HttpProducerContentTypeTest.java | 70 ++++++++++++++++++++
.../jms/DefaultJmsMessageListenerContainer.java | 30 ++++++++-
.../jms/JmsAddAndRemoveRouteManagementTest.java | 5 --
.../component/jms/ManagedJmsEndpointTest.java | 6 +-
.../jms/ManagedJmsEndpointTopicTest.java | 6 +-
...STransactionIsTransactedRedeliveredTest.java | 2 +-
...MSTransactionIsTransactedRedeliveredTest.xml | 5 --
.../netty/http/ManagedNettyEndpointTest.java | 8 +--
.../ExposedServletEndpointURIToJMXTest.java | 2 +-
...ngJmxDumpRoutesAsXmlIncludeHostNameTest.java | 57 ++++++++++++++++
.../SpringJmxDumpRoutesAsXmlTest.java | 2 +-
.../SpringJmxEndpointInjectBeanRefTest.java | 4 +-
.../SpringJmxEndpointInjectBeanRefTwoTest.java | 4 +-
.../SpringJmxEndpointInjectBeanTest.java | 4 +-
...pringJmxRecipientListRegisterAlwaysTest.java | 10 +--
.../management/SpringJmxRecipientListTest.java | 10 +--
.../SpringManagedCustomProcessorTest.java | 2 +-
.../SpringManagedSedaEndpointTest.java | 2 +-
.../DualSpringManagedThreadsThreadPoolTest.java | 4 +-
.../SpringManagedThreadsThreadPoolTest.java | 2 +-
.../apache/camel/spring/defaultJmxConfig.xml | 5 --
.../org/apache/camel/spring/jmxConfig.xml | 5 --
.../camel/spring/jmxConfigUsingProperties.xml | 5 --
...ringJmxDumpRouteAsXmlIncludeHostNameTest.xml | 50 ++++++++++++++
.../management/SpringJmxDumpRouteAsXmlTest.xml | 5 --
.../SpringJmxEndpointInjectBeanRefTest.xml | 5 --
.../SpringJmxEndpointInjectBeanRefTwoTest.xml | 5 --
.../SpringJmxEndpointInjectBeanTest.xml | 5 --
.../management/SpringJmxRecipientListTest.xml | 5 --
...SpringJmxRecipientListTestRegisterAlways.xml | 5 --
.../SpringManagedCustomProcessorTest.xml | 5 --
.../SpringManagedNamePatternFixedTest.xml | 5 --
.../management/SpringManagedNamePatternTest.xml | 5 --
.../management/SpringManagedResourceTest.xml | 5 --
...RouteRemoveContextScopedErrorHandlerTest.xml | 5 --
...oveRouteAndContextScopedErrorHandlerTest.xml | 5 --
...edRouteRemoveRouteScopedErrorHandlerTest.xml | 5 --
.../management/SpringManagedSanitizeTest.xml | 5 --
.../SpringManagedSedaEndpointTest.xml | 5 --
.../SpringDualManagedThreadsThreadPoolTest.xml | 5 --
.../SpringManagedThreadsThreadPoolTest.xml | 5 --
...agedNamePatternFixedIncludeHostNameTest.java | 57 ++++++++++++++++
.../management/ManagedNamePatternFixedTest.java | 2 +-
...nagedNamePatternFixedIncludeHostNameTest.xml | 38 +++++++++++
.../management/managedNamePatternFixedTest.xml | 5 --
.../zookeeper/ZooKeeperManagedEndpointTest.java | 4 --
...melBlueprintManagedNamePatternFixedTest.java | 2 +-
.../OSGiIntegrationManagedCamelContextTest.java | 2 +-
.../itest/osgi/blueprint/blueprint-fixed.xml | 5 --
142 files changed, 676 insertions(+), 386 deletions(-)
----------------------------------------------------------------------