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/12/23 10:03:36 UTC
[1/6] camel git commit: Dependency upgrades
Repository: camel
Updated Branches:
refs/heads/master 7ef99c17d -> f54a309d1
Dependency upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b1a930b2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b1a930b2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b1a930b2
Branch: refs/heads/master
Commit: b1a930b2dd7c5d1cfd4a55c30ffe5f057aab3491
Parents: 7ef99c1
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 23 09:54:00 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 23 09:54:00 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b1a930b2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f3eba30..fa17af7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -35,7 +35,7 @@
<!-- dependency versions -->
<abdera-version>1.1.3</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
- <activemq-version>5.14.2</activemq-version>
+ <activemq-version>5.14.3</activemq-version>
<aether-version>1.0.2.v20150114</aether-version>
<ahc-version>2.0.24</ahc-version>
<ant-bundle-version>1.7.0_6</ant-bundle-version>
@@ -395,7 +395,7 @@
<log4j-version>1.2.17</log4j-version>
<log4j2-version>2.7</log4j2-version>
<log4j2-25-version>2.5</log4j2-25-version>
- <logback-version>1.1.7</logback-version>
+ <logback-version>1.1.8</logback-version>
<lucene3-bundle-version>3.6.0_1</lucene3-bundle-version>
<lucene3-version>3.6.0</lucene3-version>
<lucene-bundle-version>5.5.2_1</lucene-bundle-version>
@@ -535,8 +535,8 @@
<shrinkwrap-resolver-version>2.2.4</shrinkwrap-resolver-version>
<shrinkwrap-version>1.2.3</shrinkwrap-version>
<sip-api-version>1.1</sip-api-version>
- <slf4j-api-version>1.7.21</slf4j-api-version>
- <slf4j-version>1.7.21</slf4j-version>
+ <slf4j-api-version>1.7.22</slf4j-api-version>
+ <slf4j-version>1.7.22</slf4j-version>
<smack-version>4.0.7</smack-version>
<snakeyaml-version>1.17</snakeyaml-version>
<snappy-version>1.1.2.6</snappy-version>
@@ -551,13 +551,13 @@
<splunk-version>1.5.0.0_1</splunk-version>
<spring-batch-version>3.0.7.RELEASE</spring-batch-version>
<spring-batch-bundle-version>3.0.7.RELEASE_1</spring-batch-bundle-version>
- <spring-boot-version>1.4.2.RELEASE</spring-boot-version>
+ <spring-boot-version>1.4.3.RELEASE</spring-boot-version>
<spring-cloud-commons-version>1.1.6.RELEASE</spring-cloud-commons-version>
<spring-cloud-netflix-version>1.2.3.RELEASE</spring-cloud-netflix-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spring-data-commons-version>1.11.6.RELEASE</spring-data-commons-version>
<spring-data-redis-version>1.7.5.RELEASE</spring-data-redis-version>
- <spring-integration-version>4.3.5.RELEASE</spring-integration-version>
+ <spring-integration-version>4.3.6.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-ldap-version>2.2.0.RELEASE</spring-ldap-version>
<spring-ldap-bundle-version>2.2.0.RELEASE_1</spring-ldap-bundle-version>
@@ -579,7 +579,7 @@
<spring43-version>4.3.5.RELEASE</spring43-version>
<spring4-version>4.3.5.RELEASE</spring4-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
- <spring-security-version>4.1.3.RELEASE</spring-security-version>
+ <spring-security-version>4.1.4.RELEASE</spring-security-version>
<spring-security-bundle-version>4.1.3.RELEASE_1</spring-security-bundle-version>
<spring-ws-bundle-version>2.3.0.RELEASE_1</spring-ws-bundle-version>
<spring-ws-version>2.3.0.RELEASE</spring-ws-version>
[3/6] camel git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e7198dd9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e7198dd9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e7198dd9
Branch: refs/heads/master
Commit: e7198dd985ba9803480d5b234427dd577b26ea2d
Parents: 9a932b3
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 23 10:17:25 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 23 10:17:25 2016 +0100
----------------------------------------------------------------------
.../org/apache/camel/management/ManagedCamelContextTest.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e7198dd9/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
index 00ffc66..3688eb9 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
@@ -390,10 +390,7 @@ public class ManagedCamelContextTest extends ManagementTestSupport {
assertNotNull(json);
assertTrue(json.contains("\"label\": \"core,endpoint\""));
- assertTrue(json.contains("\"defaultQueueFactory\": { \"kind\": \"property\", \"label\": \"advanced\", \"required\": \"false\","
- + " \"type\": \"object\", \"javaType\": \"org.apache.camel.component.seda.BlockingQueueFactory<org.apache.camel.Exchange>\","));
- assertTrue(json.contains("\"queueSize\": { \"kind\": \"property\", \"label\": \"advanced\", \"required\": \"false\","
- + " \"type\": \"integer\", \"javaType\": \"int\", \"deprecated\": \"false\", \"secret\": \"false\", \"value\": \"0\""));
+ assertTrue(json.contains("\"queueSize\": { \"kind\": \"property\", \"group\": \"advanced\", \"label\": \"advanced\""));
}
@Override
[6/6] camel git commit: CAMEL-10649: Fix missing javadoc on model,
and added missing data formats to transformers.
Posted by da...@apache.org.
CAMEL-10649: Fix missing javadoc on model, and added missing data formats to transformers.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f54a309d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f54a309d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f54a309d
Branch: refs/heads/master
Commit: f54a309d1b63443dc4e9a21549b2d3f2ad27b3fd
Parents: 91f133d
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 23 11:03:27 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 23 11:03:27 2016 +0100
----------------------------------------------------------------------
.../camel/model/dataformat/YAMLTypeFilterDefinition.java | 9 +++++++++
.../camel/model/transformer/TransformersDefinition.java | 4 ++--
.../apache/camel/maven/packaging/PrepareCatalogMojo.java | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f54a309d/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
index 8e4babb..43a71db 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/YAMLTypeFilterDefinition.java
@@ -21,6 +21,9 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.camel.spi.Metadata;
+
+@Metadata(label = "dataformat,transformation,yaml", title = "YAML Type Filter")
@XmlRootElement(name = "typeFilter")
@XmlAccessorType(XmlAccessType.FIELD)
public final class YAMLTypeFilterDefinition {
@@ -33,6 +36,9 @@ public final class YAMLTypeFilterDefinition {
return value;
}
+ /**
+ * Value of type such as class name or regular expression
+ */
public void setValue(String value) {
this.value = value;
}
@@ -41,6 +47,9 @@ public final class YAMLTypeFilterDefinition {
return type;
}
+ /**
+ * Whether to filter by class type or regular expression
+ */
public void setType(YAMLTypeFilterType type) {
this.type = type;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f54a309d/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java b/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
index 9cca157..ede69cc 100644
--- a/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.camel.spi.Metadata;
/**
- * To configure transforms.
+ * To configure transformers.
*/
@Metadata(label = "transformation", title = "Transformations")
@XmlRootElement(name = "transformers")
@@ -41,7 +41,7 @@ public class TransformersDefinition {
private List<TransformerDefinition> transforms;
/**
- * A list holding the configured transformations
+ * The configured transformers
*/
public void setTransformers(List<TransformerDefinition> transforms) {
this.transforms = transforms;
http://git-wip-us.apache.org/repos/asf/camel/blob/f54a309d/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index ae1ab13..584a2a2 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -265,7 +265,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
for (Map<String, String> row : rows) {
String name = row.get("name");
// skip checking these as they have no documentation
- if ("outputs".equals(name)) {
+ if ("outputs".equals(name) || "transforms".equals(name)) {
continue;
}
[2/6] camel git commit: Test is not so relevant
Posted by da...@apache.org.
Test is not so relevant
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a932b3d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a932b3d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a932b3d
Branch: refs/heads/master
Commit: 9a932b3d7379476fccf9624fa9a030adb4975940
Parents: b1a930b
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 23 09:58:25 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 23 09:58:25 2016 +0100
----------------------------------------------------------------------
.../beanstalk/UriConfigurationTest.java | 52 --------------------
1 file changed, 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9a932b3d/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java
deleted file mode 100644
index 3f5d464..0000000
--- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/UriConfigurationTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * 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.beanstalk;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.ComponentConfiguration;
-import org.apache.camel.EndpointConfiguration;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class UriConfigurationTest extends Assert {
-
- @Test
- public void testComponentConfiguration() throws Exception {
- CamelContext context = new DefaultCamelContext();
-
- BeanstalkComponent comp = context.getComponent("beanstalk", BeanstalkComponent.class);
- EndpointConfiguration conf = comp.createConfiguration("beanstalk:tube?command=put");
-
- assertEquals("put", conf.getParameter("command"));
-
- ComponentConfiguration compConf = comp.createComponentConfiguration();
- String json = compConf.createParameterJsonSchema();
- assertNotNull(json);
-
- assertTrue(json.contains("\"command\": { \"kind\": \"parameter\", \"group\": \"common\", \"type\": \"string\""));
- assertTrue(json.contains("\"jobTimeToRun\": { \"kind\": \"parameter\", \"group\": \"common\", \"type\": \"integer\""));
- assertTrue(json.contains("\"awaitJob\": { \"kind\": \"parameter\", \"group\": \"consumer\", \"label\": \"consumer\", \"type\": \"boolean\""));
- }
-
- @Test
- public void testComponentDocumentation() throws Exception {
- CamelContext context = new DefaultCamelContext();
- String html = context.getComponentDocumentation("beanstalk");
- assertNotNull("Should have found some auto-generated HTML", html);
- }
-}
[5/6] camel git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/91f133d9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/91f133d9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/91f133d9
Branch: refs/heads/master
Commit: 91f133d9e40f2409b4458f9a5a85d19d58cf6d0e
Parents: 54eb007
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 23 10:43:36 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 23 10:43:36 2016 +0100
----------------------------------------------------------------------
.../model/transformer/CustomTransformerDefinition.java | 5 ++++-
.../transformer/DataFormatTransformerDefinition.java | 12 ++++++++++++
.../transformer/EndpointTransformerDefinition.java | 2 ++
.../camel/model/transformer/TransformerDefinition.java | 8 ++++++++
4 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/91f133d9/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
index 5a14b5b..b66f601 100644
--- a/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
@@ -35,6 +35,7 @@ import org.apache.camel.spi.Transformer;
@XmlType(name = "customTransformer")
@XmlAccessorType(XmlAccessType.FIELD)
public class CustomTransformerDefinition extends TransformerDefinition {
+
@XmlAttribute
private String ref;
@XmlAttribute
@@ -74,6 +75,7 @@ public class CustomTransformerDefinition extends TransformerDefinition {
/**
* Set a bean reference of the Transformer
+ *
* @param ref the bean reference of the Transformer
*/
public void setRef(String ref) {
@@ -86,7 +88,8 @@ public class CustomTransformerDefinition extends TransformerDefinition {
/**
* Set a class name of the Transformer
- * @param ref the class name of the Transformer
+ *
+ * @param type the class name of the Transformer
*/
public void setType(String type) {
this.type = type;
http://git-wip-us.apache.org/repos/asf/camel/blob/91f133d9/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
index fa74e3e..db1c98b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
@@ -26,6 +26,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.impl.transformer.DataFormatTransformer;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.dataformat.AvroDataFormat;
+import org.apache.camel.model.dataformat.BarcodeDataFormat;
import org.apache.camel.model.dataformat.Base64DataFormat;
import org.apache.camel.model.dataformat.BeanioDataFormat;
import org.apache.camel.model.dataformat.BindyDataFormat;
@@ -37,11 +38,14 @@ import org.apache.camel.model.dataformat.CustomDataFormat;
import org.apache.camel.model.dataformat.FlatpackDataFormat;
import org.apache.camel.model.dataformat.GzipDataFormat;
import org.apache.camel.model.dataformat.HL7DataFormat;
+import org.apache.camel.model.dataformat.HessianDataFormat;
import org.apache.camel.model.dataformat.IcalDataFormat;
import org.apache.camel.model.dataformat.JacksonXMLDataFormat;
import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.apache.camel.model.dataformat.JibxDataFormat;
import org.apache.camel.model.dataformat.JsonDataFormat;
+import org.apache.camel.model.dataformat.LZFDataFormat;
+import org.apache.camel.model.dataformat.MimeMultipartDataFormat;
import org.apache.camel.model.dataformat.PGPDataFormat;
import org.apache.camel.model.dataformat.ProtobufDataFormat;
import org.apache.camel.model.dataformat.RssDataFormat;
@@ -59,6 +63,7 @@ import org.apache.camel.model.dataformat.XMLSecurityDataFormat;
import org.apache.camel.model.dataformat.XStreamDataFormat;
import org.apache.camel.model.dataformat.XmlJsonDataFormat;
import org.apache.camel.model.dataformat.XmlRpcDataFormat;
+import org.apache.camel.model.dataformat.YAMLDataFormat;
import org.apache.camel.model.dataformat.ZipDataFormat;
import org.apache.camel.model.dataformat.ZipFileDataFormat;
import org.apache.camel.spi.DataFormat;
@@ -79,6 +84,7 @@ public class DataFormatTransformerDefinition extends TransformerDefinition {
@XmlElements({
@XmlElement(required = false, name = "avro", type = AvroDataFormat.class),
+ @XmlElement(required = false, name = "barcode", type = BarcodeDataFormat.class),
@XmlElement(required = false, name = "base64", type = Base64DataFormat.class),
@XmlElement(required = false, name = "beanio", type = BeanioDataFormat.class),
@XmlElement(required = false, name = "bindy", type = BindyDataFormat.class),
@@ -86,15 +92,19 @@ public class DataFormatTransformerDefinition extends TransformerDefinition {
@XmlElement(required = false, name = "castor", type = CastorDataFormat.class),
@XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class),
@XmlElement(required = false, name = "csv", type = CsvDataFormat.class),
+ // TODO: Camel 3.0 - Should be named customDataFormat to avoid naming clash with custom loadbalancer
@XmlElement(required = false, name = "custom", type = CustomDataFormat.class),
@XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
@XmlElement(required = false, name = "gzip", type = GzipDataFormat.class),
+ @XmlElement(required = false, name = "hessian", type = HessianDataFormat.class),
@XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
@XmlElement(required = false, name = "ical", type = IcalDataFormat.class),
@XmlElement(required = false, name = "jacksonxml", type = JacksonXMLDataFormat.class),
@XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),
@XmlElement(required = false, name = "jibx", type = JibxDataFormat.class),
@XmlElement(required = false, name = "json", type = JsonDataFormat.class),
+ @XmlElement(required = false, name = "lzf", type = LZFDataFormat.class),
+ @XmlElement(required = false, name = "mimeMultipart", type = MimeMultipartDataFormat.class),
@XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
@XmlElement(required = false, name = "rss", type = RssDataFormat.class),
@XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
@@ -112,6 +122,7 @@ public class DataFormatTransformerDefinition extends TransformerDefinition {
@XmlElement(required = false, name = "xmlrpc", type = XmlRpcDataFormat.class),
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
+ @XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class),
@XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)}
)
@@ -136,6 +147,7 @@ public class DataFormatTransformerDefinition extends TransformerDefinition {
/**
* Set the reference of the DataFormat.
+ *
* @param ref reference of the DataFormat
*/
public void setRef(String ref) {
http://git-wip-us.apache.org/repos/asf/camel/blob/91f133d9/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
index 92f0a85..7c0dc32 100644
--- a/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
@@ -65,6 +65,7 @@ public class EndpointTransformerDefinition extends TransformerDefinition {
/**
* Set the reference of the Endpoint.
+ *
* @param ref reference of the Endpoint
*/
public void setRef(String ref) {
@@ -77,6 +78,7 @@ public class EndpointTransformerDefinition extends TransformerDefinition {
/**
* Set the URI of the Endpoint.
+ *
* @param uri URI of the Endpoint
*/
public void setUri(String uri) {
http://git-wip-us.apache.org/repos/asf/camel/blob/91f133d9/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
index 57039c3..590bb5a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/transformer/TransformerDefinition.java
@@ -21,6 +21,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import org.apache.camel.CamelContext;
+import org.apache.camel.model.InputTypeDefinition;
+import org.apache.camel.model.OutputTypeDefinition;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.Transformer;
@@ -44,6 +46,7 @@ import org.apache.camel.spi.Transformer;
@XmlType(name = "transformer")
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class TransformerDefinition {
+
@XmlAttribute
private String scheme;
@XmlAttribute
@@ -63,6 +66,7 @@ public abstract class TransformerDefinition {
/**
* Set a scheme name supported by the transformer.
+ *
* @param scheme scheme name
*/
public void setScheme(String scheme) {
@@ -75,6 +79,7 @@ public abstract class TransformerDefinition {
/**
* Set the 'from' data type .
+ *
* @param from 'from' data type
*/
public void setFrom(String from) {
@@ -83,6 +88,7 @@ public abstract class TransformerDefinition {
/**
* Set the 'from' data type using Java class.
+ *
* @param clazz 'from' Java class
*/
public void setFrom(Class<?> clazz) {
@@ -95,6 +101,7 @@ public abstract class TransformerDefinition {
/**
* Set the 'to' data type.
+ *
* @param to 'to' data type
*/
public void setTo(String to) {
@@ -103,6 +110,7 @@ public abstract class TransformerDefinition {
/**
* Set the 'to' data type using Java class.
+ *
* @param clazz 'to' Java class
*/
public void setTo(Class<?> clazz) {
[4/6] camel git commit: Polished
Posted by da...@apache.org.
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/54eb0074
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/54eb0074
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/54eb0074
Branch: refs/heads/master
Commit: 54eb007491087f8ff0739556a8e171a68da8a085
Parents: e7198dd
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 23 10:40:16 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Dec 23 10:40:16 2016 +0100
----------------------------------------------------------------------
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 4 ++--
.../src/main/resources/target-template-pom.xml | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/54eb0074/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 8f802b3..6df0849 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -16,15 +16,15 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>camel-spring-boot-dm</artifactId>
<groupId>org.apache.camel</groupId>
<version>2.19.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>camel-spring-boot-dependencies</artifactId>
<packaging>pom</packaging>
- <name>Camel :: Spring-Boot :: Dependency Management :: BOM</name>
+ <name>Camel :: Platform :: Spring-Boot :: Dependency Management :: BOM</name>
<description>Camel Spring-Boot BOM</description>
<dependencyManagement>
<dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/54eb0074/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml
index 9ef2068..8eca779 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-generator-bom/src/main/resources/target-template-pom.xml
@@ -18,16 +18,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<artifactId>camel-spring-boot-dm</artifactId>
<groupId>org.apache.camel</groupId>
<version>${project.version}</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>camel-spring-boot-dependencies</artifactId>
<packaging>pom</packaging>
- <name>Camel :: Spring-Boot :: Dependency Management :: BOM</name>
+ <name>Camel :: Platform :: Spring-Boot :: Dependency Management :: BOM</name>
<description>Camel Spring-Boot BOM</description>
<dependencyManagement>