Repository: camel Updated Branches: refs/heads/master d5024b64c -> 4076e3189
Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4076e318 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4076e318 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4076e318 Branch: refs/heads/master Commit: 4076e3189a74ce717555230f6afc2282d5cb37f2 Parents: d5024b6 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Aug 19 12:13:07 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Aug 19 12:17:41 2016 +0200 ---------------------------------------------------------------------- camel-core/readme.adoc | 4 +- .../src/main/docs/properties-component.adoc | 2 + .../src/main/docs/scheduler-component.adoc | 2 + camel-core/src/main/docs/seda-component.adoc | 2 + camel-core/src/main/docs/stub-component.adoc | 2 + .../src/main/docs/validator-component.adoc | 2 + camel-core/src/main/docs/vm-component.adoc | 2 + camel-core/src/main/docs/xslt-component.adoc | 2 + .../model/language/TokenizerExpression.java | 2 +- .../model/language/XMLTokenizerExpression.java | 2 +- .../TokenizeLanguageConfiguration.java | 2 +- .../XMLTokenizeLanguageConfiguration.java | 2 +- .../camel-protobuf-starter/pom.xml | 2 +- .../ProtobufDataFormatConfiguration.java | 2 +- components/camel-protobuf/pom.xml | 104 ++++++++++--------- components/readme.adoc | 2 +- 16 files changed, 76 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/camel-core/readme.adoc ---------------------------------------------------------------------- diff --git a/camel-core/readme.adoc b/camel-core/readme.adoc index 30755ea..e7160f0 100644 --- a/camel-core/readme.adoc +++ b/camel-core/readme.adoc @@ -147,9 +147,9 @@ Expression Languages | link:src/main/docs/simple-language.adoc[Simple] (camel-core) | For expressions and predicates using the simple language -| link:src/main/docs/tokenize-language.adoc[Tokenize] (camel-core) | For expressions and predicates using a body or header tokenizer. +| link:src/main/docs/tokenize-language.adoc[Tokenize] (camel-core) | For expressions and predicates using a body or header tokenizer -| link:src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-core) | For expressions and predicates using a body or header tokenizer. +| link:src/main/docs/xtokenize-language.adoc[XML Tokenize] (camel-core) | For expressions and predicates using a body or header tokenizer | link:src/main/docs/xpath-language.adoc[XPath] (camel-core) | For XPath expressions and predicates |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/camel-core/src/main/docs/properties-component.adoc ---------------------------------------------------------------------- diff --git a/camel-core/src/main/docs/properties-component.adoc b/camel-core/src/main/docs/properties-component.adoc index ae5be0d..ac63306 100644 --- a/camel-core/src/main/docs/properties-component.adoc +++ b/camel-core/src/main/docs/properties-component.adoc @@ -22,6 +22,8 @@ Options // component options: START The Properties component supports 15 options which are listed below. + + {% raw %} [width="100%",cols="2s,1m,7",options="header"] |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/camel-core/src/main/docs/scheduler-component.adoc ---------------------------------------------------------------------- diff --git a/camel-core/src/main/docs/scheduler-component.adoc b/camel-core/src/main/docs/scheduler-component.adoc index 46a51bd..b9ba3e6 100644 --- a/camel-core/src/main/docs/scheduler-component.adoc +++ b/camel-core/src/main/docs/scheduler-component.adoc @@ -39,6 +39,8 @@ Options // component options: START The Scheduler component supports 1 options which are listed below. + + {% raw %} [width="100%",cols="2s,1m,7",options="header"] |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/camel-core/src/main/docs/seda-component.adoc ---------------------------------------------------------------------- diff --git a/camel-core/src/main/docs/seda-component.adoc b/camel-core/src/main/docs/seda-component.adoc index f56f971..db3222d 100644 --- a/camel-core/src/main/docs/seda-component.adoc +++ b/camel-core/src/main/docs/seda-component.adoc @@ -44,6 +44,8 @@ Options // component options: START The SEDA component supports 3 options which are listed below. + + {% raw %} [width="100%",cols="2s,1m,7",options="header"] |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/camel-core/src/main/docs/stub-component.adoc ---------------------------------------------------------------------- diff --git a/camel-core/src/main/docs/stub-component.adoc b/camel-core/src/main/docs/stub-component.adoc index 37a7e83..54d0568 100644 --- a/camel-core/src/main/docs/stub-component.adoc +++ b/camel-core/src/main/docs/stub-component.adoc @@ -36,6 +36,8 @@ Options // component options: START The Stub component supports 3 options which are listed below. + + {% raw %} [width="100%",cols="2s,1m,7",options="header"] |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/camel-core/src/main/docs/validator-component.adoc ---------------------------------------------------------------------- diff --git a/camel-core/src/main/docs/validator-component.adoc b/camel-core/src/main/docs/validator-component.adoc index a0f663e..08e9b58 100644 --- a/camel-core/src/main/docs/validator-component.adoc +++ b/camel-core/src/main/docs/validator-component.adoc @@ -58,6 +58,8 @@ Options // component options: START The Validator component supports 1 options which are listed below. + + {% raw %} [width="100%",cols="2s,1m,7",options="header"] |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/camel-core/src/main/docs/vm-component.adoc ---------------------------------------------------------------------- diff --git a/camel-core/src/main/docs/vm-component.adoc b/camel-core/src/main/docs/vm-component.adoc index ba58e77..59faec7 100644 --- a/camel-core/src/main/docs/vm-component.adoc +++ b/camel-core/src/main/docs/vm-component.adoc @@ -67,6 +67,8 @@ Options // component options: START The VM component supports 3 options which are listed below. + + {% raw %} [width="100%",cols="2s,1m,7",options="header"] |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/camel-core/src/main/docs/xslt-component.adoc ---------------------------------------------------------------------- diff --git a/camel-core/src/main/docs/xslt-component.adoc b/camel-core/src/main/docs/xslt-component.adoc index 875b843..56302c3 100644 --- a/camel-core/src/main/docs/xslt-component.adoc +++ b/camel-core/src/main/docs/xslt-component.adoc @@ -73,6 +73,8 @@ Options // component options: START The XSLT component supports 5 options which are listed below. + + {% raw %} [width="100%",cols="2s,1m,7",options="header"] |======================================================================= http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java index 938c88d..e167078 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java @@ -29,7 +29,7 @@ import org.apache.camel.spi.Metadata; import org.apache.camel.util.ExpressionToPredicateAdapter; /** - * For expressions and predicates using a body or header tokenizer. + * For expressions and predicates using a body or header tokenizer * * @see TokenizeLanguage */ http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java index cb8f32f..f1a8f64 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java @@ -28,7 +28,7 @@ import org.apache.camel.language.tokenizer.XMLTokenizeLanguage; import org.apache.camel.spi.Metadata; /** - * For expressions and predicates using a body or header tokenizer. + * For expressions and predicates using a body or header tokenizer * * @see XMLTokenizeLanguage */ http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageConfiguration.java index 8d0632e..9a30c9b 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageConfiguration.java @@ -19,7 +19,7 @@ package org.apache.camel.language.tokenizer.springboot; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * For expressions and predicates using a body or header tokenizer. + * For expressions and predicates using a body or header tokenizer * * Generated by camel-package-maven-plugin - do not edit this file! */ http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/XMLTokenizeLanguageConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/XMLTokenizeLanguageConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/XMLTokenizeLanguageConfiguration.java index a245dc4..72a32a4 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/XMLTokenizeLanguageConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/XMLTokenizeLanguageConfiguration.java @@ -19,7 +19,7 @@ package org.apache.camel.language.tokenizer.springboot; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * For expressions and predicates using a body or header tokenizer. + * For expressions and predicates using a body or header tokenizer * * Generated by camel-package-maven-plugin - do not edit this file! */ http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/components-starter/camel-protobuf-starter/pom.xml ---------------------------------------------------------------------- diff --git a/components-starter/camel-protobuf-starter/pom.xml b/components-starter/camel-protobuf-starter/pom.xml index 8c1351e..9b99867 100644 --- a/components-starter/camel-protobuf-starter/pom.xml +++ b/components-starter/camel-protobuf-starter/pom.xml @@ -26,7 +26,7 @@ <artifactId>camel-protobuf-starter</artifactId> <packaging>jar</packaging> <name>Spring-Boot Starter :: Camel :: Protobuf</name> - <description>Spring-Boot Starter for Camel Components</description> + <description>Spring-Boot Starter for Camel Google Protobuf data format support</description> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatConfiguration.java b/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatConfiguration.java index 4d06d4f..f00ae59 100644 --- a/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatConfiguration.java +++ b/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatConfiguration.java @@ -19,7 +19,7 @@ package org.apache.camel.dataformat.protobuf.springboot; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Camel Components + * Camel Google Protobuf data format support * * Generated by camel-package-maven-plugin - do not edit this file! */ http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/components/camel-protobuf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml index 61a31eb..e63466e 100755 --- a/components/camel-protobuf/pom.xml +++ b/components/camel-protobuf/pom.xml @@ -15,60 +15,62 @@ 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> +<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> + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>components</artifactId> + <version>2.18-SNAPSHOT</version> + </parent> - <artifactId>camel-protobuf</artifactId> - <packaging>jar</packaging> - <name>Camel :: Protobuf</name> + <artifactId>camel-protobuf</artifactId> + <packaging>jar</packaging> + <name>Camel :: Protobuf</name> + <description>Camel Google Protobuf data format support</description> - <properties> - <camel.osgi.export.pkg>org.apache.camel.dataformat.protobuf.*</camel.osgi.export.pkg> - <camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=protobuf</camel.osgi.export.service> - </properties> + <properties> + <camel.osgi.export.pkg>org.apache.camel.dataformat.protobuf.*</camel.osgi.export.pkg> + <camel.osgi.export.service>org.apache.camel.spi.DataFormatResolver;dataformat=protobuf</camel.osgi.export.service> + </properties> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - </dependency> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>${protobuf-version}</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protobuf-version}</version> + </dependency> - <!-- testing --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + <!-- testing --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/4076e318/components/readme.adoc ---------------------------------------------------------------------- diff --git a/components/readme.adoc b/components/readme.adoc index 6fcb3c5..87f31f3 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -641,7 +641,7 @@ Data Formats | link:camel-crypto/src/main/docs/pgp-dataformat.adoc[PGP] (camel-crypto) | Camel Cryptographic Support -| link:camel-protobuf/src/main/docs/protobuf-dataformat.adoc[Protobuf] (camel-protobuf) | Camel Components +| link:camel-protobuf/src/main/docs/protobuf-dataformat.adoc[Protobuf] (camel-protobuf) | Camel Google Protobuf data format support | link:camel-rss/src/main/docs/rss-dataformat.adoc[RSS] (camel-rss) | Camel RSS support
