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 2009/02/02 03:36:57 UTC
svn commit: r739907 - in /camel/branches/camel-1.x: ./
components/camel-restlet/src/test/java/org/apache/camel/component/restlet/
components/camel-restlet/src/test/java/org/apache/camel/component/restlet/route/
Author: ningjiang
Date: Mon Feb 2 02:36:57 2009
New Revision: 739907
URL: http://svn.apache.org/viewvc?rev=739907&view=rev
Log:
Merged revisions 739904 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r739904 | ningjiang | 2009-02-02 10:23:41 +0800 (Mon, 02 Feb 2009) | 1 line
Changed the service port number to avoid the port confliction of the CI windows box
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java
camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/route/TestRouteBuilder.java
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 2 02:36:57 2009
@@ -1 +1 @@
-/camel/trunk:739733
+/camel/trunk:739733,739904
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java?rev=739907&r1=739906&r2=739907&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java (original)
+++ camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletPostContentTest.java Mon Feb 2 02:36:57 2009
@@ -41,7 +41,7 @@
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("restlet:http://localhost:8080/users/{username}?restletMethod=POST")
+ from("restlet:http://localhost:9080/users/{username}?restletMethod=POST")
.process(new SetUserProcessor());
}
@@ -57,7 +57,7 @@
}
public void testPostBody() throws Exception {
- HttpMethod method = new PostMethod("http://localhost:8080/users/homer");
+ HttpMethod method = new PostMethod("http://localhost:9080/users/homer");
RequestEntity requestEntity = new StringRequestEntity(MSG_BODY, null, null);
((EntityEnclosingMethod)method).setRequestEntity(requestEntity);
HttpClient client = new HttpClient();
Modified: camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java?rev=739907&r1=739906&r2=739907&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java (original)
+++ camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java Mon Feb 2 02:36:57 2009
@@ -40,10 +40,10 @@
// Restlet producer to use POST method. The RestletMethod=post will be stripped
// before request is sent.
from("direct:start").setHeader("id", constant(ID))
- .to("restlet:http://localhost:8080/orders?restletMethod=post&foo=bar");
+ .to("restlet:http://localhost:9080/orders?restletMethod=post&foo=bar");
// Restlet consumer to handler POST method
- from("restlet:http://localhost:8080/orders?restletMethod=post").process(new Processor() {
+ from("restlet:http://localhost:9080/orders?restletMethod=post").process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody(
"received [" + exchange.getIn().getBody(String.class)
@@ -53,7 +53,7 @@
});
// Restlet consumer default to handle GET method
- from("restlet:http://localhost:8080/orders/{id}/{x}").process(new Processor() {
+ from("restlet:http://localhost:9080/orders/{id}/{x}").process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody(
"received GET request with id="
@@ -75,7 +75,7 @@
public void testConsumer() throws IOException {
Client client = new Client(Protocol.HTTP);
Response response = client.handle(new Request(Method.GET,
- "http://localhost:8080/orders/99991/6"));
+ "http://localhost:9080/orders/99991/6"));
assertEquals("received GET request with id=99991 and x=6",
response.getEntity().getText());
}
@@ -83,7 +83,7 @@
public void testUnhandledConsumer() throws IOException {
Client client = new Client(Protocol.HTTP);
Response response = client.handle(new Request(Method.POST,
- "http://localhost:8080/orders/99991/6"));
+ "http://localhost:9080/orders/99991/6"));
// expect error status as no Restlet consumer to handle POST method
assertEquals(Status.CLIENT_ERROR_NOT_FOUND, response.getStatus());
assertNotNull(response.getEntity().getText());
Modified: camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/route/TestRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/route/TestRouteBuilder.java?rev=739907&r1=739906&r2=739907&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/route/TestRouteBuilder.java (original)
+++ camel/branches/camel-1.x/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/route/TestRouteBuilder.java Mon Feb 2 02:36:57 2009
@@ -31,7 +31,7 @@
public void configure() throws Exception {
// START SNIPPET: consumer_route
- from("restlet:http://localhost:8080/securedOrders?restletMethod=post&restletRealmRef=realm").process(new Processor() {
+ from("restlet:http://localhost:9080/securedOrders?restletMethod=post&restletRealmRef=realm").process(new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getOut().setBody(
"received [" + exchange.getIn().getBody()
@@ -45,7 +45,7 @@
// Note: restletMethod and restletRealmRef are stripped
// from the query before a request is sent as they are
// only processed by Camel.
- from("direct:start-auth").to("restlet:http://localhost:8080/securedOrders?restletMethod=post");
+ from("direct:start-auth").to("restlet:http://localhost:9080/securedOrders?restletMethod=post");
// END SNIPPET: producer_route
}