Author: jstrachan
Date: Thu Feb 10 16:02:09 2011
New Revision: 1069442
URL: http://svn.apache.org/viewvc?rev=1069442&view=rev
Log:
first spike of a solution for CAMEL-3651 and CAMEL-3563 so that we can turn a
CamelContext containing one or more routes into a black box and then refer to
its 'public endpoints' using global URIs which then map to local internal
endpoints inside the CamelContext
Added:
camel/trunk/components/camel-context/
camel/trunk/components/camel-context/pom.xml
camel/trunk/components/camel-context/src/
camel/trunk/components/camel-context/src/main/
camel/trunk/components/camel-context/src/main/java/
camel/trunk/components/camel-context/src/main/java/org/
camel/trunk/components/camel-context/src/main/java/org/apache/
camel/trunk/components/camel-context/src/main/java/org/apache/camel/
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/ContextConverters.java
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java
camel/trunk/components/camel-context/src/main/resources/
camel/trunk/components/camel-context/src/main/resources/META-INF/
camel/trunk/components/camel-context/src/main/resources/META-INF/LICENSE.txt
camel/trunk/components/camel-context/src/main/resources/META-INF/NOTICE.txt
camel/trunk/components/camel-context/src/main/resources/META-INF/services/
camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/
camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/
camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/
camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/component/
camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/component/context
camel/trunk/components/camel-context/src/test/
camel/trunk/components/camel-context/src/test/java/
camel/trunk/components/camel-context/src/test/java/org/
camel/trunk/components/camel-context/src/test/java/org/apache/
camel/trunk/components/camel-context/src/test/java/org/apache/camel/
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java
camel/trunk/components/camel-context/src/test/resources/
camel/trunk/components/camel-context/src/test/resources/log4j.properties
Modified:
camel/trunk/components/pom.xml
Added: camel/trunk/components/camel-context/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/pom.xml?rev=1069442&view=auto
==============================================================================
--- camel/trunk/components/camel-context/pom.xml (added)
+++ camel/trunk/components/camel-context/pom.xml Thu Feb 10 16:02:09 2011
@@ -0,0 +1,86 @@
+<?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/xsd/maven-4.0.0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>camel-parent</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <version>2.7-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <artifactId>camel-context</artifactId>
+ <name>Camel :: Context </name>
+ <description>Camel Context component to expose CamelContext objects as
a black box Component for use in other routes</description>
+ <packaging>bundle</packaging>
+
+ <properties>
+ <camel.osgi.export.pkg>
+ org.apache.camel.component.context.*,
+ </camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-xml</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</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>
+ </dependencies>
+
+</project>
Added:
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/ContextConverters.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/ContextConverters.java?rev=1069442&view=auto
==============================================================================
---
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/ContextConverters.java
(added)
+++
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/ContextConverters.java
Thu Feb 10 16:02:09 2011
@@ -0,0 +1,33 @@
+/**
+ *
+ * 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.
+ */
+package org.apache.camel.component.context;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Converter;
+
+/**
+ * Converts from a CamelContext to a ContextComponent so we can easily refer
to external camel contexts in the Registry
+ * as a Component
+ */
+@Converter
+public class ContextConverters {
+ @Converter
+ public static LocalContextComponent toComponent(CamelContext localContext)
{
+ return new LocalContextComponent(localContext);
+ }
+}
Added:
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java?rev=1069442&view=auto
==============================================================================
---
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
(added)
+++
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/LocalContextComponent.java
Thu Feb 10 16:02:09 2011
@@ -0,0 +1,100 @@
+/**
+ * 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.
+ */
+package org.apache.camel.component.context;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.NoSuchEndpointException;
+import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A Camel Component which exposes a local {@link CamelContext} instance as a
black box set of endpoints.
+ */
+public class LocalContextComponent extends DefaultComponent {
+ private static final transient Logger LOG =
LoggerFactory.getLogger(LocalContextComponent.class);
+
+ private CamelContext localCamelContext;
+ private List<String> localProtocolSchemes = new
ArrayList<String>(Arrays.asList("direct", "seda"));
+
+ public LocalContextComponent(CamelContext localCamelContext) {
+ ObjectHelper.notNull(localCamelContext, "localCamelContext");
+ this.localCamelContext = localCamelContext;
+ }
+
+ public List<String> getLocalProtocolSchemes() {
+ return localProtocolSchemes;
+ }
+
+ /**
+ * Sets the list of protocols which are used to expose public endpoints by
default
+ */
+ public void setLocalProtocolSchemes(List<String> localProtocolSchemes) {
+ this.localProtocolSchemes = localProtocolSchemes;
+ }
+
+ public CamelContext getLocalCamelContext() {
+ if (localCamelContext == null) {
+
+ }
+ return localCamelContext;
+ }
+
+ public void setLocalCamelContext(CamelContext localCamelContext) {
+ this.localCamelContext = localCamelContext;
+ }
+
+ @Override
+ protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters)
+ throws Exception {
+
+ // lets first check if we are using a fully qualified name:
[context:]contextId:endpointUri
+ Map<String, Endpoint> map = getLocalCamelContext().getEndpointMap();
+ Endpoint endpoint = map.get(remaining);
+ if (endpoint != null) {
+ logUsingEndpoint(uri, endpoint);
+ return endpoint;
+ }
+
+ // lets look to see if there is an endpoint of name 'remaining' using
one of the local endpoints within
+ // the black box CamelContext
+ String[] separators = {":", "://"};
+ for (String scheme : localProtocolSchemes) {
+ for (String separator : separators) {
+ String newUri = scheme + separator + remaining;
+ endpoint = map.get(newUri);
+ if (endpoint != null) {
+ logUsingEndpoint(uri, endpoint);
+ return endpoint;
+ }
+ }
+ }
+ return null;
+ }
+
+ protected void logUsingEndpoint(String uri, Endpoint endpoint) {
+ LOG.debug("Mapping the URI " + uri + " to local endpoint " + endpoint);
+ }
+
+}
Added:
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java?rev=1069442&view=auto
==============================================================================
---
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java
(added)
+++
camel/trunk/components/camel-context/src/main/java/org/apache/camel/component/context/QualifiedContextComponent.java
Thu Feb 10 16:02:09 2011
@@ -0,0 +1,52 @@
+/**
+ *
+ * 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.
+ */
+package org.apache.camel.component.context;
+
+import org.apache.camel.Component;
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+/**
+ * Supports the explicit and verbose URIs of the form
<b>context:camelContextId:someEndpoint</b> to access
+ * a local endpoint inside an external CamelContext.
+ * <p/>
+ * Typically there's no need to use this level of verbosity, you can just use
<b>camelContextId:someEndpoint</b>
+ */
+public class QualifiedContextComponent extends DefaultComponent {
+ private static final transient Logger LOG =
LoggerFactory.getLogger(QualifiedContextComponent.class);
+
+ @Override
+ protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
+ String splitURI[] = ObjectHelper.splitOnCharacter(remaining, ":", 2);
+ if (splitURI[1] != null) {
+ String contextId = splitURI[0];
+ String localEndpoint = splitURI[1];
+ Component component = getCamelContext().getComponent(contextId);
+ if (component != null) {
+ LOG.debug("Attempting to create local endpoint: " +
localEndpoint + " inside the component: " + component);
+ return component.createEndpoint(localEndpoint);
+ }
+ }
+ return null;
+ }
+}
Added:
camel/trunk/components/camel-context/src/main/resources/META-INF/LICENSE.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/main/resources/META-INF/LICENSE.txt?rev=1069442&view=auto
==============================================================================
---
camel/trunk/components/camel-context/src/main/resources/META-INF/LICENSE.txt
(added)
+++
camel/trunk/components/camel-context/src/main/resources/META-INF/LICENSE.txt
Thu Feb 10 16:02:09 2011
@@ -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.
+
Added:
camel/trunk/components/camel-context/src/main/resources/META-INF/NOTICE.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/main/resources/META-INF/NOTICE.txt?rev=1069442&view=auto
==============================================================================
--- camel/trunk/components/camel-context/src/main/resources/META-INF/NOTICE.txt
(added)
+++ camel/trunk/components/camel-context/src/main/resources/META-INF/NOTICE.txt
Thu Feb 10 16:02:09 2011
@@ -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.
Added:
camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/TypeConverter?rev=1069442&view=auto
==============================================================================
---
camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
(added)
+++
camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
Thu Feb 10 16:02:09 2011
@@ -0,0 +1 @@
+org.apache.camel.component.context
\ No newline at end of file
Added:
camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/component/context
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/component/context?rev=1069442&view=auto
==============================================================================
---
camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/component/context
(added)
+++
camel/trunk/components/camel-context/src/main/resources/META-INF/services/org/apache/camel/component/context
Thu Feb 10 16:02:09 2011
@@ -0,0 +1,17 @@
+# 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.
+#
+
+class=org.apache.camel.component.context.QualifiedContextComponent
Added:
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java?rev=1069442&view=auto
==============================================================================
---
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
(added)
+++
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
Thu Feb 10 16:02:09 2011
@@ -0,0 +1,85 @@
+/**
+ *
+ * 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.
+ */
+package org.apache.camel.component.context;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Produce;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ * Lets use the Java DSL to create a black box CamelContext and then test its
use from another context
+ */
+public class JavaDslBlackBoxTest extends CamelTestSupport {
+
+ @EndpointInject(uri = "mock:results")
+ private MockEndpoint resultEndpoint;
+
+ @Produce(uri = "direct:start")
+ private ProducerTemplate template;
+
+ @Test
+ public void testUsingBlackBox() throws Exception {
+ resultEndpoint.expectedHeaderReceived("received", "true");
+ resultEndpoint.expectedMessageCount(2);
+
+ template.sendBody("<purchaseOrder>one</purchaseOrder>");
+ template.sendBody("<purchaseOrder>two</purchaseOrder>");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry registry = super.createRegistry();
+
+ // lets create our black box as a camel context and a set of routes
+ DefaultCamelContext blackBox = new DefaultCamelContext(registry);
+ blackBox.setName("blackBox");
+ blackBox.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ // receive purchase orders, lets process it in some way then
send an invoice
+ // to our invoice endpoint
+
from("direct:purchaseOrder").setHeader("received").constant("true").to("direct:invoice");
+ }
+ });
+ blackBox.start();
+
+ registry.bind("accounts", blackBox);
+ return registry;
+
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").to("accounts:purchaseOrder");
+ from("accounts:invoice").to("mock:results");
+ }
+ };
+ }
+}
Added:
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java?rev=1069442&view=auto
==============================================================================
---
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java
(added)
+++
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxWithVerboseUriTest.java
Thu Feb 10 16:02:09 2011
@@ -0,0 +1,37 @@
+/**
+ *
+ * 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.
+ */
+package org.apache.camel.component.context;
+
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Lets use the verbose context:camelContextId:actualEndpointName when
referring to endpoints
+ */
+public class JavaDslBlackBoxWithVerboseUriTest extends JavaDslBlackBoxTest {
+
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+
from("direct:start").to("context:accounts:direct://purchaseOrder");
+ from("context:accounts:direct://invoice").to("mock:results");
+ }
+ };
+ }}
Added: camel/trunk/components/camel-context/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/test/resources/log4j.properties?rev=1069442&view=auto
==============================================================================
--- camel/trunk/components/camel-context/src/test/resources/log4j.properties
(added)
+++ camel/trunk/components/camel-context/src/test/resources/log4j.properties
Thu Feb 10 16:02:09 2011
@@ -0,0 +1,20 @@
+
+#
+# The logging properties used for eclipse testing, We want to see debug output
on the console.
+#
+log4j.rootLogger=INFO, file
+
+log4j.logger.org.springframework=WARN
+#log4j.logger.org.apache.camel=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
+log4j.appender.file.file=target/camel-routebox.log
Modified: camel/trunk/components/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1069442&r1=1069441&r2=1069442&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Thu Feb 10 16:02:09 2011
@@ -41,6 +41,7 @@
<module>camel-cometd</module>
<module>camel-cache</module>
<module>camel-castor</module>
+ <module>camel-context</module>
<module>camel-core-osgi</module>
<module>camel-core-xml</module>
<module>camel-crypto</module>
