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/08 08:48:21 UTC
svn commit: r1079283 - in /camel/trunk/components/camel-servlet: ./
src/main/java/org/apache/camel/component/servlet/
src/main/java/org/apache/camel/component/servlet/osgi/
Author: davsclaus
Date: Tue Mar 8 07:48:21 2011
New Revision: 1079283
URL: http://svn.apache.org/viewvc?rev=1079283&view=rev
Log:
CAMEL-3549: Fixed camel-servlet feature not being able to validate.
Modified:
camel/trunk/components/camel-servlet/pom.xml
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/DefaultHttpRegistry.java
camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/osgi/OsgiServletRegisterer.java
Modified: camel/trunk/components/camel-servlet/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/pom.xml?rev=1079283&r1=1079282&r2=1079283&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/pom.xml (original)
+++ camel/trunk/components/camel-servlet/pom.xml Tue Mar 8 07:48:21 2011
@@ -21,6 +21,7 @@
</properties>
<dependencies>
+
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
@@ -44,10 +45,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core-xml</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-http</artifactId>
<exclusions>
<exclusion>
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=1079283&r1=1079282&r2=1079283&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 Tue Mar 8 07:48:21 2011
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.servlet;
-import javax.annotation.Resource;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -31,8 +30,7 @@ import org.slf4j.LoggerFactory;
public class CamelHttpTransportServlet extends CamelServlet {
private static final long serialVersionUID = -1797014782158930490L;
private static final transient Logger LOG = LoggerFactory.getLogger(CamelHttpTransportServlet.class);
-
- @Resource
+
private HttpRegistry httpRegistry;
@Override
Modified: camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java?rev=1079283&r1=1079282&r2=1079283&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java (original)
+++ camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/DefaultHttpRegistry.java Tue Mar 8 07:48:21 2011
@@ -43,8 +43,6 @@ public class DefaultHttpRegistry impleme
/**
* Lookup or create a HttpRegistry
- * @param registry
- * @return
*/
public static synchronized HttpRegistry getSingletonHttpRegistry() {
if (singleton == null) {
@@ -53,9 +51,6 @@ public class DefaultHttpRegistry impleme
return singleton;
}
- /* (non-Javadoc)
- * @see org.apache.camel.component.servlet.HttpRegistry#register(org.apache.camel.component.http.HttpConsumer)
- */
@Override
public void register(HttpConsumer consumer) {
LOG.debug("Registering consumer for path {} providers present: {}",
@@ -66,9 +61,6 @@ public class DefaultHttpRegistry impleme
}
}
- /* (non-Javadoc)
- * @see org.apache.camel.component.servlet.HttpRegistry#unregister(org.apache.camel.component.http.HttpConsumer)
- */
@Override
public void unregister(HttpConsumer consumer) {
LOG.debug("Unregistering consumer for path {} ", consumer.getPath());
@@ -94,9 +86,6 @@ public class DefaultHttpRegistry impleme
}
}
- /* (non-Javadoc)
- * @see org.apache.camel.component.servlet.HttpRegistry#register(org.apache.camel.component.http.CamelServlet)
- */
@Override
public void register(CamelServlet provider) {
LOG.debug("Registering CamelServlet with name {} consumers present: {}",
@@ -107,9 +96,6 @@ public class DefaultHttpRegistry impleme
}
}
- /* (non-Javadoc)
- * @see org.apache.camel.component.servlet.HttpRegistry#unregister(org.apache.camel.component.http.CamelServlet)
- */
@Override
public void unregister(CamelServlet provider) {
providers.remove(provider);
Modified: camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/osgi/OsgiServletRegisterer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/osgi/OsgiServletRegisterer.java?rev=1079283&r1=1079282&r2=1079283&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/osgi/OsgiServletRegisterer.java (original)
+++ camel/trunk/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/osgi/OsgiServletRegisterer.java Tue Mar 8 07:48:21 2011
@@ -29,7 +29,6 @@ import org.osgi.service.http.HttpService
* HttpService</a>
*
* See src/test/resources/osgiservletregisterer.xml
- *
*/
public class OsgiServletRegisterer {