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 2016/04/26 19:20:44 UTC
[1/8] camel git commit: Polished
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 52a3377ea -> 76123a4fe
refs/heads/kube-lb 050646844 -> 867eb8742
refs/heads/master 40f387086 -> d3c3929be
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c1d11d6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c1d11d6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c1d11d6
Branch: refs/heads/kube-lb
Commit: 3c1d11d6f633cbcb7806825eaf849000f9175828
Parents: 0506468
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 26 14:40:10 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 26 14:40:10 2016 +0200
----------------------------------------------------------------------
components/camel-kubernetes/pom.xml | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3c1d11d6/components/camel-kubernetes/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index 699f9cd..fd13f1a 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -1,14 +1,20 @@
<?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. -->
+<!--
+ 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>
[5/8] camel git commit: Fixed CS. This closes #960
Posted by da...@apache.org.
Fixed CS. This closes #960
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d3c3929b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d3c3929b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d3c3929b
Branch: refs/heads/master
Commit: d3c3929bed5ac47458b743385226fd10c9945b84
Parents: b0e8240
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 26 19:19:25 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 26 19:19:25 2016 +0200
----------------------------------------------------------------------
.../dataformat/tarfile/SpringTarFileDataFormatTest.java | 5 +++--
.../java/org/apache/camel/dataformat/tarfile/TarUtils.java | 8 +++++---
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d3c3929b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
index 90f3e02..e3a0df9 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
@@ -19,6 +19,9 @@ package org.apache.camel.dataformat.tarfile;
import java.io.File;
import java.util.concurrent.TimeUnit;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Collections.singletonList;
+
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -26,8 +29,6 @@ import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Collections.singletonList;
import static org.apache.camel.Exchange.FILE_NAME;
import static org.apache.camel.dataformat.tarfile.TarUtils.TEXT;
import static org.apache.camel.dataformat.tarfile.TarUtils.getBytes;
http://git-wip-us.apache.org/repos/asf/camel/blob/d3c3929b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
index aded0f5..df07907 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
@@ -27,6 +27,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
final class TarUtils {
+
static final String TEXT = "The Masque of Queen Bersabe (excerpt) \n"
+ "by: Algernon Charles Swinburne \n\n"
+ "My lips kissed dumb the word of Ah \n"
@@ -38,6 +39,10 @@ final class TarUtils {
+ "For lust towards the kings that came \n"
+ "With horsemen riding royally.";
+ private TarUtils() {
+ // Prevent instantiation
+ }
+
static byte[] getTaredText(String entryName) throws IOException {
ByteArrayInputStream bais = new ByteArrayInputStream(TEXT.getBytes("UTF-8"));
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -65,7 +70,4 @@ final class TarUtils {
return baos.toByteArray();
}
- private TarUtils() {
- // Prevent instantiation
- }
}
[7/8] camel git commit: CAMEL-9915 Add TarFileDataFormat also in
DataFormatsDefinition
Posted by da...@apache.org.
CAMEL-9915 Add TarFileDataFormat also in DataFormatsDefinition
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/49fd8ce8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/49fd8ce8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/49fd8ce8
Branch: refs/heads/camel-2.17.x
Commit: 49fd8ce8a448fb9fab9f052809356bd7c0a59a47
Parents: 27e0329
Author: Antoine DESSAIGNE <an...@gmail.com>
Authored: Tue Apr 26 17:27:10 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 26 19:20:27 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/model/dataformat/DataFormatsDefinition.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/49fd8ce8/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
index 880891f..901130e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
@@ -67,6 +67,7 @@ public class DataFormatsDefinition {
@XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
+ @XmlElement(required = false, name = "tarfile", type = TarFileDataFormat.class),
@XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
@XmlElement(required = false, name = "univocity-csv", type = UniVocityCsvDataFormat.class),
@XmlElement(required = false, name = "univocity-fixed", type = UniVocityFixedWidthDataFormat.class),
[8/8] camel git commit: Fixed CS. This closes #960
Posted by da...@apache.org.
Fixed CS. This closes #960
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/76123a4f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/76123a4f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/76123a4f
Branch: refs/heads/camel-2.17.x
Commit: 76123a4fee0074b59daa5b9e210cd50a23981d6b
Parents: 49fd8ce
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 26 19:19:25 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 26 19:20:33 2016 +0200
----------------------------------------------------------------------
.../dataformat/tarfile/SpringTarFileDataFormatTest.java | 5 +++--
.../java/org/apache/camel/dataformat/tarfile/TarUtils.java | 8 +++++---
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/76123a4f/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
index 90f3e02..e3a0df9 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
@@ -19,6 +19,9 @@ package org.apache.camel.dataformat.tarfile;
import java.io.File;
import java.util.concurrent.TimeUnit;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Collections.singletonList;
+
import org.apache.camel.Exchange;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -26,8 +29,6 @@ import org.apache.camel.test.spring.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Collections.singletonList;
import static org.apache.camel.Exchange.FILE_NAME;
import static org.apache.camel.dataformat.tarfile.TarUtils.TEXT;
import static org.apache.camel.dataformat.tarfile.TarUtils.getBytes;
http://git-wip-us.apache.org/repos/asf/camel/blob/76123a4f/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
index aded0f5..df07907 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
@@ -27,6 +27,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
final class TarUtils {
+
static final String TEXT = "The Masque of Queen Bersabe (excerpt) \n"
+ "by: Algernon Charles Swinburne \n\n"
+ "My lips kissed dumb the word of Ah \n"
@@ -38,6 +39,10 @@ final class TarUtils {
+ "For lust towards the kings that came \n"
+ "With horsemen riding royally.";
+ private TarUtils() {
+ // Prevent instantiation
+ }
+
static byte[] getTaredText(String entryName) throws IOException {
ByteArrayInputStream bais = new ByteArrayInputStream(TEXT.getBytes("UTF-8"));
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -65,7 +70,4 @@ final class TarUtils {
return baos.toByteArray();
}
- private TarUtils() {
- // Prevent instantiation
- }
}
[6/8] camel git commit: Allow to use tarfile data format in XML
marshal/unmarshal
Posted by da...@apache.org.
Allow to use tarfile data format in XML marshal/unmarshal
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/27e03299
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/27e03299
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/27e03299
Branch: refs/heads/camel-2.17.x
Commit: 27e03299845a9791d3b9b83c94bf14b18d0abba2
Parents: 52a3377
Author: Antoine DESSAIGNE <an...@gmail.com>
Authored: Tue Apr 26 17:11:52 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 26 19:20:20 2016 +0200
----------------------------------------------------------------------
.../apache/camel/model/MarshalDefinition.java | 8 +-
.../apache/camel/model/UnmarshalDefinition.java | 6 +-
.../apache/camel/model/dataformat/jaxb.index | 1 +
.../tarfile/SpringTarFileDataFormatTest.java | 168 +++++++++++++++++++
.../tarfile/TarFileDataFormatTest.java | 47 +-----
.../camel/dataformat/tarfile/TarUtils.java | 71 ++++++++
.../tarfile/SpringTarFileDataFormatTest.xml | 82 +++++++++
7 files changed, 333 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/27e03299/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
index 706f6e3..be08866 100644
--- a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
@@ -48,6 +48,7 @@ import org.apache.camel.model.dataformat.SerializationDataFormat;
import org.apache.camel.model.dataformat.SoapJaxbDataFormat;
import org.apache.camel.model.dataformat.StringDataFormat;
import org.apache.camel.model.dataformat.SyslogDataFormat;
+import org.apache.camel.model.dataformat.TarFileDataFormat;
import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
import org.apache.camel.model.dataformat.UniVocityCsvDataFormat;
import org.apache.camel.model.dataformat.UniVocityFixedWidthDataFormat;
@@ -67,7 +68,7 @@ import org.apache.camel.spi.RouteContext;
/**
* Marshals data into a specified format for transmission over a transport or component
*
- * @version
+ * @version
*/
@Metadata(label = "eip,transformation")
@XmlRootElement(name = "marshal")
@@ -102,6 +103,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> {
@XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
+ @XmlElement(required = false, name = "tarfile", type = TarFileDataFormat.class),
@XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
@XmlElement(required = false, name = "univocity-csv", type = UniVocityCsvDataFormat.class),
@XmlElement(required = false, name = "univocity-fixed", type = UniVocityFixedWidthDataFormat.class),
@@ -135,7 +137,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> {
public String toString() {
return "Marshal[" + description() + "]";
}
-
+
protected String description() {
return dataFormatType != null ? dataFormatType.toString() : "ref:" + ref;
}
@@ -144,7 +146,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> {
public String getLabel() {
return "marshal[" + description() + "]";
}
-
+
public String getRef() {
return ref;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/27e03299/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
index 9b95f23..c4af19b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
@@ -48,6 +48,7 @@ import org.apache.camel.model.dataformat.SerializationDataFormat;
import org.apache.camel.model.dataformat.SoapJaxbDataFormat;
import org.apache.camel.model.dataformat.StringDataFormat;
import org.apache.camel.model.dataformat.SyslogDataFormat;
+import org.apache.camel.model.dataformat.TarFileDataFormat;
import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
import org.apache.camel.model.dataformat.UniVocityCsvDataFormat;
import org.apache.camel.model.dataformat.UniVocityFixedWidthDataFormat;
@@ -67,7 +68,7 @@ import org.apache.camel.spi.RouteContext;
/**
* Converts the message data received from the wire into a format that Apache Camel processors can consume
*
- * @version
+ * @version
*/
@Metadata(label = "eip,transformation")
@XmlRootElement(name = "unmarshal")
@@ -102,6 +103,7 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
@XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
+ @XmlElement(required = false, name = "tarfile", type = TarFileDataFormat.class),
@XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
@XmlElement(required = false, name = "univocity-csv", type = UniVocityCsvDataFormat.class),
@XmlElement(required = false, name = "univocity-fixed", type = UniVocityFixedWidthDataFormat.class),
@@ -135,7 +137,7 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
public String toString() {
return "Unmarshal[" + description() + "]";
}
-
+
protected String description() {
if (dataFormatType != null) {
return dataFormatType.toString();
http://git-wip-us.apache.org/repos/asf/camel/blob/27e03299/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
----------------------------------------------------------------------
diff --git a/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index b/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
index 74a63d7..a8b348c 100644
--- a/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
+++ b/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
@@ -41,6 +41,7 @@ SerializationDataFormat
SoapJaxbDataFormat
StringDataFormat
SyslogDataFormat
+TarFileDataFormat
TidyMarkupDataFormat
UniVocityCsvDataFormat
UniVocityFixedWidthDataFormat
http://git-wip-us.apache.org/repos/asf/camel/blob/27e03299/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
new file mode 100644
index 0000000..90f3e02
--- /dev/null
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
@@ -0,0 +1,168 @@
+/**
+ * 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.dataformat.tarfile;
+
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.NotifyBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Collections.singletonList;
+import static org.apache.camel.Exchange.FILE_NAME;
+import static org.apache.camel.dataformat.tarfile.TarUtils.TEXT;
+import static org.apache.camel.dataformat.tarfile.TarUtils.getBytes;
+import static org.apache.camel.dataformat.tarfile.TarUtils.getTaredText;
+
+public class SpringTarFileDataFormatTest extends CamelSpringTestSupport {
+ private static final File TEST_DIR = new File("target/springtar");
+
+ @Test
+ public void testTarWithoutFileName() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:tar");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:tar", TEXT);
+
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getReceivedExchanges().get(0);
+ assertEquals(exchange.getIn().getMessageId() + ".tar", exchange.getIn().getHeader(FILE_NAME));
+ assertArrayEquals(getTaredText(exchange.getIn().getMessageId()), (byte[]) exchange.getIn().getBody());
+ }
+
+
+ @Test
+ public void testTarWithFileName() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:tar");
+ mock.expectedMessageCount(1);
+ mock.expectedHeaderReceived(FILE_NAME, "poem.txt.tar");
+
+ template.sendBodyAndHeader("direct:tar", TEXT, FILE_NAME, "poem.txt");
+
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getReceivedExchanges().get(0);
+ assertArrayEquals(getTaredText("poem.txt"), (byte[]) exchange.getIn().getBody());
+ }
+
+ @Test
+ public void testUntar() throws Exception {
+ getMockEndpoint("mock:untar").expectedBodiesReceived(TEXT);
+ getMockEndpoint("mock:untar").expectedHeaderReceived(FILE_NAME, "file");
+
+ template.sendBody("direct:untar", getTaredText("file"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testTarAndUntar() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:tarAndUntar");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:tarAndUntar", TEXT);
+
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getReceivedExchanges().get(0);
+ assertEquals(exchange.getIn().getMessageId(), exchange.getIn().getHeader(FILE_NAME));
+ assertArrayEquals(TEXT.getBytes(UTF_8), (byte[]) exchange.getIn().getBody());
+ }
+
+ @Test
+ public void testTarToFileWithoutFileName() throws Exception {
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
+ String[] files = TEST_DIR.list();
+ assertTrue(files == null || files.length == 0);
+
+ MockEndpoint mock = getMockEndpoint("mock:intercepted");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:tarToFile", TEXT);
+
+ assertMockEndpointsSatisfied();
+
+ // use builder to ensure the exchange is fully done before we check for file exists
+ assertTrue(notify.matches(5, TimeUnit.SECONDS));
+
+ Exchange exchange = mock.getReceivedExchanges().get(0);
+ File file = new File(TEST_DIR, exchange.getIn().getMessageId() + ".tar");
+ assertTrue(file.exists());
+ assertArrayEquals(getTaredText(exchange.getIn().getMessageId()), getBytes(file));
+ }
+
+ @Test
+ public void testTarToFileWithFileName() throws Exception {
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
+ MockEndpoint mock = getMockEndpoint("mock:tarToFile");
+ mock.expectedMessageCount(1);
+
+ File file = new File(TEST_DIR, "poem.txt.tar");
+ assertFalse(file.exists());
+
+ template.sendBodyAndHeader("direct:tarToFile", TEXT, FILE_NAME, "poem.txt");
+
+ // just make sure the file is created
+ mock.assertIsSatisfied();
+
+ // use builder to ensure the exchange is fully done before we check for file exists
+ assertTrue(notify.matches(5, TimeUnit.SECONDS));
+
+ assertTrue(file.exists());
+ assertArrayEquals(getTaredText("poem.txt"), getBytes(file));
+ }
+
+ @Test
+ public void testDslTar() throws Exception {
+ getMockEndpoint("mock:dslTar").expectedBodiesReceived(singletonList(getTaredText("poem.txt")));
+ getMockEndpoint("mock:dslTar").expectedHeaderReceived(FILE_NAME, "poem.txt.tar");
+
+ template.sendBodyAndHeader("direct:dslTar", TEXT, FILE_NAME, "poem.txt");
+
+ assertMockEndpointsSatisfied();
+ }
+
+
+ @Test
+ public void testDslUntar() throws Exception {
+ getMockEndpoint("mock:dslUntar").expectedBodiesReceived(TEXT);
+ getMockEndpoint("mock:dslUntar").expectedHeaderReceived(FILE_NAME, "test.txt");
+
+ template.sendBody("direct:dslUntar", getTaredText("test.txt"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ public void setUp() throws Exception {
+ deleteDirectory(TEST_DIR);
+ super.setUp();
+ }
+
+ @Override
+ protected ClassPathXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.xml");
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/27e03299/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
index fa9bba8..1ae7a58 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
@@ -16,11 +16,7 @@
*/
package org.apache.camel.dataformat.tarfile;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
@@ -28,30 +24,18 @@ import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.junit.Test;
import static org.apache.camel.Exchange.FILE_NAME;
+import static org.apache.camel.dataformat.tarfile.TarUtils.*;
+import static org.apache.camel.dataformat.tarfile.TarUtils.getTaredText;
/**
* Unit tests for {@link TarFileDataFormat}.
*/
public class TarFileDataFormatTest extends CamelTestSupport {
- private static final String TEXT = "The Masque of Queen Bersabe (excerpt) \n"
- + "by: Algernon Charles Swinburne \n\n"
- + "My lips kissed dumb the word of Ah \n"
- + "Sighed on strange lips grown sick thereby. \n"
- + "God wrought to me my royal bed; \n"
- + "The inner work thereof was red, \n"
- + "The outer work was ivory. \n"
- + "My mouth's heat was the heat of flame \n"
- + "For lust towards the kings that came \n"
- + "With horsemen riding royally.";
-
private static final File TEST_DIR = new File("target/tar");
@Test
@@ -195,31 +179,4 @@ public class TarFileDataFormatTest extends CamelTestSupport {
}
};
}
-
- private static byte[] getTaredText(String entryName) throws IOException {
- ByteArrayInputStream bais = new ByteArrayInputStream(TEXT.getBytes("UTF-8"));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- TarArchiveOutputStream tos = new TarArchiveOutputStream(baos);
- try {
- TarArchiveEntry entry = new TarArchiveEntry(entryName);
- entry.setSize(bais.available());
- tos.putArchiveEntry(entry);
- IOHelper.copy(bais, tos);
- } finally {
- tos.closeArchiveEntry();
- IOHelper.close(bais, tos);
- }
- return baos.toByteArray();
- }
-
- private static byte[] getBytes(File file) throws IOException {
- FileInputStream fis = new FileInputStream(file);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try {
- IOHelper.copy(fis, baos);
- } finally {
- IOHelper.close(fis, baos);
- }
- return baos.toByteArray();
- }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/27e03299/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
new file mode 100644
index 0000000..aded0f5
--- /dev/null
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
@@ -0,0 +1,71 @@
+/**
+ * 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.dataformat.tarfile;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import org.apache.camel.util.IOHelper;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+
+final class TarUtils {
+ static final String TEXT = "The Masque of Queen Bersabe (excerpt) \n"
+ + "by: Algernon Charles Swinburne \n\n"
+ + "My lips kissed dumb the word of Ah \n"
+ + "Sighed on strange lips grown sick thereby. \n"
+ + "God wrought to me my royal bed; \n"
+ + "The inner work thereof was red, \n"
+ + "The outer work was ivory. \n"
+ + "My mouth's heat was the heat of flame \n"
+ + "For lust towards the kings that came \n"
+ + "With horsemen riding royally.";
+
+ static byte[] getTaredText(String entryName) throws IOException {
+ ByteArrayInputStream bais = new ByteArrayInputStream(TEXT.getBytes("UTF-8"));
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ TarArchiveOutputStream tos = new TarArchiveOutputStream(baos);
+ try {
+ TarArchiveEntry entry = new TarArchiveEntry(entryName);
+ entry.setSize(bais.available());
+ tos.putArchiveEntry(entry);
+ IOHelper.copy(bais, tos);
+ } finally {
+ tos.closeArchiveEntry();
+ IOHelper.close(bais, tos);
+ }
+ return baos.toByteArray();
+ }
+
+ static byte[] getBytes(File file) throws IOException {
+ FileInputStream fis = new FileInputStream(file);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try {
+ IOHelper.copy(fis, baos);
+ } finally {
+ IOHelper.close(fis, baos);
+ }
+ return baos.toByteArray();
+ }
+
+ private TarUtils() {
+ // Prevent instantiation
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/27e03299/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.xml b/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.xml
new file mode 100644
index 0000000..0908b6f
--- /dev/null
+++ b/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.xml
@@ -0,0 +1,82 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <interceptSendToEndpoint uri="file:*">
+ <to uri="mock:intercepted"/>
+ </interceptSendToEndpoint>
+
+ <route>
+ <from uri="direct:tar"/>
+ <marshal>
+ <tarfile/>
+ </marshal>
+ <to uri="mock:tar"/>
+ </route>
+
+ <route>
+ <from uri="direct:untar"/>
+ <unmarshal>
+ <tarfile />
+ </unmarshal>
+ <to uri="mock:untar" />
+ </route>
+
+ <route>
+ <from uri="direct:tarAndUntar" />
+ <marshal>
+ <tarfile/>
+ </marshal>
+ <unmarshal>
+ <tarfile/>
+ </unmarshal>
+ <to uri="mock:tarAndUntar"/>
+ </route>
+
+ <route>
+ <from uri="direct:tarToFile"/>
+ <marshal>
+ <tarfile />
+ </marshal>
+ <to uri="file:target/springtar"/>
+ <to uri="mock:tarToFile" />
+ </route>
+
+ <route>
+ <from uri="direct:dslTar"/>
+ <marshal>
+ <tarfile/>
+ </marshal>
+ <to uri="mock:dslTar"/>
+ </route>
+
+ <route>
+ <from uri="direct:dslUntar"/>
+ <unmarshal>
+ <tarfile/>
+ </unmarshal>
+ <to uri="mock:dslUntar"/>
+ </route>
+ </camelContext>
+</beans>
[3/8] camel git commit: CAMEL-9915 Add TarFileDataFormat also in
DataFormatsDefinition
Posted by da...@apache.org.
CAMEL-9915 Add TarFileDataFormat also in DataFormatsDefinition
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b0e82406
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b0e82406
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b0e82406
Branch: refs/heads/master
Commit: b0e82406fe1c99a21c41fa030afead357bcf54ef
Parents: fd0eee4
Author: Antoine DESSAIGNE <an...@gmail.com>
Authored: Tue Apr 26 17:27:10 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 26 19:13:12 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/model/dataformat/DataFormatsDefinition.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b0e82406/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
index 880891f..901130e 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
@@ -67,6 +67,7 @@ public class DataFormatsDefinition {
@XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
+ @XmlElement(required = false, name = "tarfile", type = TarFileDataFormat.class),
@XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
@XmlElement(required = false, name = "univocity-csv", type = UniVocityCsvDataFormat.class),
@XmlElement(required = false, name = "univocity-fixed", type = UniVocityFixedWidthDataFormat.class),
[2/8] camel git commit: CAMEL-9683: Started on camel-ribbon
Posted by da...@apache.org.
CAMEL-9683: Started on camel-ribbon
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/867eb874
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/867eb874
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/867eb874
Branch: refs/heads/kube-lb
Commit: 867eb8742b4e7708fce46e2e80e340fc7f6f3dbc
Parents: 3c1d11d
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 26 16:41:56 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 26 16:41:56 2016 +0200
----------------------------------------------------------------------
...KubernetesServiceCallServerListStrategy.java | 1 +
components/camel-ribbon/pom.xml | 84 ++++++++
.../camel/component/ribbon/RibbonServer.java | 32 +++
.../RibbonServiceCallServerListStrategy.java | 85 ++++++++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../ribbon/RibbonServiceCallRouteTest.java | 58 ++++++
.../src/test/resources/log4j.properties | 37 ++++
components/pom.xml | 1 +
parent/pom.xml | 1 +
10 files changed, 513 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/867eb874/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesServiceCallServerListStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesServiceCallServerListStrategy.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesServiceCallServerListStrategy.java
index 94fdc43..7742c90 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesServiceCallServerListStrategy.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesServiceCallServerListStrategy.java
@@ -1,3 +1,4 @@
+
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
http://git-wip-us.apache.org/repos/asf/camel/blob/867eb874/components/camel-ribbon/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-ribbon/pom.xml b/components/camel-ribbon/pom.xml
new file mode 100644
index 0000000..c76b414
--- /dev/null
+++ b/components/camel-ribbon/pom.xml
@@ -0,0 +1,84 @@
+<?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.18-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-ribbon</artifactId>
+ <packaging>jar</packaging>
+ <name>Camel :: Ribbon</name>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.ribbon.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.netflix.ribbon</groupId>
+ <artifactId>ribbon-core</artifactId>
+ <version>${ribbon-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.netflix.ribbon</groupId>
+ <artifactId>ribbon-loadbalancer</artifactId>
+ <version>${ribbon-version}</version>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-kubernetes</artifactId>
+ <scope>test</scope>
+ </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>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/867eb874/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/RibbonServer.java
----------------------------------------------------------------------
diff --git a/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/RibbonServer.java b/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/RibbonServer.java
new file mode 100644
index 0000000..0099975
--- /dev/null
+++ b/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/RibbonServer.java
@@ -0,0 +1,32 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.ribbon;
+
+import com.netflix.loadbalancer.Server;
+import org.apache.camel.spi.ServiceCallServer;
+
+public class RibbonServer extends Server implements ServiceCallServer {
+
+ public RibbonServer(String host, int port) {
+ super(host, port);
+ }
+
+ @Override
+ public String getIp() {
+ return getHost();
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/867eb874/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/RibbonServiceCallServerListStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/RibbonServiceCallServerListStrategy.java b/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/RibbonServiceCallServerListStrategy.java
new file mode 100644
index 0000000..06ebb16
--- /dev/null
+++ b/components/camel-ribbon/src/main/java/org/apache/camel/component/ribbon/RibbonServiceCallServerListStrategy.java
@@ -0,0 +1,85 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.ribbon;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.AbstractServerList;
+import com.netflix.loadbalancer.ServerList;
+import org.apache.camel.spi.ServiceCallServer;
+import org.apache.camel.spi.ServiceCallServerListStrategy;
+
+/**
+ * To let an existing {@link ServiceCallServerListStrategy} by managed by Ribbon.
+ */
+public class RibbonServiceCallServerListStrategy extends AbstractServerList<RibbonServer> implements ServerList<RibbonServer> {
+
+ // TODO: a plain ribbon server list without plugin for kube for now
+ // and some unit tests with static server list etc
+ // https://github.com/Netflix/ribbon/wiki/Working-with-load-balancers
+ // https://github.com/Netflix/ribbon/wiki/Getting-Started
+ // then later with a kube facade so the servers are looked up in k8s
+
+ private IClientConfig clientConfig;
+ private final ServiceCallServerListStrategy delegate;
+
+ /**
+ * Lets ribbon manage the {@link ServiceCallServerListStrategy}.
+ */
+ public RibbonServiceCallServerListStrategy(ServiceCallServerListStrategy delegate) {
+ this.delegate = delegate;
+ }
+
+ @Override
+ public void initWithNiwsConfig(IClientConfig clientConfig) {
+ this.clientConfig = clientConfig;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public List<RibbonServer> getInitialListOfServers() {
+ Collection<ServiceCallServer> servers = delegate.getInitialListOfServers();
+ if (servers == null || servers.isEmpty()) {
+ return Collections.EMPTY_LIST;
+ }
+ List<RibbonServer> answer = new ArrayList<>(servers.size());
+ for (ServiceCallServer server : servers) {
+ RibbonServer ribbon = new RibbonServer(server.getIp(), server.getPort());
+ answer.add(ribbon);
+ }
+ return answer;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public List<RibbonServer> getUpdatedListOfServers() {
+ Collection<ServiceCallServer> servers = delegate.getUpdatedListOfServers();
+ if (servers == null || servers.isEmpty()) {
+ return Collections.EMPTY_LIST;
+ }
+ List<RibbonServer> answer = new ArrayList<>(servers.size());
+ for (ServiceCallServer server : servers) {
+ RibbonServer ribbon = new RibbonServer(server.getIp(), server.getPort());
+ answer.add(ribbon);
+ }
+ return answer;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/867eb874/components/camel-ribbon/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/components/camel-ribbon/src/main/resources/META-INF/LICENSE.txt b/components/camel-ribbon/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/components/camel-ribbon/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/867eb874/components/camel-ribbon/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-ribbon/src/main/resources/META-INF/NOTICE.txt b/components/camel-ribbon/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/components/camel-ribbon/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/867eb874/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/RibbonServiceCallRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/RibbonServiceCallRouteTest.java b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/RibbonServiceCallRouteTest.java
new file mode 100644
index 0000000..7321324
--- /dev/null
+++ b/components/camel-ribbon/src/test/java/org/apache/camel/component/ribbon/RibbonServiceCallRouteTest.java
@@ -0,0 +1,58 @@
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.ribbon;
+
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.ServiceCallConfigurationDefinition;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore("Manual test")
+public class RibbonServiceCallRouteTest extends CamelTestSupport {
+
+ @Test
+ public void testServiceCall() throws Exception {
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RoutesBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ ServiceCallConfigurationDefinition config = new ServiceCallConfigurationDefinition();
+ config.setMasterUrl("https://fabric8-master.vagrant.f8:8443");
+ config.setUsername("admin");
+ config.setPassword("admin");
+ config.setNamespace("default");
+ // lets use the built-in round robin (random is default)
+ config.setLoadBalancerRef("roundrobin");
+
+ from("direct:start")
+ .serviceCall("cdi-camel-jetty", null, config)
+ .to("mock:result");
+ }
+ };
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/camel/blob/867eb874/components/camel-ribbon/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-ribbon/src/test/resources/log4j.properties b/components/camel-ribbon/src/test/resources/log4j.properties
new file mode 100644
index 0000000..f138e1d
--- /dev/null
+++ b/components/camel-ribbon/src/test/resources/log4j.properties
@@ -0,0 +1,37 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used
+#
+log4j.rootLogger=INFO, file
+
+log4j.logger.org.apache.camel.component.kubernetes=DEBUG
+log4j.logger.org.apache.camel.component.ribbon=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=%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-ribbon-test.log
+log4j.appender.file.append=true
+
http://git-wip-us.apache.org/repos/asf/camel/blob/867eb874/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index ec1f230..f258b83 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -201,6 +201,7 @@
<module>camel-quickfix</module>
<module>camel-rabbitmq</module>
<module>camel-restlet</module>
+ <module>camel-ribbon</module>
<module>camel-rmi</module>
<module>camel-routebox</module>
<module>camel-rss</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/867eb874/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b9b2604..4a55ba0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -473,6 +473,7 @@
<restlet-joda-time-version>2.3</restlet-joda-time-version>
<rhino-bundle-version>1.7R2_3</rhino-bundle-version>
<rhino-version>1.7R2</rhino-version>
+ <ribbon-version>2.2.0</ribbon-version>
<rome-bundle-version>1.0_3</rome-bundle-version>
<rome-version>1.0</rome-version>
<rxjava-version>1.1.3</rxjava-version>
[4/8] camel git commit: Allow to use tarfile data format in XML
marshal/unmarshal
Posted by da...@apache.org.
Allow to use tarfile data format in XML marshal/unmarshal
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd0eee43
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd0eee43
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd0eee43
Branch: refs/heads/master
Commit: fd0eee438a1182204a8ce2a03b17620d95a95b8a
Parents: 40f3870
Author: Antoine DESSAIGNE <an...@gmail.com>
Authored: Tue Apr 26 17:11:52 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 26 19:13:12 2016 +0200
----------------------------------------------------------------------
.../apache/camel/model/MarshalDefinition.java | 8 +-
.../apache/camel/model/UnmarshalDefinition.java | 6 +-
.../apache/camel/model/dataformat/jaxb.index | 1 +
.../tarfile/SpringTarFileDataFormatTest.java | 168 +++++++++++++++++++
.../tarfile/TarFileDataFormatTest.java | 47 +-----
.../camel/dataformat/tarfile/TarUtils.java | 71 ++++++++
.../tarfile/SpringTarFileDataFormatTest.xml | 82 +++++++++
7 files changed, 333 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fd0eee43/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
index 706f6e3..be08866 100644
--- a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
@@ -48,6 +48,7 @@ import org.apache.camel.model.dataformat.SerializationDataFormat;
import org.apache.camel.model.dataformat.SoapJaxbDataFormat;
import org.apache.camel.model.dataformat.StringDataFormat;
import org.apache.camel.model.dataformat.SyslogDataFormat;
+import org.apache.camel.model.dataformat.TarFileDataFormat;
import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
import org.apache.camel.model.dataformat.UniVocityCsvDataFormat;
import org.apache.camel.model.dataformat.UniVocityFixedWidthDataFormat;
@@ -67,7 +68,7 @@ import org.apache.camel.spi.RouteContext;
/**
* Marshals data into a specified format for transmission over a transport or component
*
- * @version
+ * @version
*/
@Metadata(label = "eip,transformation")
@XmlRootElement(name = "marshal")
@@ -102,6 +103,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> {
@XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
+ @XmlElement(required = false, name = "tarfile", type = TarFileDataFormat.class),
@XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
@XmlElement(required = false, name = "univocity-csv", type = UniVocityCsvDataFormat.class),
@XmlElement(required = false, name = "univocity-fixed", type = UniVocityFixedWidthDataFormat.class),
@@ -135,7 +137,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> {
public String toString() {
return "Marshal[" + description() + "]";
}
-
+
protected String description() {
return dataFormatType != null ? dataFormatType.toString() : "ref:" + ref;
}
@@ -144,7 +146,7 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> {
public String getLabel() {
return "marshal[" + description() + "]";
}
-
+
public String getRef() {
return ref;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fd0eee43/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
index 9b95f23..c4af19b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
@@ -48,6 +48,7 @@ import org.apache.camel.model.dataformat.SerializationDataFormat;
import org.apache.camel.model.dataformat.SoapJaxbDataFormat;
import org.apache.camel.model.dataformat.StringDataFormat;
import org.apache.camel.model.dataformat.SyslogDataFormat;
+import org.apache.camel.model.dataformat.TarFileDataFormat;
import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
import org.apache.camel.model.dataformat.UniVocityCsvDataFormat;
import org.apache.camel.model.dataformat.UniVocityFixedWidthDataFormat;
@@ -67,7 +68,7 @@ import org.apache.camel.spi.RouteContext;
/**
* Converts the message data received from the wire into a format that Apache Camel processors can consume
*
- * @version
+ * @version
*/
@Metadata(label = "eip,transformation")
@XmlRootElement(name = "unmarshal")
@@ -102,6 +103,7 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
@XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
@XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
+ @XmlElement(required = false, name = "tarfile", type = TarFileDataFormat.class),
@XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
@XmlElement(required = false, name = "univocity-csv", type = UniVocityCsvDataFormat.class),
@XmlElement(required = false, name = "univocity-fixed", type = UniVocityFixedWidthDataFormat.class),
@@ -135,7 +137,7 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition>
public String toString() {
return "Unmarshal[" + description() + "]";
}
-
+
protected String description() {
if (dataFormatType != null) {
return dataFormatType.toString();
http://git-wip-us.apache.org/repos/asf/camel/blob/fd0eee43/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
----------------------------------------------------------------------
diff --git a/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index b/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
index 74a63d7..a8b348c 100644
--- a/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
+++ b/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
@@ -41,6 +41,7 @@ SerializationDataFormat
SoapJaxbDataFormat
StringDataFormat
SyslogDataFormat
+TarFileDataFormat
TidyMarkupDataFormat
UniVocityCsvDataFormat
UniVocityFixedWidthDataFormat
http://git-wip-us.apache.org/repos/asf/camel/blob/fd0eee43/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
new file mode 100644
index 0000000..90f3e02
--- /dev/null
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.java
@@ -0,0 +1,168 @@
+/**
+ * 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.dataformat.tarfile;
+
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.NotifyBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.spring.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Collections.singletonList;
+import static org.apache.camel.Exchange.FILE_NAME;
+import static org.apache.camel.dataformat.tarfile.TarUtils.TEXT;
+import static org.apache.camel.dataformat.tarfile.TarUtils.getBytes;
+import static org.apache.camel.dataformat.tarfile.TarUtils.getTaredText;
+
+public class SpringTarFileDataFormatTest extends CamelSpringTestSupport {
+ private static final File TEST_DIR = new File("target/springtar");
+
+ @Test
+ public void testTarWithoutFileName() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:tar");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:tar", TEXT);
+
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getReceivedExchanges().get(0);
+ assertEquals(exchange.getIn().getMessageId() + ".tar", exchange.getIn().getHeader(FILE_NAME));
+ assertArrayEquals(getTaredText(exchange.getIn().getMessageId()), (byte[]) exchange.getIn().getBody());
+ }
+
+
+ @Test
+ public void testTarWithFileName() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:tar");
+ mock.expectedMessageCount(1);
+ mock.expectedHeaderReceived(FILE_NAME, "poem.txt.tar");
+
+ template.sendBodyAndHeader("direct:tar", TEXT, FILE_NAME, "poem.txt");
+
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getReceivedExchanges().get(0);
+ assertArrayEquals(getTaredText("poem.txt"), (byte[]) exchange.getIn().getBody());
+ }
+
+ @Test
+ public void testUntar() throws Exception {
+ getMockEndpoint("mock:untar").expectedBodiesReceived(TEXT);
+ getMockEndpoint("mock:untar").expectedHeaderReceived(FILE_NAME, "file");
+
+ template.sendBody("direct:untar", getTaredText("file"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testTarAndUntar() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:tarAndUntar");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:tarAndUntar", TEXT);
+
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getReceivedExchanges().get(0);
+ assertEquals(exchange.getIn().getMessageId(), exchange.getIn().getHeader(FILE_NAME));
+ assertArrayEquals(TEXT.getBytes(UTF_8), (byte[]) exchange.getIn().getBody());
+ }
+
+ @Test
+ public void testTarToFileWithoutFileName() throws Exception {
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
+ String[] files = TEST_DIR.list();
+ assertTrue(files == null || files.length == 0);
+
+ MockEndpoint mock = getMockEndpoint("mock:intercepted");
+ mock.expectedMessageCount(1);
+
+ template.sendBody("direct:tarToFile", TEXT);
+
+ assertMockEndpointsSatisfied();
+
+ // use builder to ensure the exchange is fully done before we check for file exists
+ assertTrue(notify.matches(5, TimeUnit.SECONDS));
+
+ Exchange exchange = mock.getReceivedExchanges().get(0);
+ File file = new File(TEST_DIR, exchange.getIn().getMessageId() + ".tar");
+ assertTrue(file.exists());
+ assertArrayEquals(getTaredText(exchange.getIn().getMessageId()), getBytes(file));
+ }
+
+ @Test
+ public void testTarToFileWithFileName() throws Exception {
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+
+ MockEndpoint mock = getMockEndpoint("mock:tarToFile");
+ mock.expectedMessageCount(1);
+
+ File file = new File(TEST_DIR, "poem.txt.tar");
+ assertFalse(file.exists());
+
+ template.sendBodyAndHeader("direct:tarToFile", TEXT, FILE_NAME, "poem.txt");
+
+ // just make sure the file is created
+ mock.assertIsSatisfied();
+
+ // use builder to ensure the exchange is fully done before we check for file exists
+ assertTrue(notify.matches(5, TimeUnit.SECONDS));
+
+ assertTrue(file.exists());
+ assertArrayEquals(getTaredText("poem.txt"), getBytes(file));
+ }
+
+ @Test
+ public void testDslTar() throws Exception {
+ getMockEndpoint("mock:dslTar").expectedBodiesReceived(singletonList(getTaredText("poem.txt")));
+ getMockEndpoint("mock:dslTar").expectedHeaderReceived(FILE_NAME, "poem.txt.tar");
+
+ template.sendBodyAndHeader("direct:dslTar", TEXT, FILE_NAME, "poem.txt");
+
+ assertMockEndpointsSatisfied();
+ }
+
+
+ @Test
+ public void testDslUntar() throws Exception {
+ getMockEndpoint("mock:dslUntar").expectedBodiesReceived(TEXT);
+ getMockEndpoint("mock:dslUntar").expectedHeaderReceived(FILE_NAME, "test.txt");
+
+ template.sendBody("direct:dslUntar", getTaredText("test.txt"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ public void setUp() throws Exception {
+ deleteDirectory(TEST_DIR);
+ super.setUp();
+ }
+
+ @Override
+ protected ClassPathXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.xml");
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/fd0eee43/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
index fa9bba8..1ae7a58 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarFileDataFormatTest.java
@@ -16,11 +16,7 @@
*/
package org.apache.camel.dataformat.tarfile;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.util.concurrent.TimeUnit;
import org.apache.camel.Exchange;
@@ -28,30 +24,18 @@ import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
-import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
-import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.junit.Test;
import static org.apache.camel.Exchange.FILE_NAME;
+import static org.apache.camel.dataformat.tarfile.TarUtils.*;
+import static org.apache.camel.dataformat.tarfile.TarUtils.getTaredText;
/**
* Unit tests for {@link TarFileDataFormat}.
*/
public class TarFileDataFormatTest extends CamelTestSupport {
- private static final String TEXT = "The Masque of Queen Bersabe (excerpt) \n"
- + "by: Algernon Charles Swinburne \n\n"
- + "My lips kissed dumb the word of Ah \n"
- + "Sighed on strange lips grown sick thereby. \n"
- + "God wrought to me my royal bed; \n"
- + "The inner work thereof was red, \n"
- + "The outer work was ivory. \n"
- + "My mouth's heat was the heat of flame \n"
- + "For lust towards the kings that came \n"
- + "With horsemen riding royally.";
-
private static final File TEST_DIR = new File("target/tar");
@Test
@@ -195,31 +179,4 @@ public class TarFileDataFormatTest extends CamelTestSupport {
}
};
}
-
- private static byte[] getTaredText(String entryName) throws IOException {
- ByteArrayInputStream bais = new ByteArrayInputStream(TEXT.getBytes("UTF-8"));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- TarArchiveOutputStream tos = new TarArchiveOutputStream(baos);
- try {
- TarArchiveEntry entry = new TarArchiveEntry(entryName);
- entry.setSize(bais.available());
- tos.putArchiveEntry(entry);
- IOHelper.copy(bais, tos);
- } finally {
- tos.closeArchiveEntry();
- IOHelper.close(bais, tos);
- }
- return baos.toByteArray();
- }
-
- private static byte[] getBytes(File file) throws IOException {
- FileInputStream fis = new FileInputStream(file);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try {
- IOHelper.copy(fis, baos);
- } finally {
- IOHelper.close(fis, baos);
- }
- return baos.toByteArray();
- }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fd0eee43/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
new file mode 100644
index 0000000..aded0f5
--- /dev/null
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/dataformat/tarfile/TarUtils.java
@@ -0,0 +1,71 @@
+/**
+ * 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.dataformat.tarfile;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import org.apache.camel.util.IOHelper;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+
+final class TarUtils {
+ static final String TEXT = "The Masque of Queen Bersabe (excerpt) \n"
+ + "by: Algernon Charles Swinburne \n\n"
+ + "My lips kissed dumb the word of Ah \n"
+ + "Sighed on strange lips grown sick thereby. \n"
+ + "God wrought to me my royal bed; \n"
+ + "The inner work thereof was red, \n"
+ + "The outer work was ivory. \n"
+ + "My mouth's heat was the heat of flame \n"
+ + "For lust towards the kings that came \n"
+ + "With horsemen riding royally.";
+
+ static byte[] getTaredText(String entryName) throws IOException {
+ ByteArrayInputStream bais = new ByteArrayInputStream(TEXT.getBytes("UTF-8"));
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ TarArchiveOutputStream tos = new TarArchiveOutputStream(baos);
+ try {
+ TarArchiveEntry entry = new TarArchiveEntry(entryName);
+ entry.setSize(bais.available());
+ tos.putArchiveEntry(entry);
+ IOHelper.copy(bais, tos);
+ } finally {
+ tos.closeArchiveEntry();
+ IOHelper.close(bais, tos);
+ }
+ return baos.toByteArray();
+ }
+
+ static byte[] getBytes(File file) throws IOException {
+ FileInputStream fis = new FileInputStream(file);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try {
+ IOHelper.copy(fis, baos);
+ } finally {
+ IOHelper.close(fis, baos);
+ }
+ return baos.toByteArray();
+ }
+
+ private TarUtils() {
+ // Prevent instantiation
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/fd0eee43/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.xml b/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.xml
new file mode 100644
index 0000000..0908b6f
--- /dev/null
+++ b/components/camel-tarfile/src/test/resources/org/apache/camel/dataformat/tarfile/SpringTarFileDataFormatTest.xml
@@ -0,0 +1,82 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <camelContext xmlns="http://camel.apache.org/schema/spring">
+ <interceptSendToEndpoint uri="file:*">
+ <to uri="mock:intercepted"/>
+ </interceptSendToEndpoint>
+
+ <route>
+ <from uri="direct:tar"/>
+ <marshal>
+ <tarfile/>
+ </marshal>
+ <to uri="mock:tar"/>
+ </route>
+
+ <route>
+ <from uri="direct:untar"/>
+ <unmarshal>
+ <tarfile />
+ </unmarshal>
+ <to uri="mock:untar" />
+ </route>
+
+ <route>
+ <from uri="direct:tarAndUntar" />
+ <marshal>
+ <tarfile/>
+ </marshal>
+ <unmarshal>
+ <tarfile/>
+ </unmarshal>
+ <to uri="mock:tarAndUntar"/>
+ </route>
+
+ <route>
+ <from uri="direct:tarToFile"/>
+ <marshal>
+ <tarfile />
+ </marshal>
+ <to uri="file:target/springtar"/>
+ <to uri="mock:tarToFile" />
+ </route>
+
+ <route>
+ <from uri="direct:dslTar"/>
+ <marshal>
+ <tarfile/>
+ </marshal>
+ <to uri="mock:dslTar"/>
+ </route>
+
+ <route>
+ <from uri="direct:dslUntar"/>
+ <unmarshal>
+ <tarfile/>
+ </unmarshal>
+ <to uri="mock:dslUntar"/>
+ </route>
+ </camelContext>
+</beans>