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 2012/02/05 13:40:43 UTC
svn commit: r1240709 - in /camel/trunk: apache-camel/
apache-camel/src/main/descriptors/ components/ components/camel-cdi/
components/camel-cdi/src/main/java/org/apache/camel/component/cdi/
components/camel-cdi/src/main/resources/META-INF/ components/c...
Author: davsclaus
Date: Sun Feb 5 12:40:42 2012
New Revision: 1240709
URL: http://svn.apache.org/viewvc?rev=1240709&view=rev
Log:
Added components to kit. Polished
Added:
camel/trunk/components/camel-cdi/src/main/resources/META-INF/
camel/trunk/components/camel-cdi/src/main/resources/META-INF/LICENSE.txt (with props)
camel/trunk/components/camel-cdi/src/main/resources/META-INF/NOTICE.txt (with props)
Modified:
camel/trunk/apache-camel/pom.xml
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/components/camel-cdi/ (props changed)
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/CdiContainer.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/CdiContainerBeanManagerTest.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/Products.java
camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/ShoppingBean.java
camel/trunk/components/camel-cdi/src/test/resources/META-INF/beans.xml
camel/trunk/components/camel-cdi/src/test/resources/log4j.properties
camel/trunk/components/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1240709&r1=1240708&r2=1240709&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Sun Feb 5 12:40:42 2012
@@ -73,6 +73,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-avro</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-bam</artifactId>
</dependency>
<dependency>
@@ -101,6 +105,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-cdi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cometd</artifactId>
</dependency>
<dependency>
Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1240709&r1=1240708&r2=1240709&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Sun Feb 5 12:40:42 2012
@@ -38,6 +38,7 @@
<include>org.apache.camel:camel-apns</include>
<include>org.apache.camel:camel-atom</include>
<include>org.apache.camel:camel-aws</include>
+ <include>org.apache.camel:camel-avro</include>
<include>org.apache.camel:camel-bam</include>
<include>org.apache.camel:camel-beanio</include>
<include>org.apache.camel:camel-bean-validator</include>
@@ -45,6 +46,7 @@
<include>org.apache.camel:camel-blueprint</include>
<include>org.apache.camel:camel-cache</include>
<include>org.apache.camel:camel-castor</include>
+ <include>org.apache.camel:camel-cdi</include>
<include>org.apache.camel:camel-core</include>
<include>org.apache.camel:camel-core-osgi</include>
<include>org.apache.camel:camel-cometd</include>
Propchange: camel/trunk/components/camel-cdi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Feb 5 12:40:42 2012
@@ -0,0 +1,17 @@
+.pmd
+.checkstyle
+.ruleset
+target
+.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
+*.idea
Modified: camel/trunk/components/camel-cdi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/pom.xml?rev=1240709&r1=1240708&r2=1240709&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/pom.xml (original)
+++ camel/trunk/components/camel-cdi/pom.xml Sun Feb 5 12:40:42 2012
@@ -1,46 +1,46 @@
-<?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
-
- 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.
--->
-<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>
-
- <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>
+<?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
+
+ 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.
+-->
+<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>
+
+ <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>
</properties>
<dependencies>
@@ -48,16 +48,12 @@
<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>1.1.4-SNAPSHOT</version>
+ <version>${openwebbeans-version}</version>
<scope>compile</scope>
</dependency>
@@ -65,7 +61,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <version>1.1.4-SNAPSHOT</version>
+ <version>${openwebbeans-version}</version>
<scope>compile</scope>
</dependency>
@@ -80,7 +76,8 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el10</artifactId>
- <version>1.1.4-SNAPSHOT</version>
+ <version>${openwebbeans-version}</version>
+ <scope>compile</scope>
</dependency>
<!-- JSR-299 API -->
@@ -115,13 +112,13 @@
<dependency>
<groupId>org.apache.openwebbeans.test</groupId>
<artifactId>cditest</artifactId>
- <version>1.1.4-SNAPSHOT</version>
+ <version>${openwebbeans-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans.test</groupId>
<artifactId>cditest-owb</artifactId>
- <version>1.1.4-SNAPSHOT</version>
+ <version>${openwebbeans-version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -142,8 +139,5 @@
</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=1240709&r1=1240708&r2=1240709&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 Sun Feb 5 12:40:42 2012
@@ -16,18 +16,18 @@
*/
package org.apache.camel.component.cdi;
-import org.apache.camel.spi.Registry;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+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
@@ -36,95 +36,61 @@ import java.util.Set;
*/
public class CdiBeanRegistry implements Registry {
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- BeanManager delegate;
+ private static final Logger LOG = LoggerFactory.getLogger(CdiBeanRegistry.class);
+ private final BeanManager delegate;
- /**
- * @param delegate
- * @throws IllegalArgumentException
- */
- public CdiBeanRegistry(final BeanManager delegate)
- throws IllegalArgumentException {
+ public CdiBeanRegistry(final BeanManager delegate) throws IllegalArgumentException {
ObjectHelper.notNull(delegate, "delegate");
this.delegate = delegate;
}
- /**
- * @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 using name = [{}] in CDI registry.", name);
final Set<Bean<?>> beans = getDelegate().getBeans(name);
if (beans.isEmpty()) {
- log.debug(
- "Found no bean matching name = [{}] in CDI registry.", name);
+ LOG.debug("Found no bean matching name = [{}] in CDI registry.", name);
return null;
}
if (beans.size() > 1) {
- throw new IllegalStateException(
- "Expected to find exactly one bean having name [" + name
- + "], but got [" + beans.size() + "]");
+ throw new IllegalStateException("Expected to find exactly one bean having name [" + name + "], but got [" + beans.size() + "]");
}
final Bean<?> bean = beans.iterator().next();
- log.debug("Found bean [{}] matching name = [{}] in CDI registry.",
- bean, name);
-
- final CreationalContext<?> creationalContext = getDelegate()
- .createCreationalContext(null);
+ LOG.debug("Found bean [{}] matching name = [{}] in CDI registry.", bean, name);
- return getDelegate().getReference(bean, bean.getBeanClass(),
- creationalContext);
+ final CreationalContext<?> context = getDelegate().createCreationalContext(null);
+ return getDelegate().getReference(bean, bean.getBeanClass(), context);
}
- /**
- * @see org.apache.camel.spi.Registry#lookup(java.lang.String,
- * java.lang.Class)
- */
@Override
public <T> T lookup(final String name, final Class<T> type) {
ObjectHelper.notEmpty(name, "name");
ObjectHelper.notNull(type, "type");
- log.trace(
- "Looking up bean using name = [{}] having expected type = [{}] in CDI registry ...",
- name, type.getName());
+ LOG.trace("Looking up bean using name = [{}] having expected type = [{}] in CDI registry.", name, type.getName());
return type.cast(lookup(name));
}
- /**
- * @see org.apache.camel.spi.Registry#lookupByType(java.lang.Class)
- */
@Override
public <T> Map<String, T> lookupByType(final Class<T> type) {
ObjectHelper.notNull(type, "type");
- log.trace(
- "Looking up all beans having expected type = [{}] in CDI registry ...",
- type.getName());
+ LOG.trace("Looking up all beans having expected type = [{}] in CDI registry.", type.getName());
final Set<Bean<?>> beans = getDelegate().getBeans(type);
if (beans.isEmpty()) {
- log.debug(
- "Found no beans having expected type = [{}] in CDI registry.",
- type.getName());
-
+ LOG.debug("Found no beans having expected type = [{}] in CDI registry.", type.getName());
return Collections.emptyMap();
}
- log.debug(
- "Found [{}] beans having expected type = [{}] in CDI registry.",
- Integer.valueOf(beans.size()), type.getName());
+
+ LOG.debug("Found [{}] beans having expected type = [{}] in CDI registry.", Integer.valueOf(beans.size()), type.getName());
final Map<String, T> beansByName = new HashMap<String, T>(beans.size());
- final CreationalContext<?> creationalContext = getDelegate()
- .createCreationalContext(null);
+ final CreationalContext<?> context = getDelegate().createCreationalContext(null);
+
for (final Bean<?> bean : beans) {
- beansByName.put(
- bean.getName(),
- type.cast(getDelegate().getReference(bean, type,
- creationalContext)));
+ beansByName.put(bean.getName(), type.cast(getDelegate().getReference(bean, type, context)));
}
return beansByName;
@@ -132,12 +98,7 @@ public class CdiBeanRegistry implements
@Override
public String toString() {
- return "CdiRegistry@" + this.hashCode() + "[delegate = "
- + this.delegate + "]";
- }
-
- private Logger getLog() {
- return this.log;
+ return "CdiRegistry[" + this.delegate + "]";
}
private BeanManager getDelegate() {
Modified: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiContainer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiContainer.java?rev=1240709&r1=1240708&r2=1240709&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiContainer.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/component/cdi/CdiContainer.java Sun Feb 5 12:40:42 2012
@@ -14,40 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.cdi;
+import javax.enterprise.inject.spi.BeanManager;
+
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.spi.ContainerLifecycle;
-import javax.enterprise.inject.spi.BeanManager;
-
/**
* OpenWebBeans CDI container. It can be used in a Camel standalone project to start
* and stop container. The container exposes a Bean?Manager that we can use to instantiate the
- * CdiRegistry used by Camel
+ * {@link CdiBeanRegistry} used by Camel
*/
public class CdiContainer {
private static ContainerLifecycle lifecycle = null;
public static void start() throws Exception {
- try {
- lifecycle = WebBeansContext.currentInstance().getService(ContainerLifecycle.class);
- lifecycle.startApplication(null);
-
- } catch (Exception e) {
- throw e;
- }
+ lifecycle = WebBeansContext.currentInstance().getService(ContainerLifecycle.class);
+ lifecycle.startApplication(null);
}
public static void shutdown() throws Exception {
- try {
- lifecycle.stopApplication(null);
-
- } catch (Exception e) {
- throw e;
- }
+ lifecycle.stopApplication(null);
}
public static BeanManager getBeanManager() {
Added: camel/trunk/components/camel-cdi/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/resources/META-INF/LICENSE.txt?rev=1240709&view=auto
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/resources/META-INF/LICENSE.txt (added)
+++ camel/trunk/components/camel-cdi/src/main/resources/META-INF/LICENSE.txt Sun Feb 5 12:40:42 2012
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
Propchange: camel/trunk/components/camel-cdi/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cdi/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-cdi/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/resources/META-INF/NOTICE.txt?rev=1240709&view=auto
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/resources/META-INF/NOTICE.txt (added)
+++ camel/trunk/components/camel-cdi/src/main/resources/META-INF/NOTICE.txt Sun Feb 5 12:40:42 2012
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
Propchange: camel/trunk/components/camel-cdi/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cdi/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=1240709&r1=1240708&r2=1240709&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 Sun Feb 5 12:40:42 2012
@@ -1,8 +1,12 @@
package org.apache.camel.cdi;
+import java.util.ArrayList;
+import java.util.List;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+
import org.apache.camel.CamelContext;
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.cdi.store.ShoppingBean;
@@ -16,41 +20,27 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.List;
-
public class CdiContainerBeanManagerTest extends CamelTestSupport {
- private MockEndpoint resultEndpoint;
-
- private ProducerTemplate template;
-
- CdiTestContainer cdiContainer;
- CamelContext camelContext;
+ private CdiTestContainer cdiContainer;
@Inject
- ShoppingBean shoppingBean;
+ private ShoppingBean shoppingBean;
@Before
public void setUp() throws Exception {
cdiContainer = CdiTestContainerLoader.getCdiContainer();
cdiContainer.bootContainer();
cdiContainer.startContexts();
- BeanManager beanManager = cdiContainer.getBeanManager();
- System.out.println(">> Container started and bean manager instantiated !");
+ super.setUp();
+ }
- // Camel
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ BeanManager beanManager = cdiContainer.getBeanManager();
context = new DefaultCamelContext(new CdiBeanRegistry(beanManager));
- context.addRoutes(createRouteBuilder());
- context.setTracing(true);
- context.start();
- resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
- template = context.createProducerTemplate();
-
- System.out.println(">> Camel started !");
+ return context;
}
@After
@@ -60,22 +50,25 @@ public class CdiContainerBeanManagerTest
}
@Test
+ @SuppressWarnings("unchecked")
public void testInjection() throws InterruptedException {
- resultEndpoint.expectedMessageCount(1);
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
template.sendBody("direct:inject", "hello");
assertMockEndpointsSatisfied();
- Exchange exchange = resultEndpoint.getExchanges().get(0);
+ Exchange exchange = mock.getExchanges().get(0);
List<Item> results = (List<Item>) exchange.getIn().getBody();
- Object[] items = (Object[]) results.toArray();
- Object[] itemsExpected = (Object[]) itemsExpected().toArray();
- for(int i=0; i< items.length; ++i) {
- Item itemExpected = (Item)items[i];
- Item itemReceived = (Item)itemsExpected[i];
- assertEquals(itemExpected.getName(), itemReceived.getName());
- assertEquals(itemExpected.getPrice(), itemReceived.getPrice());
+ Object[] items = results.toArray();
+ Object[] itemsExpected = itemsExpected().toArray();
+ for (int i = 0; i < items.length; ++i) {
+ Item itemExpected = (Item) items[i];
+ Item itemReceived = (Item) itemsExpected[i];
+ assertEquals(itemExpected.getName(), itemReceived.getName());
+ assertEquals(itemExpected.getPrice(), itemReceived.getPrice());
}
assertNotNull(results);
@@ -100,15 +93,11 @@ 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/java/org/apache/camel/cdi/store/Products.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/Products.java?rev=1240709&r1=1240708&r2=1240709&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/Products.java (original)
+++ camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/Products.java Sun Feb 5 12:40:42 2012
@@ -32,7 +32,6 @@ public class Products implements Seriali
private List<Item> products = new ArrayList<Item>();
public Products() {
-
}
@PostConstruct
Modified: camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/ShoppingBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/ShoppingBean.java?rev=1240709&r1=1240708&r2=1240709&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/ShoppingBean.java (original)
+++ camel/trunk/components/camel-cdi/src/test/java/org/apache/camel/cdi/store/ShoppingBean.java Sun Feb 5 12:40:42 2012
@@ -18,22 +18,20 @@
*/
package org.apache.camel.cdi.store;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
import javax.enterprise.inject.New;
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
import javax.inject.Named;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
@Named
public class ShoppingBean implements Serializable {
private static final long serialVersionUID = 1L;
- private
@Inject
- Products products;
-
+ private Products products;
private List<Item> items = new ArrayList<Item>();
public ShoppingBean() {
@@ -47,7 +45,6 @@ public class ShoppingBean implements Ser
items.add(defaultItem);
}
-
@Produces
@Named("selectedItems")
public List<Item> listSelectedItems() {
@@ -60,5 +57,4 @@ public class ShoppingBean implements Ser
return this.products.getProducts();
}
-
}
Modified: camel/trunk/components/camel-cdi/src/test/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/resources/META-INF/beans.xml?rev=1240709&r1=1240708&r2=1240709&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/test/resources/META-INF/beans.xml (original)
+++ camel/trunk/components/camel-cdi/src/test/resources/META-INF/beans.xml Sun Feb 5 12:40:42 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/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/test/resources/log4j.properties?rev=1240709&r1=1240708&r2=1240709&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-cdi/src/test/resources/log4j.properties Sun Feb 5 12:40:42 2012
@@ -18,11 +18,11 @@
#
# The logging properties used during tests..
#
-log4j.rootLogger=DEBUG, file
+log4j.rootLogger=INFO, file
-log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.camel.component.cdi=DEBUG
log4j.logger.org.apache.openwebbeans=DEBUG
-log4j.logger.com.mycompany=DEBUG
+#log4j.logger.com.mycompany=DEBUG
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1240709&r1=1240708&r2=1240709&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Sun Feb 5 12:40:42 2012
@@ -64,6 +64,7 @@
<module>camel-bindy</module>
<module>camel-cache</module>
<module>camel-castor</module>
+ <module>camel-cdi</module>
<module>camel-cometd</module>
<module>camel-context</module>
<module>camel-crypto</module>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1240709&r1=1240708&r2=1240709&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Feb 5 12:40:42 2012
@@ -127,6 +127,7 @@
<mybatis-version>3.0.6</mybatis-version>
<netty-bundle-version>3.2.6.Final_1</netty-bundle-version>
<ode-version>1.3.3</ode-version>
+ <openwebbeans-version>1.1.3</openwebbeans-version>
<ognl-version>3.0.2_1</ognl-version>
<osgi-version>4.2.0</osgi-version>
<paranamer-bundle-version>2.4_1</paranamer-bundle-version>
@@ -300,6 +301,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-cdi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cometd</artifactId>
<version>${project.version}</version>
</dependency>