You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/09/26 10:34:59 UTC
[1/6] camel git commit: CAMEL-9172 - Created camel-jolt component
Repository: camel
Updated Branches:
refs/heads/master e2d378fcd -> 8e8f7aa4c
CAMEL-9172 - Created camel-jolt component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6a02f6c9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6a02f6c9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6a02f6c9
Branch: refs/heads/master
Commit: 6a02f6c934acdb611721555fcaabae466ae5eb9f
Parents: e2d378f
Author: Pontus Ullgren <ul...@gmail.com>
Authored: Fri Sep 25 23:57:44 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 26 08:39:05 2015 +0200
----------------------------------------------------------------------
components/camel-jolt/pom.xml | 72 +++++++
.../camel/component/jolt/JoltComponent.java | 59 ++++++
.../camel/component/jolt/JoltConstants.java | 31 +++
.../camel/component/jolt/JoltEndpoint.java | 185 +++++++++++++++++
.../component/jolt/JoltInputOutputType.java | 21 ++
.../camel/component/jolt/JoltTransformType.java | 25 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../services/org/apache/camel/component/jolt | 18 ++
.../camel/component/jolt/JoltDefaultrTest.java | 61 ++++++
.../component/jolt/JoltFirstSampleTest.java | 59 ++++++
.../camel/component/jolt/JoltRemovrTest.java | 62 ++++++
.../src/test/resources/log4j.properties | 14 ++
.../apache/camel/component/jolt/defaultr.json | 4 +
.../camel/component/jolt/firstSample/input.json | 15 ++
.../component/jolt/firstSample/output.json | 1 +
.../camel/component/jolt/firstSample/spec.json | 41 ++++
.../org/apache/camel/component/jolt/removr.json | 3 +
18 files changed, 885 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
new file mode 100644
index 0000000..391b8a8
--- /dev/null
+++ b/components/camel-jolt/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <artifactId>components</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <version>2.16-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jolt</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Camel :: Jolt</name>
+ <description>Camel Jolt Support</description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <camel.osgi.export.pkg>org.apache.camel.component.jolt.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>
+ org.apache.camel.spi.ComponentResolver;component=jolt,
+ org.apache.camel.spi.LanguageResolver;language=jolt
+ </camel.osgi.export.service>
+ <jolt-version>0.0.16</jolt-version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.bazaarvoice.jolt</groupId>
+ <artifactId>jolt-core</artifactId>
+ <version>0.0.16</version>
+ </dependency>
+ <dependency>
+ <groupId>com.bazaarvoice.jolt</groupId>
+ <artifactId>json-utils</artifactId>
+ <version>0.0.16</version>
+ </dependency>
+
+
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java
new file mode 100644
index 0000000..803e0b3
--- /dev/null
+++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java
@@ -0,0 +1,59 @@
+/**
+ * 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.jolt;
+
+import java.util.Map;
+
+import com.bazaarvoice.jolt.Transform;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.util.ResourceHelper;
+
+/**
+ * @version
+ */
+public class JoltComponent extends DefaultComponent {
+ private Transform transform;
+
+ public Transform getTransform() {
+ return transform;
+ }
+
+ /**
+ * Explicitly sets the Transform to use. If not set a Transform specified by the transformDsl will be created
+ */
+ public void setTransform(Transform transform) {
+ this.transform = transform;
+ }
+
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+ boolean cache = getAndRemoveParameter(parameters, "contentCache", Boolean.class, Boolean.TRUE);
+
+ JoltEndpoint answer = new JoltEndpoint(uri, this, remaining);
+ answer.setContentCache(cache);
+ answer.setTransform(transform);
+
+ // if its a http resource then append any remaining parameters and update the resource uri
+ if (ResourceHelper.isHttpUri(remaining)) {
+ remaining = ResourceHelper.appendParameters(remaining, parameters);
+ answer.setResourceUri(remaining);
+ }
+
+ return answer;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltConstants.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltConstants.java
new file mode 100644
index 0000000..0493817
--- /dev/null
+++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltConstants.java
@@ -0,0 +1,31 @@
+/**
+ * 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.jolt;
+
+/**
+ * Jolt Constants.
+ */
+public final class JoltConstants {
+
+ public static final String JOLT_RESOURCE_URI = "CamelJoltResourceUri";
+
+ public static final String JOLT_CONTEXT = "CamelJoltContext";
+
+ private JoltConstants() {
+ // Utility class
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
new file mode 100644
index 0000000..34f018c
--- /dev/null
+++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
@@ -0,0 +1,185 @@
+/**
+ * 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.jolt;
+
+import java.io.InputStream;
+
+import com.bazaarvoice.jolt.Chainr;
+import com.bazaarvoice.jolt.Defaultr;
+import com.bazaarvoice.jolt.JsonUtils;
+import com.bazaarvoice.jolt.Removr;
+import com.bazaarvoice.jolt.Shiftr;
+import com.bazaarvoice.jolt.Sortr;
+import com.bazaarvoice.jolt.Transform;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Message;
+import org.apache.camel.component.ResourceEndpoint;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.util.ObjectHelper;
+
+@UriEndpoint(scheme = "jolt", title = "JOLT", syntax = "jolt:/spec.json", producerOnly = true, label = "transformation")
+public class JoltEndpoint extends ResourceEndpoint {
+
+ private Transform transform;
+
+ @UriParam(defaultValue = "Hydrated")
+ private JoltInputOutputType outputType;
+
+ @UriParam(defaultValue = "Hydrated")
+ private JoltInputOutputType inputType;
+
+ @UriParam(defaultValue = "Chainr")
+ private JoltTransformType transformDsl = JoltTransformType.Chainr;
+
+ public JoltEndpoint() {
+ }
+
+ public JoltEndpoint(String uri, JoltComponent component, String resourceUri) {
+ super(uri, component, resourceUri);
+ }
+
+ @Override
+ public boolean isSingleton() {
+ return true;
+ }
+
+ @Override
+ public ExchangePattern getExchangePattern() {
+ return ExchangePattern.InOut;
+ }
+
+ @Override
+ protected String createEndpointUri() {
+ return "jolt:" + getResourceUri();
+ }
+
+ private synchronized Transform getTransform() throws Exception {
+ if (transform == null) {
+ if (log.isDebugEnabled()) {
+ String path = getResourceUri();
+ log.debug("Velocity content read from resource {} with resourceUri: {} for endpoint {}", new Object[]{getResourceUri(), path, getEndpointUri()});
+ }
+
+ // Sortr does not require a spec
+ if (this.transformDsl == JoltTransformType.Sortr) {
+ this.transform = new Sortr();
+ } else {
+ // getResourceAsInputStream also considers the content cache
+ Object spec = JsonUtils.jsonToObject(getResourceAsInputStream());
+ switch(this.transformDsl) {
+ case Shiftr:
+ this.transform = new Shiftr(spec);
+ break;
+ case Defaultr:
+ this.transform = new Defaultr(spec);
+ break;
+ case Removr:
+ this.transform = new Removr(spec);
+ break;
+ case Chainr:
+ default:
+ this.transform = Chainr.fromSpec(spec);
+ break;
+ }
+ }
+
+ }
+ return transform;
+ }
+
+ /**
+ * Sets the Transform to use. If not set a Transform specified by the transformDsl will be created
+ */
+ public void setTransform(Transform transform) {
+ this.transform = transform;
+ }
+
+ public JoltInputOutputType getOutputType() {
+ return outputType;
+ }
+
+ /**
+ * Specifies if the output should be hydrated JSON or a JSON String.
+ */
+ public void setOutputType(JoltInputOutputType outputType) {
+ this.outputType = outputType;
+ }
+
+ public JoltInputOutputType getInputType() {
+ return inputType;
+ }
+
+ /**
+ * Specifies if the input is hydrated JSON or a JSON String.
+ */
+ public void setInputType(JoltInputOutputType inputType) {
+ this.inputType = inputType;
+ }
+
+ public JoltTransformType getTransformDsl() {
+ return transformDsl;
+ }
+
+ /**
+ * Specifies the Transform DSL of the enpoint resource. If non is specified <code>Chainr</code> will be used.
+ */
+ public void setTransformDsl(JoltTransformType transformType) {
+ this.transformDsl = transformType;
+ }
+
+ public JoltEndpoint findOrCreateEndpoint(String uri, String newResourceUri) {
+ String newUri = uri.replace(getResourceUri(), newResourceUri);
+ log.debug("Getting endpoint with URI: {}", newUri);
+ return getCamelContext().getEndpoint(newUri, JoltEndpoint.class);
+ }
+
+ @Override
+ protected void onExchange(Exchange exchange) throws Exception {
+ String path = getResourceUri();
+ ObjectHelper.notNull(path, "resourceUri");
+
+ String newResourceUri = exchange.getIn().getHeader(JoltConstants.JOLT_RESOURCE_URI, String.class);
+ if (newResourceUri != null) {
+ exchange.getIn().removeHeader(JoltConstants.JOLT_RESOURCE_URI);
+
+ log.debug("{} set to {} creating new endpoint to handle exchange", JoltConstants.JOLT_RESOURCE_URI, newResourceUri);
+ JoltEndpoint newEndpoint = findOrCreateEndpoint(getEndpointUri(), newResourceUri);
+ newEndpoint.onExchange(exchange);
+ return;
+ }
+ Object input;
+ if (getInputType() == JoltInputOutputType.JsonString) {
+ input = JsonUtils.jsonToObject(exchange.getIn().getBody(InputStream.class));
+ } else {
+ input = exchange.getIn().getBody();
+ }
+ Object output = getTransform().transform(input);
+
+ // now lets output the results to the exchange
+ Message out = exchange.getOut();
+ if (getOutputType() == JoltInputOutputType.JsonString) {
+ out.setBody(JsonUtils.toJsonString(output));
+ } else {
+ out.setBody(output);
+ }
+ out.setHeaders(exchange.getIn().getHeaders());
+ out.setAttachments(exchange.getIn().getAttachments());
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltInputOutputType.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltInputOutputType.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltInputOutputType.java
new file mode 100644
index 0000000..7a132a0
--- /dev/null
+++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltInputOutputType.java
@@ -0,0 +1,21 @@
+/**
+ * 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.jolt;
+
+public enum JoltInputOutputType {
+ Hydrated, JsonString
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltTransformType.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltTransformType.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltTransformType.java
new file mode 100644
index 0000000..4b3e614
--- /dev/null
+++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltTransformType.java
@@ -0,0 +1,25 @@
+/**
+ * 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.jolt;
+
+public enum JoltTransformType {
+ Chainr,
+ Shiftr,
+ Defaultr,
+ Removr,
+ Sortr
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/resources/META-INF/LICENSE.txt b/components/camel-jolt/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/components/camel-jolt/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/6a02f6c9/components/camel-jolt/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/resources/META-INF/NOTICE.txt b/components/camel-jolt/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/components/camel-jolt/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/6a02f6c9/components/camel-jolt/src/main/resources/META-INF/services/org/apache/camel/component/jolt
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/resources/META-INF/services/org/apache/camel/component/jolt b/components/camel-jolt/src/main/resources/META-INF/services/org/apache/camel/component/jolt
new file mode 100644
index 0000000..bda9024
--- /dev/null
+++ b/components/camel-jolt/src/main/resources/META-INF/services/org/apache/camel/component/jolt
@@ -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.jolt.JoltComponent
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java
new file mode 100644
index 0000000..2c235b0
--- /dev/null
+++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltDefaultrTest.java
@@ -0,0 +1,61 @@
+/**
+ * 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.jolt;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ * Unit test testing the Removr.
+ */
+public class JoltDefaultrTest extends CamelTestSupport {
+
+ @Test
+ public void testFirstSampleJolt() throws Exception {
+ Exchange exchange = template.request("direct://start", new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ Map<String, String> body = new HashMap<>();
+ body.put("Hello", "World");
+ exchange.getIn().setBody(body);
+ }
+ });
+
+ assertEquals(3, exchange.getOut().getBody(Map.class).size());
+ assertEquals("aa", exchange.getOut().getBody(Map.class).get("a"));
+ assertEquals("bb", exchange.getOut().getBody(Map.class).get("b"));
+ assertEquals("World", exchange.getOut().getBody(Map.class).get("Hello"));
+
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct://start")
+ .to("jolt:org/apache/camel/component/jolt/defaultr.json?transformDsl=Defaultr");
+ }
+ };
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltFirstSampleTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltFirstSampleTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltFirstSampleTest.java
new file mode 100644
index 0000000..325aacd
--- /dev/null
+++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltFirstSampleTest.java
@@ -0,0 +1,59 @@
+/**
+ * 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.jolt;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ResourceHelper;
+import org.junit.Test;
+
+/**
+ * Unit test based on the first sample test from the JOLT project.
+ */
+public class JoltFirstSampleTest extends CamelTestSupport {
+
+ @Test
+ public void testFirstSampleJolt() throws Exception {
+ getMockEndpoint("mock:result").expectedMinimumMessageCount(1);
+ getMockEndpoint("mock:result").expectedBodiesReceived(
+ IOHelper.loadText(
+ ResourceHelper.resolveMandatoryResourceAsInputStream(
+ context.getClassResolver() ,
+ "org/apache/camel/component/jolt/firstSample/output.json")
+ ).trim() // Remove the last newline added by IOHelper.loadText()
+ );
+
+ sendBody("direct://start",
+ ResourceHelper.resolveMandatoryResourceAsInputStream(
+ context.getClassResolver(),
+ "org/apache/camel/component/jolt/firstSample/input.json"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct://start")
+ .to("jolt:org/apache/camel/component/jolt/firstSample/spec.json?inputType=JsonString&outputType=JsonString")
+ .to("mock:result");
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java
new file mode 100644
index 0000000..3df0c23
--- /dev/null
+++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java
@@ -0,0 +1,62 @@
+/**
+ * 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.jolt;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ * Unit test testing the Removr.
+ */
+public class JoltRemovrTest extends CamelTestSupport {
+
+ @Test
+ public void testFirstSampleJolt() throws Exception {
+ Exchange exchange = template.request("direct://start", new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ Map<String, String> body = new HashMap<>();
+ body.put("keepMe", "This should still be in the result");
+ body.put("Hello", "World");
+ body.put("removeMe", "This should be gone");
+ exchange.getIn().setBody(body);
+ }
+ });
+
+ assertEquals(2, exchange.getOut().getBody(Map.class).size());
+ assertEquals(null, exchange.getOut().getBody(Map.class).get("removeMe"));
+ assertEquals("World", exchange.getOut().getBody(Map.class).get("Hello"));
+
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct://start")
+ .to("jolt:org/apache/camel/component/jolt/removr.json?transformDsl=Removr");
+ }
+ };
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/test/resources/log4j.properties b/components/camel-jolt/src/test/resources/log4j.properties
new file mode 100644
index 0000000..3b1bd38
--- /dev/null
+++ b/components/camel-jolt/src/test/resources/log4j.properties
@@ -0,0 +1,14 @@
+#
+# The logging properties used
+#
+log4j.rootLogger=INFO, out
+
+# uncomment the following line to turn on Camel debugging
+#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
+
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/defaultr.json
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/defaultr.json b/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/defaultr.json
new file mode 100644
index 0000000..6602e4b
--- /dev/null
+++ b/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/defaultr.json
@@ -0,0 +1,4 @@
+{
+ "a": "aa",
+ "b": "bb"
+ }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/firstSample/input.json
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/firstSample/input.json b/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/firstSample/input.json
new file mode 100644
index 0000000..6c777e6
--- /dev/null
+++ b/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/firstSample/input.json
@@ -0,0 +1,15 @@
+{ "rating": {
+ "primary": {
+ "value": 3,
+ "max": 5
+ },
+ "sharpness": {
+ "value": 5,
+ "max": 5
+ },
+ "quality": {
+ "value": 3,
+ "max": 7
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/firstSample/output.json
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/firstSample/output.json b/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/firstSample/output.json
new file mode 100644
index 0000000..093bb81
--- /dev/null
+++ b/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/firstSample/output.json
@@ -0,0 +1 @@
+{"~a":"aa","~id":"id","~z":"zz","Rating":3,"RatingRange":5,"SecondaryRatings":{"quality":{"Id":"quality","Range":7,"Value":3},"sharpness":{"Id":"sharpness","Range":5,"Value":5}},"zz":"zz"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/firstSample/spec.json
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/firstSample/spec.json b/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/firstSample/spec.json
new file mode 100644
index 0000000..d5b39b6
--- /dev/null
+++ b/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/firstSample/spec.json
@@ -0,0 +1,41 @@
+[
+ {
+ // first operation is shift
+ "operation": "shift",
+ "spec": {
+ "rating": {
+ "primary": {
+ "value": "Rating",
+ "max": "RatingRange"
+ },
+ "*": {
+ "value": "SecondaryRatings.&1.Value",
+ "max": "SecondaryRatings.&1.Range",
+ "$": "SecondaryRatings.&.Id"
+ }
+ }
+ }
+ },
+ {
+ // second operation is to default some values
+ "operation": "default",
+ "spec": {
+ "~z": "zz",
+ "~a": "aa",
+ "~id": "id",
+ "zz": "zz",
+ "~deleteme": "deleteme"
+ }
+ },
+ {
+ // third operation is to remove something
+ "operation": "remove",
+ "spec": {
+ "~deleteme": ""
+ }
+ },
+ {
+ // last operation is to sort the JSON
+ "operation": "sort"
+ }
+ ]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/6a02f6c9/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/removr.json
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/removr.json b/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/removr.json
new file mode 100644
index 0000000..e4ccd16
--- /dev/null
+++ b/components/camel-jolt/src/test/resources/org/apache/camel/component/jolt/removr.json
@@ -0,0 +1,3 @@
+{
+ "removeMe": ""
+ }
\ No newline at end of file
[3/6] camel git commit: CAMEL-9172: Add camel-jolt to kit. This
closes #622.
Posted by da...@apache.org.
CAMEL-9172: Add camel-jolt to kit. This closes #622.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/21d6a408
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/21d6a408
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/21d6a408
Branch: refs/heads/master
Commit: 21d6a408c9d8aa401ac615946bfeda61c290d5bc
Parents: 04b09d5
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 26 08:47:34 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 26 08:47:34 2015 +0200
----------------------------------------------------------------------
apache-camel/pom.xml | 4 ++++
apache-camel/src/main/descriptors/common-bin.xml | 1 +
parent/pom.xml | 5 +++++
3 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/21d6a408/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index a370671..c691740 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -417,6 +417,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-jolt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-josql</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/21d6a408/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 089f694..6bfca09 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -117,6 +117,7 @@
<include>org.apache.camel:camel-jira</include>
<include>org.apache.camel:camel-jms</include>
<include>org.apache.camel:camel-jmx</include>
+ <include>org.apache.camel:camel-jolt</include>
<include>org.apache.camel:camel-josql</include>
<include>org.apache.camel:camel-jpa</include>
<include>org.apache.camel:camel-jsch</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/21d6a408/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2febc7d..1d8bcdf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1085,6 +1085,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-jolt</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-josql</artifactId>
<version>${project.version}</version>
</dependency>
[4/6] camel git commit: CAMEL-9172: Polished.
Posted by da...@apache.org.
CAMEL-9172: Polished.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2997779b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2997779b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2997779b
Branch: refs/heads/master
Commit: 2997779ba9da2415028213e56061b03bbc91a79c
Parents: 21d6a40
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 26 08:51:55 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 26 08:51:55 2015 +0200
----------------------------------------------------------------------
.../camel/component/jolt/JoltComponent.java | 29 ++++++++++++--------
.../camel/component/jolt/JoltEndpoint.java | 2 +-
2 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2997779b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java
index 95833db..9cde912 100644
--- a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java
+++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java
@@ -19,23 +19,15 @@ package org.apache.camel.component.jolt;
import java.util.Map;
import com.bazaarvoice.jolt.Transform;
-
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.impl.UriEndpointComponent;
import org.apache.camel.util.ResourceHelper;
-public class JoltComponent extends DefaultComponent {
+public class JoltComponent extends UriEndpointComponent {
private Transform transform;
- public Transform getTransform() {
- return transform;
- }
-
- /**
- * Explicitly sets the Transform to use. If not set a Transform specified by the transformDsl will be created
- */
- public void setTransform(Transform transform) {
- this.transform = transform;
+ public JoltComponent() {
+ super(JoltEndpoint.class);
}
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
@@ -53,4 +45,17 @@ public class JoltComponent extends DefaultComponent {
return answer;
}
+
+ public Transform getTransform() {
+ return transform;
+ }
+
+ /**
+ * Explicitly sets the Transform to use. If not set a Transform specified by the transformDsl will be created
+ */
+ public void setTransform(Transform transform) {
+ this.transform = transform;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2997779b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
index 8daef53..ebc0837 100644
--- a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
+++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
@@ -138,7 +138,7 @@ public class JoltEndpoint extends ResourceEndpoint {
}
/**
- * Specifies the Transform DSL of the enpoint resource. If non is specified <code>Chainr</code> will be used.
+ * Specifies the Transform DSL of the endpoint resource. If none is specified <code>Chainr</code> will be used.
*/
public void setTransformDsl(JoltTransformType transformType) {
this.transformDsl = transformType;
[5/6] camel git commit: CAMEL-9172: Polished.
Posted by da...@apache.org.
CAMEL-9172: Polished.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/415b41b6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/415b41b6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/415b41b6
Branch: refs/heads/master
Commit: 415b41b67130d85cdbc74eeba5f8c47449ad2420
Parents: 2997779
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 26 08:53:55 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 26 08:53:55 2015 +0200
----------------------------------------------------------------------
components/camel-jolt/pom.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/415b41b6/components/camel-jolt/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
index 6109607..1b626d5 100644
--- a/components/camel-jolt/pom.xml
+++ b/components/camel-jolt/pom.xml
@@ -45,6 +45,18 @@
<artifactId>camel-core</artifactId>
</dependency>
+ <!-- align to use versions from Camel BOM -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson2-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson2-version}</version>
+ </dependency>
+
<dependency>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>jolt-core</artifactId>
[2/6] camel git commit: CAMEL-9172: camel-jolt. Polsihed.
Posted by da...@apache.org.
CAMEL-9172: camel-jolt. Polsihed.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/04b09d5e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/04b09d5e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/04b09d5e
Branch: refs/heads/master
Commit: 04b09d5e4c7d89bdf705b7796a9207417c179914
Parents: 6a02f6c
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 26 08:46:09 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 26 08:46:09 2015 +0200
----------------------------------------------------------------------
components/camel-jolt/pom.xml | 33 +++++++++++------
.../camel/component/jolt/JoltComponent.java | 3 --
.../camel/component/jolt/JoltEndpoint.java | 4 +--
.../camel/component/jolt/JoltRemovrTest.java | 1 -
.../src/test/resources/log4j.properties | 37 +++++++++++++++-----
components/pom.xml | 1 +
parent/pom.xml | 1 +
7 files changed, 55 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/04b09d5e/components/camel-jolt/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
index 391b8a8..6109607 100644
--- a/components/camel-jolt/pom.xml
+++ b/components/camel-jolt/pom.xml
@@ -1,5 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+ 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>
@@ -9,22 +26,17 @@
<version>2.16-SNAPSHOT</version>
</parent>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-jolt</artifactId>
<packaging>bundle</packaging>
-
<name>Camel :: Jolt</name>
<description>Camel Jolt Support</description>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<camel.osgi.export.pkg>org.apache.camel.component.jolt.*</camel.osgi.export.pkg>
<camel.osgi.export.service>
org.apache.camel.spi.ComponentResolver;component=jolt,
org.apache.camel.spi.LanguageResolver;language=jolt
</camel.osgi.export.service>
- <jolt-version>0.0.16</jolt-version>
</properties>
<dependencies>
@@ -32,19 +44,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>jolt-core</artifactId>
- <version>0.0.16</version>
+ <version>${jolt-version}</version>
</dependency>
<dependency>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>json-utils</artifactId>
- <version>0.0.16</version>
+ <version>${jolt-version}</version>
</dependency>
-
-
+
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/04b09d5e/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java
index 803e0b3..95833db 100644
--- a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java
+++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java
@@ -24,9 +24,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.util.ResourceHelper;
-/**
- * @version
- */
public class JoltComponent extends DefaultComponent {
private Transform transform;
http://git-wip-us.apache.org/repos/asf/camel/blob/04b09d5e/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
index 34f018c..8daef53 100644
--- a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
+++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
@@ -34,7 +34,7 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.util.ObjectHelper;
-@UriEndpoint(scheme = "jolt", title = "JOLT", syntax = "jolt:/spec.json", producerOnly = true, label = "transformation")
+@UriEndpoint(scheme = "jolt", title = "JOLT", syntax = "jolt:resourceUri", producerOnly = true, label = "transformation")
public class JoltEndpoint extends ResourceEndpoint {
private Transform transform;
@@ -74,7 +74,7 @@ public class JoltEndpoint extends ResourceEndpoint {
if (transform == null) {
if (log.isDebugEnabled()) {
String path = getResourceUri();
- log.debug("Velocity content read from resource {} with resourceUri: {} for endpoint {}", new Object[]{getResourceUri(), path, getEndpointUri()});
+ log.debug("Jolt content read from resource {} with resourceUri: {} for endpoint {}", new Object[]{getResourceUri(), path, getEndpointUri()});
}
// Sortr does not require a spec
http://git-wip-us.apache.org/repos/asf/camel/blob/04b09d5e/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java
index 3df0c23..77c0788 100644
--- a/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java
+++ b/components/camel-jolt/src/test/java/org/apache/camel/component/jolt/JoltRemovrTest.java
@@ -46,7 +46,6 @@ public class JoltRemovrTest extends CamelTestSupport {
assertEquals(2, exchange.getOut().getBody(Map.class).size());
assertEquals(null, exchange.getOut().getBody(Map.class).get("removeMe"));
assertEquals("World", exchange.getOut().getBody(Map.class).get("Hello"));
-
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/04b09d5e/components/camel-jolt/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/test/resources/log4j.properties b/components/camel-jolt/src/test/resources/log4j.properties
index 3b1bd38..cbed905 100644
--- a/components/camel-jolt/src/test/resources/log4j.properties
+++ b/components/camel-jolt/src/test/resources/log4j.properties
@@ -1,14 +1,35 @@
+## ---------------------------------------------------------------------------
+## 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
+# The logging properties used during tests..
#
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, file
-# uncomment the following line to turn on Camel debugging
-#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.camel.component.jolt=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
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.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/camel-jolt-test.log
+log4j.appender.file.append=false
http://git-wip-us.apache.org/repos/asf/camel/blob/04b09d5e/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index cc308fb..f033c40 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -140,6 +140,7 @@
<module>camel-jing</module>
<module>camel-jira</module>
<module>camel-jmx</module>
+ <module>camel-jolt</module>
<module>camel-josql</module>
<module>camel-jpa</module>
<module>camel-jsonpath</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/04b09d5e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 88b77b6..2febc7d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -287,6 +287,7 @@
<jodatime-bundle-version>1.6.2</jodatime-bundle-version>
<jodatime2-bundle-version>2.8.2</jodatime2-bundle-version>
<jolokia-version>1.3.1</jolokia-version>
+ <jolt-version>0.0.16</jolt-version>
<josql-bundle-version>1.5_5</josql-bundle-version>
<josql-version>1.5</josql-version>
<jruby-version>1.7.18</jruby-version>
[6/6] camel git commit: CAMEL-9112: camel-script should not fail if
script engine problem in OSGi. camel-script feature should not load
groovy/jruby by default,
use the camel-script-groovy / camel-script-jruby if you want to use them.
Fixed the itest.
Posted by da...@apache.org.
CAMEL-9112: camel-script should not fail if script engine problem in OSGi. camel-script feature should not load groovy/jruby by default, use the camel-script-groovy / camel-script-jruby if you want to use them. Fixed the itest.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8e8f7aa4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8e8f7aa4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8e8f7aa4
Branch: refs/heads/master
Commit: 8e8f7aa4c4468f50715c97b02c209cc61995aa38
Parents: 415b41b
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 26 10:36:31 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 26 10:36:31 2015 +0200
----------------------------------------------------------------------
.../builder/script/ScriptLanguageResolver.java | 2 +-
.../org/apache/camel/script/osgi/Activator.java | 46 +++++++++++---------
.../features/src/main/resources/features.xml | 6 +--
.../camel/itest/karaf/AbstractFeatureTest.java | 16 ++++++-
.../camel/itest/karaf/CamelScriptTest.java | 4 +-
5 files changed, 45 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8e8f7aa4/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguageResolver.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguageResolver.java b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguageResolver.java
index a258243..a6c04c7 100644
--- a/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguageResolver.java
+++ b/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguageResolver.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.LanguageResolver;
public class ScriptLanguageResolver implements LanguageResolver {
public Language resolveLanguage(String name, CamelContext context) {
- // only return if we can suppor the language
+ // only return if we can support the language
if (ScriptBuilder.supportScriptLanguage(name)) {
return new ScriptLanguage(name);
} else {
http://git-wip-us.apache.org/repos/asf/camel/blob/8e8f7aa4/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java b/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
index 33365b2..0e6bd66 100644
--- a/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
+++ b/components/camel-script/src/main/java/org/apache/camel/script/osgi/Activator.java
@@ -21,13 +21,13 @@ import java.io.InputStreamReader;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-
import javax.script.ScriptEngine;
import javax.script.ScriptEngineFactory;
@@ -210,13 +210,14 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer, Serv
return getScriptNames(getFactory());
}
+ @SuppressWarnings("unchecked")
private List<String> getScriptNames(ScriptEngineFactory factory) {
- List<String> names = null;
+ List<String> names;
if (factory != null) {
names = factory.getNames();
} else {
// return an empty script name list
- names = new ArrayList<String>(0);
+ names = Collections.EMPTY_LIST;
}
return names;
}
@@ -224,7 +225,7 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer, Serv
private ScriptEngineFactory getFactory() {
try {
BufferedReader in = IOHelper.buffered(new InputStreamReader(configFile.openStream()));
- String className = null;
+ String className;
while ((className = in.readLine()) != null) {
if ("".equals(className.trim()) || className.trim().startsWith("#")) {
continue;
@@ -238,8 +239,9 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer, Serv
}
in.close();
Class<?> cls = bundle.loadClass(className);
+ // OSGi classloading trouble (with jruby)
if (!ScriptEngineFactory.class.isAssignableFrom(cls)) {
- throw new IllegalStateException("Invalid ScriptEngineFactory: " + cls.getName());
+ return null;
}
return (ScriptEngineFactory) cls.newInstance();
} catch (Exception e) {
@@ -251,28 +253,32 @@ public class Activator implements BundleActivator, BundleTrackerCustomizer, Serv
public ScriptEngine resolveScriptEngine(String name) {
try {
ScriptEngineFactory factory = getFactory();
- List<String> names = getScriptNames(factory);
- for (String test : names) {
- if (test.equals(name)) {
- ClassLoader old = Thread.currentThread().getContextClassLoader();
- ScriptEngine engine;
- try {
- // JRuby seems to require the correct TCCL to call getScriptEngine
- Thread.currentThread().setContextClassLoader(factory.getClass().getClassLoader());
- engine = factory.getScriptEngine();
- } finally {
- Thread.currentThread().setContextClassLoader(old);
+ if (factory != null) {
+ List<String> names = getScriptNames(factory);
+ for (String test : names) {
+ if (test.equals(name)) {
+ ClassLoader old = Thread.currentThread().getContextClassLoader();
+ ScriptEngine engine;
+ try {
+ // JRuby seems to require the correct TCCL to call getScriptEngine
+ Thread.currentThread().setContextClassLoader(factory.getClass().getClassLoader());
+ engine = factory.getScriptEngine();
+ } finally {
+ Thread.currentThread().setContextClassLoader(old);
+ }
+ LOG.trace("Resolved ScriptEngineFactory: {} for expected name: {}", engine, name);
+ return engine;
}
- LOG.trace("Resolved ScriptEngineFactory: {} for expected name: {}", engine, name);
- return engine;
}
+ LOG.debug("ScriptEngineFactory: {} does not match expected name: {}", factory.getEngineName(), name);
+ return null;
}
- LOG.debug("ScriptEngineFactory: {} does not match expected name: {}", factory.getEngineName(), name);
- return null;
} catch (Exception e) {
LOG.warn("Cannot create ScriptEngineFactory: " + e.getClass().getName(), e);
return null;
}
+
+ return null;
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/8e8f7aa4/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 16aa8d1..36e8ca8 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1308,20 +1308,18 @@
<feature name='camel-script-javascript' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle>mvn:com.google.code.scriptengines/scriptengines-javascript/${scriptengines-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino-bundle-version}</bundle>
</feature>
<feature name='camel-script-groovy' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle>mvn:com.google.code.scriptengines/scriptengines-groovy/${scriptengines-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle>
- <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle>
+ <bundle dependency='true'>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle>
</feature>
<feature name='camel-script' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${rhino-bundle-version}</bundle>
- <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy-version}</bundle>
- <bundle dependency='true'>mvn:org.jruby/jruby-complete/${jruby-version}</bundle>
<bundle>mvn:org.apache.camel/camel-script/${project.version}</bundle>
</feature>
<feature name='camel-servlet' version='${project.version}' resolver='(obr)' start-level='50'>
http://git-wip-us.apache.org/repos/asf/camel/blob/8e8f7aa4/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index 2e7272d..524198b 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -20,6 +20,8 @@ import java.io.File;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Properties;
import javax.inject.Inject;
@@ -206,11 +208,21 @@ public abstract class AbstractFeatureTest {
return mavenOption;
}
- public static Option[] configure(String feature) {
+ public static Option[] configure(String mainFeature, String... extraFeatures) {
switchPlatformEncodingToUTF8();
String karafVersion = getKarafVersion();
LOG.info("*** The karaf version is " + karafVersion + " ***");
+ List<String> list = new ArrayList<String>();
+ list.add("cxf-jaxb");
+ list.add("camel-core");
+ list.add("camel-spring");
+ list.add("camel-" + mainFeature);
+ for (String extra : extraFeatures) {
+ list.add("camel-" + extra);
+ }
+ String[] features = list.toArray(new String[list.size()]);
+
Option[] options = new Option[] {
// for remote debugging
//org.ops4j.pax.exam.CoreOptions.vmOption("-Xdebug"),
@@ -239,7 +251,7 @@ public abstract class AbstractFeatureTest {
// install the cxf jaxb spec as the karaf doesn't provide it by default
- KarafDistributionOption.features(getCamelKarafFeatureUrl(), "cxf-jaxb", "camel-core", "camel-spring", "camel-" + feature)
+ KarafDistributionOption.features(getCamelKarafFeatureUrl(), features)
};
return options;
http://git-wip-us.apache.org/repos/asf/camel/blob/8e8f7aa4/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java
index 6348567..3e43264 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelScriptTest.java
@@ -29,12 +29,12 @@ public class CamelScriptTest extends AbstractFeatureTest {
@Test
public void test() throws Exception {
- testLanguage(COMPONENT);
+ testLanguage("Groovy");
}
@Configuration
public static Option[] configure() {
- return configure(COMPONENT);
+ return configure(COMPONENT, "script-groovy");
}
}
\ No newline at end of file