You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ra...@apache.org on 2015/03/19 15:13:00 UTC
[1/4] camel git commit: WIP
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 5a4e3729b -> 51cf42260
refs/heads/camel-hystrix [created] 8c97cad0e
refs/heads/features/camel-xmljson-legal-license-compliance [created] 85fd23d8c
refs/heads/master 2144590dd -> f8d1d999f
WIP
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eab6bcad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eab6bcad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eab6bcad
Branch: refs/heads/camel-hystrix
Commit: eab6bcad9d7c23f701672c6ea116c3ba3c5584c7
Parents: c1616bc
Author: Raul Kripalani <ra...@apache.org>
Authored: Sun Feb 16 17:36:07 2014 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Sun Feb 16 17:36:07 2014 +0000
----------------------------------------------------------------------
components/camel-hystrix/pom.xml | 67 ++++++
.../camel/hystrix/CamelHystrixCommand.java | 21 ++
.../apache/camel/hystrix/HystrixComponent.java | 18 ++
.../apache/camel/hystrix/HystrixEndpoint.java | 29 +++
.../apache/camel/hystrix/HystrixPattern.java | 9 +
.../apache/camel/hystrix/HystrixProducer.java | 23 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/component/hystrix | 18 ++
.../org/apache/camel/rx/ObservableBodyTest.java | 81 ++++++++
.../apache/camel/rx/ObservableMessageTest.java | 78 +++++++
.../test/java/org/apache/camel/rx/Order.java | 42 ++++
.../java/org/apache/camel/rx/RxTestSupport.java | 46 +++++
.../java/org/apache/camel/rx/SendToTest.java | 41 ++++
.../apache/camel/rx/ToObservableAndMapTest.java | 60 ++++++
.../apache/camel/rx/ToObservableBodyTest.java | 72 +++++++
.../org/apache/camel/rx/ToObservableTest.java | 50 +++++
.../src/test/resources/log4j.properties | 36 ++++
18 files changed, 905 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/pom.xml b/components/camel-hystrix/pom.xml
new file mode 100644
index 0000000..4cb75bf
--- /dev/null
+++ b/components/camel-hystrix/pom.xml
@@ -0,0 +1,67 @@
+<?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>components</artifactId>
+ <version>2.13-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-hystrix</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Hystrix</name>
+ <description>Camel Hystrix support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.hystrix.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.netflix.hystrix</groupId>
+ <artifactId>hystrix-core</artifactId>
+ <version>${hystrix-version}</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/CamelHystrixCommand.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/CamelHystrixCommand.java b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/CamelHystrixCommand.java
new file mode 100644
index 0000000..11a86fa
--- /dev/null
+++ b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/CamelHystrixCommand.java
@@ -0,0 +1,21 @@
+package org.apache.camel.hystrix;
+
+import org.apache.camel.Exchange;
+
+import com.netflix.hystrix.HystrixCommand;
+
+public class CamelHystrixCommand extends HystrixCommand<Exchange> {
+
+ protected CamelHystrixCommand(Setter setter) {
+ super(setter);
+ }
+
+ @Override
+ protected Exchange run() throws Exception {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixComponent.java b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixComponent.java
new file mode 100644
index 0000000..5ebae5c
--- /dev/null
+++ b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixComponent.java
@@ -0,0 +1,18 @@
+package org.apache.camel.hystrix;
+
+import java.util.Map;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+
+public class HystrixComponent extends DefaultComponent {
+
+ @Override
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+ Endpoint endpoint = new HystrixEndpoint();
+ setProperties(endpoint, parameters);
+
+ return endpoint;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixEndpoint.java b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixEndpoint.java
new file mode 100644
index 0000000..c55f991
--- /dev/null
+++ b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixEndpoint.java
@@ -0,0 +1,29 @@
+package org.apache.camel.hystrix;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.impl.DefaultEndpoint;
+
+public class HystrixEndpoint extends DefaultEndpoint {
+
+ private Endpoint proxiedEndpoint;
+ private HystrixPattern pattern;
+
+ @Override
+ public Producer createProducer() throws Exception {
+ return new HystrixProducer(this);
+ }
+
+ @Override
+ public Consumer createConsumer(Processor processor) throws Exception {
+ throw new UnsupportedOperationException("The Hystrix component does not support consumers");
+ }
+
+ @Override
+ public boolean isSingleton() {
+ return false;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixPattern.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixPattern.java b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixPattern.java
new file mode 100644
index 0000000..39f551d
--- /dev/null
+++ b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixPattern.java
@@ -0,0 +1,9 @@
+package org.apache.camel.hystrix;
+
+public enum HystrixPattern {
+
+ circuitBreaker,
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixProducer.java b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixProducer.java
new file mode 100644
index 0000000..2327119
--- /dev/null
+++ b/components/camel-hystrix/src/main/java/org/apache/camel/hystrix/HystrixProducer.java
@@ -0,0 +1,23 @@
+package org.apache.camel.hystrix;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.impl.DefaultProducer;
+
+public class HystrixProducer extends DefaultProducer {
+
+ private HystrixEndpoint endpoint;
+
+ public HystrixProducer(HystrixEndpoint endpoint) {
+ super(endpoint);
+ this.endpoint = endpoint;
+ }
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+
+
+ }
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/main/resources/META-INF/LICENSE.txt b/components/camel-hystrix/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 0000000..6b0b127
--- /dev/null
+++ b/components/camel-hystrix/src/main/resources/META-INF/LICENSE.txt
@@ -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.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/main/resources/META-INF/NOTICE.txt b/components/camel-hystrix/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/components/camel-hystrix/src/main/resources/META-INF/NOTICE.txt
@@ -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.
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/main/resources/META-INF/services/org/apache/camel/component/hystrix
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/main/resources/META-INF/services/org/apache/camel/component/hystrix b/components/camel-hystrix/src/main/resources/META-INF/services/org/apache/camel/component/hystrix
new file mode 100644
index 0000000..81bd322
--- /dev/null
+++ b/components/camel-hystrix/src/main/resources/META-INF/services/org/apache/camel/component/hystrix
@@ -0,0 +1,18 @@
+#
+# 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.hystrix.HystrixComponent
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/test/java/org/apache/camel/rx/ObservableBodyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/rx/ObservableBodyTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/rx/ObservableBodyTest.java
new file mode 100644
index 0000000..5b2cf41
--- /dev/null
+++ b/components/camel-hystrix/src/test/java/org/apache/camel/rx/ObservableBodyTest.java
@@ -0,0 +1,81 @@
+/**
+ * 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.rx;
+
+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.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+import rx.Observable;
+import rx.util.functions.Action1;
+import rx.util.functions.Func1;
+
+public class ObservableBodyTest extends CamelTestSupport {
+ protected MyObservableBody observableBody = new MyObservableBody();
+
+ @EndpointInject(uri = "mock:result")
+ protected MockEndpoint resultEndpoint;
+
+ @Produce(uri = "direct:start")
+ protected ProducerTemplate template;
+
+ @Test
+ public void testUseObservableInRoute() throws Exception {
+ resultEndpoint.expectedBodiesReceived("Hello James", "Hello Claus");
+
+ template.sendBody("James");
+ template.sendBody("Claus");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public class MyObservableBody extends ObservableBody<String> {
+ public MyObservableBody() {
+ super(String.class);
+ }
+
+ @Override
+ protected void configure(Observable<String> observable) {
+ // lets process the messages using the RX API
+ observable.map(new Func1<String, String>() {
+ @Override
+ public String call(String body) {
+ return "Hello " + body;
+ }
+ }).subscribe(new Action1<String>() {
+ @Override
+ public void call(String body) {
+ template.sendBody(resultEndpoint, body);
+ }
+ });
+ }
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ from("direct:start").process(observableBody);
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/test/java/org/apache/camel/rx/ObservableMessageTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/rx/ObservableMessageTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/rx/ObservableMessageTest.java
new file mode 100644
index 0000000..d952797
--- /dev/null
+++ b/components/camel-hystrix/src/test/java/org/apache/camel/rx/ObservableMessageTest.java
@@ -0,0 +1,78 @@
+/**
+ * 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.rx;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Message;
+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.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+import rx.Observable;
+import rx.util.functions.Action1;
+import rx.util.functions.Func1;
+
+public class ObservableMessageTest extends CamelTestSupport {
+ protected MyObservableMessage observableMessage = new MyObservableMessage();
+
+ @EndpointInject(uri = "mock:result")
+ protected MockEndpoint resultEndpoint;
+
+ @Produce(uri = "direct:start")
+ protected ProducerTemplate template;
+
+ @Test
+ public void testUseObservableInRoute() throws Exception {
+ resultEndpoint.expectedBodiesReceived("Hello James", "Hello Claus");
+
+ template.sendBody("James");
+ template.sendBody("Claus");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public class MyObservableMessage extends ObservableMessage {
+ @Override
+ protected void configure(Observable<Message> observable) {
+ // lets process the messages using the RX API
+ observable.map(new Func1<Message, String>() {
+ @Override
+ public String call(Message message) {
+ return "Hello " + message.getBody(String.class);
+ }
+ }).subscribe(new Action1<String>() {
+ @Override
+ public void call(String body) {
+ template.sendBody(resultEndpoint, body);
+ }
+ });
+ }
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ from("direct:start").process(observableMessage);
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/test/java/org/apache/camel/rx/Order.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/rx/Order.java b/components/camel-hystrix/src/test/java/org/apache/camel/rx/Order.java
new file mode 100644
index 0000000..5d98e20
--- /dev/null
+++ b/components/camel-hystrix/src/test/java/org/apache/camel/rx/Order.java
@@ -0,0 +1,42 @@
+/**
+ * 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.rx;
+
+/**
+ */
+public class Order {
+ private final String id;
+ private final double amount;
+
+ public Order(String id, double amount) {
+ this.amount = amount;
+ this.id = id;
+ }
+
+ @Override
+ public String toString() {
+ return "Order[id " + id + ", amount " + amount + "]";
+ }
+
+ public double getAmount() {
+ return amount;
+ }
+
+ public String getId() {
+ return id;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/test/java/org/apache/camel/rx/RxTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/rx/RxTestSupport.java b/components/camel-hystrix/src/test/java/org/apache/camel/rx/RxTestSupport.java
new file mode 100644
index 0000000..86fcc87
--- /dev/null
+++ b/components/camel-hystrix/src/test/java/org/apache/camel/rx/RxTestSupport.java
@@ -0,0 +1,46 @@
+/**
+ * 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.rx;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.After;
+import org.junit.Before;
+
+/**
+ */
+public abstract class RxTestSupport {
+ protected CamelContext camelContext;
+ protected ReactiveCamel reactiveCamel;
+ protected ProducerTemplate producerTemplate;
+
+ @Before
+ public void init() throws Exception {
+ camelContext = new DefaultCamelContext();
+ reactiveCamel = new ReactiveCamel(camelContext);
+ producerTemplate = camelContext.createProducerTemplate();
+ camelContext.start();
+ producerTemplate.start();
+ }
+
+ @After
+ public void destroy() throws Exception {
+ producerTemplate.stop();
+ camelContext.stop();
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/test/java/org/apache/camel/rx/SendToTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/rx/SendToTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/rx/SendToTest.java
new file mode 100644
index 0000000..634c7a9
--- /dev/null
+++ b/components/camel-hystrix/src/test/java/org/apache/camel/rx/SendToTest.java
@@ -0,0 +1,41 @@
+/**
+ * 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.rx;
+
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
+import rx.Observable;
+
+/**
+ */
+public class SendToTest extends RxTestSupport {
+ @Test
+ public void testSendObservableToEndpoint() throws Exception {
+ Order[] expectedBodies = {new Order("o1", 1.10), new Order("o2", 2.20), new Order("o3", 3.30)};
+ Observable<Order> someObservable = Observable.from(expectedBodies);
+
+ final MockEndpoint mockEndpoint = camelContext.getEndpoint("mock:results", MockEndpoint.class);
+ mockEndpoint.expectedBodiesReceived((Object[]) expectedBodies);
+
+ // lets send events on the observable to the camel endpoint
+ reactiveCamel.sendTo(someObservable, "mock:results");
+
+ mockEndpoint.assertIsSatisfied();
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java
new file mode 100644
index 0000000..b159918
--- /dev/null
+++ b/components/camel-hystrix/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java
@@ -0,0 +1,60 @@
+/**
+ * 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.rx;
+
+import org.apache.camel.Message;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import rx.Observable;
+import rx.util.functions.Action1;
+import rx.util.functions.Func1;
+
+/**
+ */
+public class ToObservableAndMapTest extends RxTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(ToObservableAndMapTest.class);
+
+ @Test
+ public void testConsume() throws Exception {
+ final MockEndpoint mockEndpoint = camelContext.getEndpoint("mock:results", MockEndpoint.class);
+ mockEndpoint.expectedMessageCount(4);
+
+ Observable<Message> observableMessage = reactiveCamel.toObservable(
+ "timer://foo?fixedRate=true&period=100");
+
+ // transform the stream
+ Observable<String> observable = observableMessage.map(new Func1<Message, String>() {
+ @Override
+ public String call(Message message) {
+ return "Transformed value: headers " + message.getHeaders();
+ }
+ });
+
+ observable.take(4).subscribe(new Action1<String>() {
+ @Override
+ public void call(String body) {
+ LOG.info(body);
+ producerTemplate.sendBody(mockEndpoint, body);
+ }
+ });
+
+ mockEndpoint.assertIsSatisfied();
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java
new file mode 100644
index 0000000..6974e8b
--- /dev/null
+++ b/components/camel-hystrix/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java
@@ -0,0 +1,72 @@
+/**
+ * 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.rx;
+
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import rx.Observable;
+import rx.util.functions.Action1;
+import rx.util.functions.Func1;
+
+/**
+ */
+public class ToObservableBodyTest extends RxTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(ToObservableBodyTest.class);
+
+ @Test
+ public void testConsume() throws Exception {
+ final MockEndpoint mockEndpoint = camelContext.getEndpoint("mock:results", MockEndpoint.class);
+ mockEndpoint.expectedBodiesReceived("b", "d");
+
+ // lets consume, filter and map events
+ Observable<Order> observable = reactiveCamel.toObservable("seda:orders", Order.class);
+ Observable<String> largeOrderIds = observable.filter(new Func1<Order, Boolean>() {
+ @Override
+ public Boolean call(Order order) {
+ return order.getAmount() > 100.0;
+ }
+ }).map(new Func1<Order, String>() {
+ @Override
+ public String call(Order order) {
+ return order.getId();
+ }
+ });
+
+
+ // lets route the largeOrderIds to the mock endpoint for testing
+ largeOrderIds.take(2).subscribe(new Action1<String>() {
+ @Override
+ public void call(String body) {
+ LOG.info("Processing " + body);
+ producerTemplate.sendBody(mockEndpoint, body);
+ }
+ });
+
+
+ // now lets send some orders in
+ Order[] orders = {new Order("a", 49.95), new Order("b", 125.50), new Order("c", 22.95),
+ new Order("d", 259.95), new Order("e", 1.25)};
+ for (Order order : orders) {
+ producerTemplate.sendBody("seda:orders", order);
+ }
+
+ mockEndpoint.assertIsSatisfied();
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/test/java/org/apache/camel/rx/ToObservableTest.java
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/test/java/org/apache/camel/rx/ToObservableTest.java b/components/camel-hystrix/src/test/java/org/apache/camel/rx/ToObservableTest.java
new file mode 100644
index 0000000..a670333
--- /dev/null
+++ b/components/camel-hystrix/src/test/java/org/apache/camel/rx/ToObservableTest.java
@@ -0,0 +1,50 @@
+/**
+ * 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.rx;
+
+import org.apache.camel.Message;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import rx.Observable;
+import rx.util.functions.Action1;
+
+/**
+ */
+public class ToObservableTest extends RxTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(ToObservableTest.class);
+
+ @Test
+ public void testConsume() throws Exception {
+ final MockEndpoint mockEndpoint = camelContext.getEndpoint("mock:results", MockEndpoint.class);
+ mockEndpoint.expectedMessageCount(4);
+
+ Observable<Message> observable = reactiveCamel.toObservable("timer://foo?fixedRate=true&period=100");
+ observable.take(4).subscribe(new Action1<Message>() {
+ @Override
+ public void call(Message message) {
+ String body = "Processing message headers " + message.getHeaders();
+ LOG.info(body);
+ producerTemplate.sendBody(mockEndpoint, body);
+ }
+ });
+
+ mockEndpoint.assertIsSatisfied();
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/eab6bcad/components/camel-hystrix/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-hystrix/src/test/resources/log4j.properties b/components/camel-hystrix/src/test/resources/log4j.properties
new file mode 100644
index 0000000..52eb0db
--- /dev/null
+++ b/components/camel-hystrix/src/test/resources/log4j.properties
@@ -0,0 +1,36 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+#
+# The logging properties used for eclipse testing, We want to see debug output on the console.
+#
+log4j.rootLogger=INFO, file
+
+#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 [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.file.file=target/test.log
+log4j.appender.file.append=true
[3/4] camel git commit: CAMEL-8514 camel-castor: change dep from SMX
OSGi bundle to castor-xml (keeping versions). Thanks to Thomas Diesler.
Posted by ra...@apache.org.
CAMEL-8514 camel-castor: change dep from SMX OSGi bundle to castor-xml (keeping versions). Thanks to Thomas Diesler.
This closes #441
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8d1d999
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8d1d999
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8d1d999
Branch: refs/heads/master
Commit: f8d1d999f4b2a251979f647e55e4f9d604117598
Parents: 2144590
Author: Raul Kripalani <ra...@apache.org>
Authored: Thu Mar 19 14:05:39 2015 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Thu Mar 19 14:09:37 2015 +0000
----------------------------------------------------------------------
components/camel-castor/pom.xml | 4 ++--
parent/pom.xml | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f8d1d999/components/camel-castor/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-castor/pom.xml b/components/camel-castor/pom.xml
index 2fb143a..ce831bf 100644
--- a/components/camel-castor/pom.xml
+++ b/components/camel-castor/pom.xml
@@ -42,8 +42,8 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.castor</artifactId>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor-xml</artifactId>
</dependency>
<!-- testing -->
http://git-wip-us.apache.org/repos/asf/camel/blob/f8d1d999/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 557819f..7852cd6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,6 +82,7 @@
<cassandra-driver-guava-version>16.0.1</cassandra-driver-guava-version>
<cassandra-version>2.1.2</cassandra-version>
<cassandra-unit-version>2.0.2.2</cassandra-unit-version>
+ <castor-version>1.3.2</castor-version>
<castor-bundle-version>1.3.2_2</castor-bundle-version>
<cdi-api-version>1.0</cdi-api-version>
<cglib-bundle-version>2.1_3_7</cglib-bundle-version>
@@ -2109,6 +2110,11 @@
<!-- optional castor dependencies -->
<dependency>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor-xml</artifactId>
+ <version>${castor-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.castor</artifactId>
<version>${castor-bundle-version}</version>
[2/4] camel git commit: WIP
Posted by ra...@apache.org.
WIP
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8c97cad0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8c97cad0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8c97cad0
Branch: refs/heads/camel-hystrix
Commit: 8c97cad0e837d3e1bf4d1d38113b27bd8616f679
Parents: eab6bca
Author: Raul Kripalani <ra...@apache.org>
Authored: Sun Feb 16 17:36:45 2014 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Sun Feb 16 17:36:45 2014 +0000
----------------------------------------------------------------------
.../camel/processor/CamelLogProcessor.java | 10 ++++++-
.../java/org/apache/camel/util/CamelLogger.java | 30 ++++++++++++++++----
.../org/apache/camel/util/ObjectHelper.java | 27 ++++++++++++++++++
parent/pom.xml | 1 +
4 files changed, 61 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8c97cad0/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java
index 052d1e7..521ce9c 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/CamelLogProcessor.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.processor;
+import java.util.concurrent.Callable;
+
import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
@@ -24,6 +26,7 @@ import org.apache.camel.Processor;
import org.apache.camel.spi.ExchangeFormatter;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.CamelLogger;
+import org.apache.camel.util.ObjectHelper;
/**
* A {@link Processor} which just logs to a {@link CamelLogger} object which can be used
@@ -39,7 +42,12 @@ public class CamelLogProcessor implements AsyncProcessor {
private ExchangeFormatter formatter;
public CamelLogProcessor() {
- this(new CamelLogger(CamelLogProcessor.class.getName()));
+ this(ObjectHelper.runWithClassLoader(null, new Callable<CamelLogger>() {
+ @Override
+ public CamelLogger call() throws Exception {
+ return new CamelLogger(CamelLogProcessor.class.getName());
+ }
+ }));
}
public CamelLogProcessor(CamelLogger log) {
http://git-wip-us.apache.org/repos/asf/camel/blob/8c97cad0/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java b/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
index 1787bd7..96773f0 100644
--- a/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
+++ b/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.util;
+import java.util.concurrent.Callable;
+
import org.apache.camel.LoggingLevel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,7 +38,12 @@ public class CamelLogger {
private Marker marker;
public CamelLogger() {
- this(LoggerFactory.getLogger(CamelLogger.class));
+ this(ObjectHelper.runWithClassLoader(null, new Callable<Logger>() {
+ @Override
+ public Logger call() throws Exception {
+ return LoggerFactory.getLogger(CamelLogger.class);
+ }
+ }));
}
public CamelLogger(Logger log) {
@@ -53,16 +60,27 @@ public class CamelLogger {
setMarker(marker);
}
- public CamelLogger(String logName) {
- this(LoggerFactory.getLogger(logName));
+ public CamelLogger(final String logName) {
+ this(ObjectHelper.runWithClassLoader(null, new Callable<Logger>() {
+ @Override
+ public Logger call() throws Exception {
+ return LoggerFactory.getLogger(logName);
+ }
+ }));
}
- public CamelLogger(String logName, LoggingLevel level) {
+ public CamelLogger(final String logName, final LoggingLevel level) {
this(logName, level, null);
}
- public CamelLogger(String logName, LoggingLevel level, String marker) {
- this(LoggerFactory.getLogger(logName), level, marker);
+ public CamelLogger(final String logName, final LoggingLevel level, final String marker) {
+ this(ObjectHelper.runWithClassLoader(null, new Callable<Logger>() {
+ @Override
+ public Logger call() throws Exception {
+ return LoggerFactory.getLogger(logName);
+ }
+ }), level, marker);
+
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/8c97cad0/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
index 2b0827a..97b510b 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -42,6 +42,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import java.util.Scanner;
+import java.util.concurrent.Callable;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -1528,6 +1529,32 @@ public final class ObjectHelper {
return value.equals(Float.NaN) || value.equals(Double.NaN);
}
+ /**
+ * Runs a piece of code with a different classloader, remembering the old classloader and
+ * restoring it prior to returning. If the Callable throws an exception, it will be wrapped
+ * in a {@link RuntimeCamelException} prior to rethrowing it.
+ *
+ * @param classLoader ClassLoader to run the logic with
+ * @param callable the logic to run with the supplied ClassLoader
+ * @return the result from running the {@link Callable}
+ */
+ public static <T> T runWithClassLoader(final ClassLoader classLoader, final Callable<T> callable) throws RuntimeCamelException {
+ if (classLoader == null || callable == null) {
+ throw new IllegalArgumentException("Neither Classloader or Callable can be null");
+ }
+
+ final ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
+ try {
+ Thread.currentThread().setContextClassLoader(classLoader);
+ return callable.call();
+ } catch (Exception e) {
+ throw new RuntimeCamelException(e);
+ }
+ finally {
+ Thread.currentThread().setContextClassLoader(oldClassLoader);
+ }
+}
+
private static final class ExceptionIterator implements Iterator<Throwable> {
private List<Throwable> tree = new ArrayList<Throwable>();
private Iterator<Throwable> it;
http://git-wip-us.apache.org/repos/asf/camel/blob/8c97cad0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cb05bb8..2517848 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -181,6 +181,7 @@
<httpcore4-version>4.3</httpcore4-version>
<httpclient4-version>4.3.1</httpclient4-version>
<httpclient-version>3.1</httpclient-version>
+ <hystrix-version>1.3.8</hystrix-version>
<ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
<ibatis-version>2.3.4.726</ibatis-version>
<ical4j-version>1.0.5.2</ical4j-version>
[4/4] camel git commit: CAMEL-8514 camel-castor: change dep from SMX
OSGi bundle to castor-xml (keeping versions). Thanks to Thomas Diesler.
Posted by ra...@apache.org.
CAMEL-8514 camel-castor: change dep from SMX OSGi bundle to castor-xml (keeping versions). Thanks to Thomas Diesler.
This closes #441
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/51cf4226
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/51cf4226
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/51cf4226
Branch: refs/heads/camel-2.14.x
Commit: 51cf42260fc6e28ed4c98408b6ce0e71aa6efabb
Parents: 5a4e372
Author: Raul Kripalani <ra...@apache.org>
Authored: Thu Mar 19 14:05:39 2015 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Thu Mar 19 14:12:28 2015 +0000
----------------------------------------------------------------------
components/camel-castor/pom.xml | 4 ++--
parent/pom.xml | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/51cf4226/components/camel-castor/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-castor/pom.xml b/components/camel-castor/pom.xml
index e0c77ca..290eac0 100644
--- a/components/camel-castor/pom.xml
+++ b/components/camel-castor/pom.xml
@@ -42,8 +42,8 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.castor</artifactId>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor-xml</artifactId>
</dependency>
<!-- testing -->
http://git-wip-us.apache.org/repos/asf/camel/blob/51cf4226/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bed6b5f..9c7e6e9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -74,6 +74,7 @@
<build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version>
<c3p0-version>0.9.1.2</c3p0-version>
<camel-test-spring-artifactId>camel-test-spring3</camel-test-spring-artifactId>
+ <castor-version>1.3.2</castor-version>
<castor-bundle-version>1.3.2_2</castor-bundle-version>
<cdi-api-version>1.2</cdi-api-version>
<cglib-bundle-version>2.1_3_7</cglib-bundle-version>
@@ -1882,6 +1883,11 @@
<!-- optional castor dependencies -->
<dependency>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor-xml</artifactId>
+ <version>${castor-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.castor</artifactId>
<version>${castor-bundle-version}</version>