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/02/15 09:57:45 UTC
[1/2] camel git commit: CAMEL-9603: Polished
Repository: camel
Updated Branches:
refs/heads/master b0c7e793d -> 72ed9cfe5
CAMEL-9603: Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e64aee42
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e64aee42
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e64aee42
Branch: refs/heads/master
Commit: e64aee428b0801bc2d0ae1058ec5b6259d39e8b4
Parents: b0c7e79
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 15 09:49:09 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 15 09:49:09 2016 +0100
----------------------------------------------------------------------
.../apache/camel/component/aws/kinesis/KinesisEndpoint.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e64aee42/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
index 871c992..4e79926 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
@@ -35,18 +35,14 @@ import org.apache.camel.spi.UriPath;
@UriEndpoint(scheme = "aws-kinesis", title = "AWS Kinesis", syntax = "aws-kinesis:streamName", consumerClass = KinesisConsumer.class, label = "cloud,messaging")
public class KinesisEndpoint extends ScheduledPollEndpoint {
- @UriPath(label = "consumer", description = "Name of the stream")
+ @UriPath(description = "Name of the stream")
@Metadata(required = "true")
private String streamName;
-
- // For now, always assume that we've been supplied a client in the Camel registry.
- @UriParam(label = "consumer", description = "Amazon Kinesis client to use for all requests for this endpoint")
+ @UriParam(description = "Amazon Kinesis client to use for all requests for this endpoint")
@Metadata(required = "true")
private AmazonKinesis amazonKinesisClient;
-
@UriParam(label = "consumer", description = "Maximum number of records that will be fetched in each poll", defaultValue = "1")
private int maxResultsPerRequest = 1;
-
@UriParam(label = "consumer", description = "Defines where in the Kinesis stream to start getting records")
private ShardIteratorType iteratorType = ShardIteratorType.TRIM_HORIZON;
[2/2] 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/72ed9cfe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/72ed9cfe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/72ed9cfe
Branch: refs/heads/master
Commit: 72ed9cfe5386b6998f665a05774b9eab64c4770d
Parents: e64aee4
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 15 09:57:36 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 15 09:57:36 2016 +0100
----------------------------------------------------------------------
tests/camel-itest/pom.xml | 17 +++++++++++++++++
.../itest/http/HttpRouteContentLengthTest.java | 4 ----
2 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/72ed9cfe/tests/camel-itest/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index bc2efee..b5f45c4 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -328,6 +328,23 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
+ <!-- we use the version from camel-jetty9 -->
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/72ed9cfe/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpRouteContentLengthTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpRouteContentLengthTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpRouteContentLengthTest.java
index f5dc5ca..def1efb 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpRouteContentLengthTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpRouteContentLengthTest.java
@@ -49,15 +49,11 @@ public class HttpRouteContentLengthTest extends CamelTestSupport {
assertNotNull(out);
assertEquals("Bye Camel request.: 14", out.getOut().getBody(String.class));
-
-
-
}
protected String getHttpEndpointScheme() {
return "http4://localhost:";
}
-
@Override
protected RouteBuilder createRouteBuilder() throws Exception {