You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/06/02 08:58:53 UTC
[1/2] camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/master bd36f6245 -> ab224018b
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7ab56644
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ab56644
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ab56644
Branch: refs/heads/master
Commit: 7ab56644d07040d3ec8d10df9e32b485c2688525
Parents: bd36f62
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 2 08:52:34 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 2 08:52:34 2015 +0200
----------------------------------------------------------------------
.../calendar/GoogleCalendarConfiguration.java | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7ab56644/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java
index ac04cba..80ba96b 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/GoogleCalendarConfiguration.java
@@ -70,7 +70,6 @@ public class GoogleCalendarConfiguration {
/**
* What kind of operation to perform
- * @param apiName
*/
public void setApiName(GoogleCalendarApiName apiName) {
this.apiName = apiName;
@@ -82,7 +81,6 @@ public class GoogleCalendarConfiguration {
/**
* What sub operation to use for the selected operation
- * @param methodName
*/
public void setMethodName(String methodName) {
this.methodName = methodName;
@@ -94,7 +92,6 @@ public class GoogleCalendarConfiguration {
/**
* Client ID of the calendar application
- * @param clientId
*/
public void setClientId(String clientId) {
this.clientId = clientId;
@@ -104,19 +101,19 @@ public class GoogleCalendarConfiguration {
return emailAddress;
}
+ /**
+ * The emailAddress of the Google Service Account.
+ */
public void setEmailAddress(String emailAddress) {
this.emailAddress = emailAddress;
}
-
-
public String getClientSecret() {
return clientSecret;
}
/**
* Client secret of the calendar application
- * @param clientSecret
*/
public void setClientSecret(String clientSecret) {
this.clientSecret = clientSecret;
@@ -128,7 +125,6 @@ public class GoogleCalendarConfiguration {
/**
* OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage.
- * @param accessToken
*/
public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
@@ -140,7 +136,6 @@ public class GoogleCalendarConfiguration {
/**
* OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived.
- * @param refreshToken
*/
public void setRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
@@ -152,7 +147,6 @@ public class GoogleCalendarConfiguration {
/**
* Google calendar application name. Example would be "camel-google-calendar/1.0"
- * @param applicationName
*/
public void setApplicationName(String applicationName) {
this.applicationName = applicationName;
@@ -164,7 +158,6 @@ public class GoogleCalendarConfiguration {
/**
* Specifies the level of permissions you want a calendar application to have to a user account. See https://developers.google.com/google-apps/calendar/auth for more info.
- * @param scopes
*/
public void setScopes(List<String> scopes) {
this.scopes = scopes;
@@ -174,6 +167,9 @@ public class GoogleCalendarConfiguration {
return p12FileName;
}
+ /**
+ * The name of the p12 file which has the private key to use with the Google Service Account.
+ */
public void setP12FileName(String p12FileName) {
this.p12FileName = p12FileName;
}
[2/2] camel git commit: Component docs
Posted by da...@apache.org.
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 <da...@apache.org>
Authored: Tue Jun 2 09:03:50 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
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 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
- <version>${logback-version}</version>
</dependency>
</dependencies>
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