Author: davsclaus
Date: Wed Mar 6 13:00:31 2013
New Revision: 1453319
URL: http://svn.apache.org/r1453319
Log:
CAMEL-6125: Fixed servlet test in OSGi as they register a custom HttpRegistry
Modified:
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
Modified:
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java?rev=1453319&r1=1453318&r2=1453319&view=diff
==============================================================================
---
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
(original)
+++
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/CamelHttpTransportServlet.java
Wed Mar 6 13:00:31 2013
@@ -105,7 +105,12 @@ public class CamelHttpTransportServlet e
@Override
public String toString() {
- return "CamelHttpTransportServlet[name=" + getServletName() + ",
contextPath=" + getServletConfig().getServletContext().getContextPath() + "]";
+ String name = getServletName();
+ if (name != null) {
+ return "CamelHttpTransportServlet[name=" + getServletName() + "]";
+ } else {
+ return "CamelHttpTransportServlet";
+ }
}
}
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=1453319&r1=1453318&r2=1453319&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 6 13:00:31 2013
@@ -37,14 +37,7 @@ import org.apache.commons.httpclient.par
public class ServletComponent extends HttpComponent {
private String servletName = "CamelServlet";
-
- public String getServletName() {
- return servletName;
- }
-
- public void setServletName(String servletName) {
- this.servletName = servletName;
- }
+ private HttpRegistry httpRegistry;
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
@@ -118,7 +111,10 @@ public class ServletComponent extends Ht
public void connect(HttpConsumer consumer) throws Exception {
ServletConsumer sc = (ServletConsumer) consumer;
String name = sc.getEndpoint().getServletName();
- HttpRegistry registry = DefaultHttpRegistry.getHttpRegistry(name);
+ HttpRegistry registry = httpRegistry;
+ if (registry == null) {
+ registry = DefaultHttpRegistry.getHttpRegistry(name);
+ }
registry.register(consumer);
}
@@ -126,8 +122,28 @@ public class ServletComponent extends Ht
public void disconnect(HttpConsumer consumer) throws Exception {
ServletConsumer sc = (ServletConsumer) consumer;
String name = sc.getEndpoint().getServletName();
- HttpRegistry registry = DefaultHttpRegistry.getHttpRegistry(name);
+ HttpRegistry registry = httpRegistry;
+ if (registry == null) {
+ registry = DefaultHttpRegistry.getHttpRegistry(name);
+ }
registry.unregister(consumer);
}
+ public String getServletName() {
+ return servletName;
+ }
+
+ public void setServletName(String servletName) {
+ this.servletName = servletName;
+ }
+
+ public HttpRegistry getHttpRegistry() {
+ return httpRegistry;
+ }
+
+ public void setHttpRegistry(HttpRegistry httpRegistry) {
+ this.httpRegistry = httpRegistry;
+ }
+
+
}
\ No newline at end of file