Author: ningjiang
Date: Wed Jan 27 13:57:33 2010
New Revision: 903643
URL: http://svn.apache.org/viewvc?rev=903643&view=rev
Log:
Merged revisions 903638 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r903638 | ningjiang | 2010-01-27 21:40:14 +0800 (Wed, 27 Jan 2010) | 1 line
CAMEL-2412 DefaultHttpBinding should parser the URI's parameter without
checking HttpMethod
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 27 13:57:33 2010
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750,885876,887196,895119,896772,898201,901634,902688
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218,824721,825760,825765,828288,828333,832647,833285,833289,833350,833370,833381,833419,835511,880655,880667,883713,884525,884750,885876,887196,895119,896772,898201,901634,902688,903638
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java?rev=903643&r1=903642&r2=903643&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
(original)
+++
camel/branches/camel-1.x/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
Wed Jan 27 13:57:33 2010
@@ -75,18 +75,15 @@
}
}
- //we populate the http request parameters for GET and POST
-
- String method = request.getMethod();
- if (method.equalsIgnoreCase("GET") ||
(method.equalsIgnoreCase("POST"))) {
- names = request.getParameterNames();
- while (names.hasMoreElements()) {
- String name = (String)names.nextElement();
- Object value = request.getParameter(name);
- if (headerFilterStrategy != null
- &&
!headerFilterStrategy.applyFilterToExternalHeaders(name, value)) {
- headers.put(name, value);
- }
+ //we populate the http request parameters without checking the request
method
+
+ names = request.getParameterNames();
+ while (names.hasMoreElements()) {
+ String name = (String)names.nextElement();
+ Object value = request.getParameter(name);
+ if (headerFilterStrategy != null
+ && !headerFilterStrategy.applyFilterToExternalHeaders(name,
value)) {
+ headers.put(name, value);
}
}
Modified:
camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java?rev=903643&r1=903642&r2=903643&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
Wed Jan 27 13:57:33 2010
@@ -38,6 +38,7 @@
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.PutMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
@@ -88,7 +89,7 @@
NameValuePair[] data = {new NameValuePair("request", "PostParameter"),
new NameValuePair("others", "bloggs")};
HttpClient client = new HttpClient();
- PostMethod post = new PostMethod("http://localhost:9080/post";);
+ PostMethod post = new PostMethod("http://localhost:9080/parameter";);
post.setRequestBody(data);
client.executeMethod(post);
InputStream response = post.getResponseBodyAsStream();
@@ -109,7 +110,7 @@
public void testPostParameterInURI() throws Exception {
HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod("http://localhost:9080/post?request=PostParameter&others=bloggs";);
+ PostMethod post = new
PostMethod("http://localhost:9080/parameter?request=PostParameter&others=bloggs";);
StringRequestEntity entity = new StringRequestEntity(POST_MESSAGE,
"application/xml", "UTF-8");
post.setRequestEntity(entity);
client.executeMethod(post);
@@ -117,6 +118,17 @@
String out = context.getTypeConverter().convertTo(String.class,
response);
assertEquals("Get a wrong output " , "PostParameter", out);
}
+
+ public void testPutParameterInURI() throws Exception {
+ HttpClient client = new HttpClient();
+ PutMethod put = new
PutMethod("http://localhost:9080/parameter?request=PutParameter&others=bloggs";);
+ StringRequestEntity entity = new StringRequestEntity(POST_MESSAGE,
"application/xml", "UTF-8");
+ put.setRequestEntity(entity);
+ client.executeMethod(put);
+ InputStream response = put.getResponseBodyAsStream();
+ String out = context.getTypeConverter().convertTo(String.class,
response);
+ assertEquals("Get a wrong output " , "PutParameter", out);
+ }
protected void invokeHttpEndpoint() throws IOException {
template.sendBodyAndHeader("http://localhost:9080/test";, expectedBody,
"Content-Type", "application/xml");
@@ -143,7 +155,7 @@
};
from("jetty:http://localhost:9080/hello?sessionSupport=true";).process(proc);
- Processor procPostParameters = new Processor() {
+ Processor procParameters = new Processor() {
public void process(Exchange exchange) throws Exception {
HttpServletRequest req =
exchange.getIn().getBody(HttpServletRequest.class);
String value = req.getParameter("request");
@@ -157,7 +169,7 @@
}
};
-
from("jetty:http://localhost:9080/post";).process(procPostParameters);
+
from("jetty:http://localhost:9080/parameter";).process(procParameters);
from("jetty:http://localhost:9080/postxml";).process(new
Processor() {
