camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject [1/2] git commit: CAMEL-6761 - Upgrade to restlet 2.1
Date Tue, 17 Sep 2013 02:16:34 GMT
Updated Branches:
  refs/heads/camel-2.12.x bf683c9c4 -> df9d866da
  refs/heads/master ed0ca3d31 -> 99b40bd77


CAMEL-6761 - Upgrade to restlet 2.1


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/99b40bd7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/99b40bd7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/99b40bd7

Branch: refs/heads/master
Commit: 99b40bd7705a1dfa54a00c6239c6fd2d8ab8ff0e
Parents: ed0ca3d
Author: Jonathan Anstey <janstey@gmail.com>
Authored: Mon Sep 16 22:15:36 2013 -0400
Committer: Jonathan Anstey <janstey@gmail.com>
Committed: Mon Sep 16 22:15:45 2013 -0400

----------------------------------------------------------------------
 components/camel-restlet/pom.xml                      | 14 +++++++-------
 .../component/restlet/DefaultRestletBinding.java      |  2 +-
 .../restlet/RestletHeaderFilterStrategy.java          |  2 +-
 .../camel/component/restlet/RestletResponseTest.java  |  2 +-
 parent/pom.xml                                        |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/99b40bd7/components/camel-restlet/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index 13e814e..5e797a2 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -57,6 +57,13 @@
       <version>${restlet-version}</version>
     </dependency>
 
+    <dependency>
+     <groupId>org.restlet.jse</groupId>
+     <artifactId>org.restlet.ext.httpclient</artifactId>
+     <version>${restlet-version}</version>
+     <scope>test</scope>
+    </dependency>
+
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.camel</groupId>
@@ -69,13 +76,6 @@
       <artifactId>camel-jetty</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${httpclient4-version}</version>
-      <scope>test</scope>
-    </dependency>
     
     <dependency>
       <groupId>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/99b40bd7/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
index f00de32..3a7a9ae 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
@@ -49,7 +49,7 @@ import org.restlet.data.MediaType;
 import org.restlet.data.Method;
 import org.restlet.data.Preference;
 import org.restlet.data.Status;
-import org.restlet.engine.http.header.HeaderConstants;
+import org.restlet.engine.header.HeaderConstants;
 import org.restlet.representation.FileRepresentation;
 import org.restlet.representation.InputRepresentation;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/camel/blob/99b40bd7/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 a269169..b873230 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
@@ -18,7 +18,7 @@ package org.apache.camel.component.restlet;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultHeaderFilterStrategy;
-import org.restlet.engine.http.header.HeaderConstants;
+import org.restlet.engine.header.HeaderConstants;
 
 /**
  * Default header filtering strategy for Restlet

http://git-wip-us.apache.org/repos/asf/camel/blob/99b40bd7/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
index 049cc20..5469aa2 100644
--- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
+++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
@@ -29,7 +29,7 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.junit.Test;
 import org.restlet.data.CacheDirective;
-import org.restlet.engine.http.header.HeaderConstants;
+import org.restlet.engine.header.HeaderConstants;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/camel/blob/99b40bd7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4cbe098..f1627b7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -330,7 +330,7 @@
     <quickfix-bundle-version>1.5.3_1</quickfix-bundle-version>
     <rabbitmq-amqp-client-version>3.1.3</rabbitmq-amqp-client-version>
     <regexp-bundle-version>1.4_1</regexp-bundle-version>
-    <restlet-version>2.0.15</restlet-version>
+    <restlet-version>2.1.4</restlet-version>
     <rhino-bundle-version>1.7R2_3</rhino-bundle-version>
     <rhino-version>1.7R2</rhino-version>
     <rome-bundle-version>1.0_3</rome-bundle-version>


Mime
View raw message