Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9798318EC1 for ; Tue, 2 Jun 2015 06:58:54 +0000 (UTC) Received: (qmail 63032 invoked by uid 500); 2 Jun 2015 06:58:54 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 62984 invoked by uid 500); 2 Jun 2015 06:58:54 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 62889 invoked by uid 99); 2 Jun 2015 06:58:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2015 06:58:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F385AE0AD2; Tue, 2 Jun 2015 06:58:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Tue, 02 Jun 2015 06:58:54 -0000 Message-Id: In-Reply-To: <19159595bc514e9bb83511eaf8167248@git.apache.org> References: <19159595bc514e9bb83511eaf8167248@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] camel git commit: Component docs Component docs Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ab224018 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab224018 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab224018 Branch: refs/heads/master Commit: ab224018b69fcceb8149003fc5b7ada1134bc1d4 Parents: 7ab5664 Author: Claus Ibsen Authored: Tue Jun 2 09:03:50 2015 +0200 Committer: Claus Ibsen Committed: Tue Jun 2 09:03:50 2015 +0200 ---------------------------------------------------------------------- components/camel-grape/pom.xml | 5 ++- .../camel/component/grape/GrapeEndpoint.groovy | 2 +- .../org/apache/camel/component/grape/grape.json | 23 ++++++++++++ .../src/test/resources/log4j.properties | 37 ++++++++++++++++++++ 4 files changed, 63 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ab224018/components/camel-grape/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml index bdeb165..5fd3820 100644 --- a/components/camel-grape/pom.xml +++ b/components/camel-grape/pom.xml @@ -69,10 +69,9 @@ test - ch.qos.logback - logback-classic + org.slf4j + slf4j-log4j12 test - ${logback-version} http://git-wip-us.apache.org/repos/asf/camel/blob/ab224018/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeEndpoint.groovy ---------------------------------------------------------------------- diff --git a/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeEndpoint.groovy b/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeEndpoint.groovy index 3f0a08b..9e0c730 100644 --- a/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeEndpoint.groovy +++ b/components/camel-grape/src/main/groovy/org/apache/camel/component/grape/GrapeEndpoint.groovy @@ -26,7 +26,7 @@ import org.apache.camel.spi.UriEndpoint import static groovy.grape.Grape.grab import static org.apache.camel.component.grape.MavenCoordinates.parseMavenCoordinates -@UriEndpoint(scheme = "grape", title = "Grape", producerOnly = true, label = "management,deployment", syntax = "grape:defaultCoordinates") +@UriEndpoint(scheme = "grape", syntax = "grape:defaultCoordinates", title = "Grape", producerOnly = true, label = "management,deployment") class GrapeEndpoint extends DefaultEndpoint { private final String defaultCoordinates http://git-wip-us.apache.org/repos/asf/camel/blob/ab224018/components/camel-grape/src/main/resources/org/apache/camel/component/grape/grape.json ---------------------------------------------------------------------- diff --git a/components/camel-grape/src/main/resources/org/apache/camel/component/grape/grape.json b/components/camel-grape/src/main/resources/org/apache/camel/component/grape/grape.json new file mode 100644 index 0000000..2095055 --- /dev/null +++ b/components/camel-grape/src/main/resources/org/apache/camel/component/grape/grape.json @@ -0,0 +1,23 @@ +{ + "component": { + "kind": "component", + "scheme": "grape", + "syntax": "grape:defaultCoordinates", + "title": "Grape", + "description": "Grape component allows you to fetch, load and manage additional jars when CamelContext is running.", + "label": "management,deployment", + "producerOnly": "true", + "javaType": "org.apache.camel.component.grape.GrapeEndpoint", + "groupId": "org.apache.camel", + "artifactId": "camel-grape", + "version": "2.16.0" + }, + "componentProperties": { + }, + "properties": { + "defaultCoordinates": { "kind": "path", "required": "true", "type": "string", "javaType": "java.lang.String", "deprecated": "false", "description": "Maven coordinates to use as default to grab if the message body is empty." }, + "exchangePattern": { "kind": "parameter", "type": "string", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "RobustInOnly", "InOut", "InOptionalOut", "OutOnly", "RobustOutOnly", "OutIn", "OutOptionalIn" ], "deprecated": "false", "defaultValue": "InOnly", "description": "Sets the default exchange pattern when creating an exchange." }, + "synchronous": { "kind": "parameter", "type": "boolean", "javaType": "boolean", "deprecated": "false", "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported)." } + } +} + http://git-wip-us.apache.org/repos/asf/camel/blob/ab224018/components/camel-grape/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-grape/src/test/resources/log4j.properties b/components/camel-grape/src/test/resources/log4j.properties new file mode 100644 index 0000000..9463e63 --- /dev/null +++ b/components/camel-grape/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 for testing. +# +log4j.rootLogger=INFO, file + +# uncomment the following to enable debug of Camel +#log4j.logger.org.apache.camel=DEBUG + +# CONSOLE appender not used by default +log4j.appender.out=org.apache.log4j.ConsoleAppender +log4j.appender.out.layout=org.apache.log4j.PatternLayout +log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n +#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n + +# File appender +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n +log4j.appender.file.file=target/camel-grape-test.log +log4j.appender.file.append=true