You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/03/02 12:31:57 UTC
svn commit: r1076174 - in
/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet:
ServletComponent.java ServletEndpoint.java
Author: davsclaus
Date: Wed Mar 2 11:31:57 2011
New Revision: 1076174
URL: http://svn.apache.org/viewvc?rev=1076174&view=rev
Log:
CAMEL-3549: camel-servlet is not agnostic to how CamelContext is started in web apps. For example you can startup using 100% spring style using a listener.
Modified:
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java
Modified: camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java?rev=1076174&r1=1076173&r2=1076174&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java (original)
+++ camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java Wed Mar 2 11:31:57 2011
@@ -84,7 +84,8 @@ public class ServletComponent extends Ht
URI httpUri = URISupport.createRemainingURI(new URI(UnsafeUriCharactersEncoder.encode(uri)), CastUtils.cast(parameters));
uri = httpUri.toString();
- ServletEndpoint endpoint = createServletEndpoint(servletName, uri, this, httpUri, params, getHttpConnectionManager(), configurer);
+ ServletEndpoint endpoint = createServletEndpoint(uri, this, httpUri, params, getHttpConnectionManager(), configurer);
+ endpoint.setServletName(servletName);
setEndpointHeaderFilterStrategy(endpoint);
// prefer to use endpoint configured over component configured
@@ -117,11 +118,11 @@ public class ServletComponent extends Ht
/**
* Strategy to create the servlet endpoint.
*/
- protected ServletEndpoint createServletEndpoint(String servletName, String endpointUri,
+ protected ServletEndpoint createServletEndpoint(String endpointUri,
ServletComponent component, URI httpUri, HttpClientParams params,
HttpConnectionManager httpConnectionManager,
HttpClientConfigurer clientConfigurer) throws Exception {
- return new ServletEndpoint(servletName, endpointUri, component, httpUri, params, httpConnectionManager, clientConfigurer);
+ return new ServletEndpoint(endpointUri, component, httpUri, params, httpConnectionManager, clientConfigurer);
}
public void connect(HttpConsumer consumer) throws Exception {
Modified: camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java?rev=1076174&r1=1076173&r2=1076174&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java (original)
+++ camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletEndpoint.java Wed Mar 2 11:31:57 2011
@@ -36,10 +36,9 @@ public class ServletEndpoint extends Htt
super();
}
- public ServletEndpoint(String servletName, String endPointURI, ServletComponent component, URI httpUri, HttpClientParams params,
+ public ServletEndpoint(String endPointURI, ServletComponent component, URI httpUri, HttpClientParams params,
HttpConnectionManager httpConnectionManager, HttpClientConfigurer clientConfigurer) throws URISyntaxException {
super(endPointURI, component, httpUri, params, httpConnectionManager, clientConfigurer);
- this.servletName = servletName;
}
public void setServletName(String name) {