You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/09/30 07:30:51 UTC
[1/3] git commit: Fixed build error of RestletHeaderFilterStrategy
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x e737849d8 -> b9ca47981
refs/heads/camel-2.14.x 3cac0a741 -> 16f840841
Fixed build error of RestletHeaderFilterStrategy
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b23ab8b5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b23ab8b5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b23ab8b5
Branch: refs/heads/camel-2.13.x
Commit: b23ab8b5958db102f8621172b46015c59e8c147e
Parents: e737849
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 30 13:29:04 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 30 13:29:04 2014 +0800
----------------------------------------------------------------------
.../restlet/RestletHeaderFilterStrategy.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b23ab8b5/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
index 662328c..d2f727d 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
@@ -21,27 +21,28 @@ import org.apache.camel.impl.DefaultHeaderFilterStrategy;
/**
* Default header filtering strategy for Restlet
- *
- * @version
+ *
+ * @version
*/
public class RestletHeaderFilterStrategy extends DefaultHeaderFilterStrategy {
public RestletHeaderFilterStrategy() {
// No IN filters and copy all headers from Restlet to Camel
-
+
// OUT filters (from Camel headers to Restlet headers)
// filter headers used internally by this component
- getOutFilter().add(RestletConstants.RESTLET_LOGIN);
- getOutFilter().add(RestletConstants.RESTLET_PASSWORD);
-
- // The "CamelAcceptContentType" header is not added to the outgoing HTTP
+ getOutFilter().add(RestletConstants.RESTLET_LOGIN.toLowerCase());
+ getOutFilter().add(RestletConstants.RESTLET_PASSWORD.toLowerCase());
+
+ // The "CamelAcceptContentType" header is not added to the outgoing HTTP
// headers but it will be going out as "Accept.
- getOutFilter().add(Exchange.ACCEPT_CONTENT_TYPE);
-
+ getOutFilter().add(Exchange.ACCEPT_CONTENT_TYPE.toLowerCase());
+
// As we don't set the transfer_encoding protocol header for the restlet service
// we need to remove the transfer_encoding which could let the client wait forever
- getOutFilter().add(Exchange.TRANSFER_ENCODING);
- setCaseInsensitive(true);
+ getOutFilter().add(Exchange.TRANSFER_ENCODING.toLowerCase());
+ // Support to filter case insensitive
+ setLowerCase(true);
}
}
[3/3] git commit: Overrdie the httpclient version in camel-restlet pom
Posted by ni...@apache.org.
Overrdie the httpclient version in camel-restlet pom
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b9ca4798
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b9ca4798
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b9ca4798
Branch: refs/heads/camel-2.13.x
Commit: b9ca47981dd2c43da3d6e5d5c225043ec9c4c213
Parents: b23ab8b
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 30 13:28:03 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 30 13:29:48 2014 +0800
----------------------------------------------------------------------
components/camel-restlet/pom.xml | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b9ca4798/components/camel-restlet/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index 382bb45..c66a241 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -6,9 +6,9 @@
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.
@@ -29,7 +29,7 @@
<packaging>bundle</packaging>
<name>Camel :: Restlet</name>
<description>Camel REST (Restlet baesd) Component</description>
-
+
<properties>
<camel.osgi.export.pkg>
org.apache.camel.component.restlet.*
@@ -63,10 +63,16 @@
<version>${restlet-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient4-version}</version>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
[2/3] git commit: Overrdie the httpclient version in camel-restlet pom
Posted by ni...@apache.org.
Overrdie the httpclient version in camel-restlet pom
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16f84084
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16f84084
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16f84084
Branch: refs/heads/camel-2.14.x
Commit: 16f840841dbc21a0cff0f16bab5e5af2a0e8f1ba
Parents: 3cac0a7
Author: Willem Jiang <wi...@gmail.com>
Authored: Tue Sep 30 13:28:03 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Tue Sep 30 13:29:39 2014 +0800
----------------------------------------------------------------------
components/camel-restlet/pom.xml | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/16f84084/components/camel-restlet/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index a7afd47..01f97bc 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -6,9 +6,9 @@
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.
@@ -28,7 +28,7 @@
<packaging>bundle</packaging>
<name>Camel :: Restlet</name>
<description>Camel REST (Restlet baesd) Component</description>
-
+
<properties>
<camel.osgi.export.pkg>
org.apache.camel.component.restlet.*
@@ -62,10 +62,16 @@
<version>${restlet-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient4-version}</version>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>