Author: davsclaus
Date: Tue Mar 27 09:41:43 2012
New Revision: 1305792
URL: http://svn.apache.org/viewvc?rev=1305792&view=rev
Log:
Polished
Removed:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/util/package-info.java
Modified:
camel/trunk/components/camel-cdi/pom.xml
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiBeanRegistry.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiCamelContext.java
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/util/BeanManagerProvider.java
camel/trunk/components/camel-cdi/src/main/resources/META-INF/beans.xml
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContainerBeanManagerTest.java
camel/trunk/components/camel-cdi/src/test/resources/log4j.properties
Modified: camel/trunk/components/camel-cdi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/pom.xml?rev=1305792&r1=1305791&r2=1305792&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/pom.xml (original)
+++ camel/trunk/components/camel-cdi/pom.xml Tue Mar 27 09:41:43 2012
@@ -18,136 +18,116 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>2.10-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <artifactId>camel-cdi</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: CDI</name>
+ <description>Camel CDI</description>
+
+ <properties>
+
<camel.osgi.export.pkg>org.apache.camel.component.cdi.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+
+ <!-- SPI API -->
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <version>${openwebbeans-version}</version>
+ </dependency>
+
+ <!-- EL Plugin -->
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-el10</artifactId>
+ <version>${openwebbeans-version}</version>
+ </dependency>
+
+ <!-- Interceptor API -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <!-- JSR-299 API -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- JSR-330 API -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- JSR-299 Impl -->
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>${openwebbeans-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- Test -->
+ <dependency>
+ <groupId>org.apache.openwebbeans.test</groupId>
+ <artifactId>cditest</artifactId>
+ <version>${openwebbeans-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans.test</groupId>
+ <artifactId>cditest-owb</artifactId>
+ <version>${openwebbeans-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
- <version>2.10-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
- </parent>
-
- <artifactId>camel-cdi</artifactId>
- <packaging>bundle</packaging>
- <name>Camel :: CDI</name>
- <description>Camel CDI</description>
-
- <properties>
- <camel.osgi.export.pkg>
- org.apache.camel.component.cdi.*;${camel.osgi.version}
- </camel.osgi.export.pkg>
- <camel.osgi.import.pkg>
- !org.apache.camel.component.cdi.*,
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import.pkg>
- <openwebbeans.version>1.1.4-SNAPSHOT</openwebbeans.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
-
- <!-- JSR-299 Impl -->
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>${openwebbeans.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- SPI API -->
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <version>${openwebbeans.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Interceptor API -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>1.0</version>
- </dependency>
-
- <!-- EL Plugin -->
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-el10</artifactId>
- <version>${openwebbeans.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- JSR-299 API -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- JSR-330 API -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <!-- Test -->
- <dependency>
- <groupId>org.apache.openwebbeans.test</groupId>
- <artifactId>cditest</artifactId>
- <version>${openwebbeans.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans.test</groupId>
- <artifactId>cditest-owb</artifactId>
- <version>${openwebbeans.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <defaultGoal>install</defaultGoal>
- </build>
</project>
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiBeanRegistry.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiBeanRegistry.java?rev=1305792&r1=1305791&r2=1305792&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiBeanRegistry.java
(original)
+++
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiBeanRegistry.java
Tue Mar 27 09:41:43 2012
@@ -21,26 +21,19 @@ import java.util.Map;
import org.apache.camel.component.cdi.util.BeanProvider;
import org.apache.camel.spi.Registry;
import org.apache.camel.util.ObjectHelper;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
- * CdiBeanRegistry used by Camel to perform lookup into the
- * Cdi BeanManager. The BeanManager must be passed as argument
- * to the CdiRegistry constructor.
+ * CdiBeanRegistry used by Camel to perform lookup into the CDI {@link
javax.enterprise.inject.spi.BeanManager}.
*/
public class CdiBeanRegistry implements Registry {
- private final Logger log = LoggerFactory.getLogger(getClass());
+ private final static Logger LOG =
LoggerFactory.getLogger(CdiBeanRegistry.class);
- /**
- * @see org.apache.camel.spi.Registry#lookup(java.lang.String)
- */
@Override
public Object lookup(final String name) {
ObjectHelper.notEmpty(name, "name");
- log.trace("Looking up bean using name = [{}] in CDI registry ...",
name);
+ LOG.trace("Looking up bean {}", name);
return BeanProvider.getContextualReference(name, true);
}
@@ -49,12 +42,15 @@ public class CdiBeanRegistry implements
public <T> T lookup(final String name, final Class<T> type) {
ObjectHelper.notEmpty(name, "name");
ObjectHelper.notNull(type, "type");
- return type.cast(lookup(name));
+
+ LOG.trace("Looking up bean {} of type {}", name, type);
+ return BeanProvider.getContextualReference(name, true, type);
}
@Override
public <T> Map<String, T> lookupByType(final Class<T> type) {
ObjectHelper.notNull(type, "type");
+ LOG.trace("Looking up beans of type {}", type);
return BeanProvider.getContextualNamesReferences(type, true, true);
}
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiCamelContext.java?rev=1305792&r1=1305791&r2=1305792&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiCamelContext.java
(original)
+++
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiCamelContext.java
Tue Mar 27 09:41:43 2012
@@ -19,8 +19,7 @@ package org.apache.camel.component.cdi;
import org.apache.camel.impl.DefaultCamelContext;
/**
- * CDI Camel Context class
- * Register the CDI BeanManager to lookup CDI Beans
+ * CDI {@link org.apache.camel.CamelContext} class.
*/
public class CdiCamelContext extends DefaultCamelContext {
Modified:
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/util/BeanManagerProvider.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/util/BeanManagerProvider.java?rev=1305792&r1=1305791&r2=1305792&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/util/BeanManagerProvider.java
(original)
+++
camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/util/BeanManagerProvider.java
Tue Mar 27 09:41:43 2012
@@ -29,7 +29,6 @@ import javax.enterprise.inject.spi.Exten
import javax.naming.InitialContext;
import javax.naming.NamingException;
-
/**
* <p>This class provides access to the {@link BeanManager}
* by registering the current {@link BeanManager} in an extension and
Modified: camel/trunk/components/camel-cdi/src/main/resources/META-INF/beans.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/resources/META-INF/beans.xml?rev=1305792&r1=1305791&r2=1305792&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/resources/META-INF/beans.xml
(original)
+++ camel/trunk/components/camel-cdi/src/main/resources/META-INF/beans.xml Tue
Mar 27 09:41:43 2012
@@ -1,20 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<beans/>
\ No newline at end of file
Modified:
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContainerBeanManagerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContainerBeanManagerTest.java?rev=1305792&r1=1305791&r2=1305792&view=diff
==============================================================================
---
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContainerBeanManagerTest.java
(original)
+++
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContainerBeanManagerTest.java
Tue Mar 27 09:41:43 2012
@@ -23,21 +23,16 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.cdi.store.Item;
-import org.apache.camel.component.cdi.CdiBeanRegistry;
+import org.apache.camel.component.cdi.CdiCamelContext;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.webbeans.cditest.CdiTestContainer;
import org.apache.webbeans.cditest.CdiTestContainerLoader;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class CdiContainerBeanManagerTest extends CamelTestSupport {
- private static final Logger LOG =
LoggerFactory.getLogger(CdiContainerBeanManagerTest.class);
private MockEndpoint resultEndpoint;
private ProducerTemplate template;
@@ -52,23 +47,24 @@ public class CdiContainerBeanManagerTest
cdiContainer = CdiTestContainerLoader.getCdiContainer();
cdiContainer.bootContainer();
- LOG.info(">> Container started and bean manager instantiated !");
+ log.info(">> Container started and bean manager instantiated !");
// Camel
- context = new DefaultCamelContext(new CdiBeanRegistry());
+ context = new CdiCamelContext();
context.addRoutes(createRouteBuilder());
context.setTracing(true);
context.start();
+
resultEndpoint = context.getEndpoint("mock:result",
MockEndpoint.class);
template = context.createProducerTemplate();
- LOG.info(">> Camel started !");
+ log.info(">> Camel started !");
}
@After
public void shutDown() throws Exception {
- cdiContainer.shutdownContainer();
context.stop();
+ cdiContainer.shutdownContainer();
}
@Test
@@ -111,7 +107,6 @@ public class CdiContainerBeanManagerTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("direct:inject")
.beanRef("shoppingBean", "listAllProducts")
.to("mock:result");
Modified: camel/trunk/components/camel-cdi/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/resources/log4j.properties?rev=1305792&r1=1305791&r2=1305792&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/test/resources/log4j.properties
(original)
+++ camel/trunk/components/camel-cdi/src/test/resources/log4j.properties Tue
Mar 27 09:41:43 2012
@@ -21,8 +21,7 @@
log4j.rootLogger=INFO, file
#log4j.logger.org.apache.camel.component.cdi=DEBUG
-log4j.logger.org.apache.openwebbeans=DEBUG
-#log4j.logger.com.mycompany=DEBUG
+#log4j.logger.org.apache.openwebbeans=DEBUG
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
@@ -39,5 +38,3 @@ log4j.appender.file.append=true
log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
# MDC
#log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} -
%-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n
-
-log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
