Author: davsclaus
Date: Sun Aug 10 09:11:48 2008
New Revision: 684539
URL: http://svn.apache.org/viewvc?rev=684539&view=rev
Log:
CAMEL-628: added wiki sample for jetty wiki documentation. Polished code.
Added:
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
(with props)
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpClientConfigurer.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpExchange.java
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java?rev=684539&r1=684538&r2=684539&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpBinding.java
Sun Aug 10 09:11:48 2008
@@ -124,7 +124,6 @@
return headerFilterStrategy != null
&& !headerFilterStrategy.applyFilterToCamelHeaders(headerName,
headerValue);
-
}
/*
@@ -171,5 +170,4 @@
this.useReaderForPayload = useReaderForPayload;
}
-
}
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpClientConfigurer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpClientConfigurer.java?rev=684539&r1=684538&r2=684539&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpClientConfigurer.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpClientConfigurer.java
Sun Aug 10 09:11:48 2008
@@ -24,10 +24,9 @@
* @version $Revision$
*/
public interface HttpClientConfigurer {
+
/**
* Configure the HttpClient such as setting the authentication or proxying
details
- *
- * @param client
*/
void configureHttpClient(HttpClient client);
}
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java?rev=684539&r1=684538&r2=684539&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
Sun Aug 10 09:11:48 2008
@@ -38,9 +38,7 @@
public class HttpComponent extends DefaultComponent<HttpExchange> implements
HeaderFilterStrategyAware {
private HttpClientConfigurer httpClientConfigurer;
-
private HttpConnectionManager httpConnectionManager = new
MultiThreadedHttpConnectionManager();
-
private HeaderFilterStrategy headerFilterStrategy;
public HttpComponent() {
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java?rev=684539&r1=684538&r2=684539&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
Sun Aug 10 09:11:48 2008
@@ -114,8 +114,6 @@
/**
* Provide access to the client parameters used on new [EMAIL PROTECTED]
HttpClient} instances
* used by producers or consumers of this endpoint.
- *
- * @param clientParams
*/
public void setClientParams(HttpClientParams clientParams) {
this.clientParams = clientParams;
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpExchange.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpExchange.java?rev=684539&r1=684538&r2=684539&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpExchange.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpExchange.java
Sun Aug 10 09:11:48 2008
@@ -47,8 +47,6 @@
/**
* Returns the underlying Servlet request for inbound HTTP requests
- *
- * @return the underlying Servlet request for inbound HTTP requests
*/
public HttpServletRequest getRequest() {
return request;
@@ -56,8 +54,6 @@
/**
* Returns the underlying Servlet response for inbound HTTP requests
- *
- * @return the underlying Servlet response for inbound HTTP requests
*/
public HttpServletResponse getResponse() {
return response;
Added:
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java?rev=684539&view=auto
==============================================================================
---
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
(added)
+++
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
Sun Aug 10 09:11:48 2008
@@ -0,0 +1,52 @@
+package org.apache.camel.component.jetty;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * Unit test for wiki demonstration.
+ */
+public class JettyRouteTest extends ContextTestSupport {
+
+ public void testSendToJetty() throws Exception {
+ Object response =
template.requestBody("http://localhost:8080/myapp/myservice";, "bookid=123");
+ // convert the response to a String
+ String body = context.getTypeConverter().convertTo(String.class,
response);
+ assertEquals("<html><body>Book 123 is Camel in Action</body></html>",
body);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ // START SNIPPET: e1
+
from("jetty:http://localhost:8080/myapp/myservice";).process(new
MyBookService());
+ // END SNIPPET: e1
+ }
+ };
+ }
+
+ // START SNIPPET: e2
+ public class MyBookService implements Processor {
+ public void process(Exchange exchange) throws Exception {
+ // just get the body as a string
+ String body = exchange.getIn().getBody(String.class);
+
+ // we have access to the HttpServletRequest here and we can grab
it if we need it
+ HttpServletRequest req =
exchange.getIn().getBody(HttpServletRequest.class);
+ assertNotNull(req);
+
+ // for unit testing
+ assertEquals("bookid=123", body);
+
+ // send a html response
+ exchange.getOut(true).setBody("<html><body>Book 123 is Camel in
Action</body></html>");
+ }
+ }
+ // END SNIPPET: e2
+
+}
Propchange:
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
