Author: davsclaus
Date: Thu Mar 3 10:05:00 2011
New Revision: 1076574
URL: http://svn.apache.org/viewvc?rev=1076574&view=rev
Log:
CAMEL-3549: Fixed and made the servlet with osgi unit tests simpler and easier
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletWithServletServiceContext.xml
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/ServletServiceContext.xml
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java?rev=1076574&r1=1076573&r2=1076574&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
Thu Mar 3 10:05:00 2011
@@ -38,7 +38,7 @@ public class ServletComponentTest extend
public void testSendMessage() {
String endpointURI = "http://localhost:9080/camel/services/hello";;
String response = template.requestBody(endpointURI, "Hello World",
String.class);
- assertEquals("response is " , "Echo Hello World", response);
+ assertEquals("Echo Hello World", response);
}
@Configuration
@@ -58,8 +58,7 @@ public class ServletComponentTest extend
// using the features to install the camel components
scanFeatures(getCamelKarafFeatureUrl(),
"camel-core", "camel-spring", "camel-test",
"camel-http", "camel-servlet"),
-
-
+
workingDirectory("target/paxrunner/"),
felix(), equinox());
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java?rev=1076574&r1=1076573&r2=1076574&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java
Thu Mar 3 10:05:00 2011
@@ -38,7 +38,7 @@ public class ServletServicesTest extends
public void testSendMessage() {
String endpointURI = "http://localhost:9080/camel/services/hello";;
String response = template.requestBody(endpointURI, "Hello World",
String.class);
- assertEquals("response is " , "Echo Hello World", response);
+ assertEquals("Echo Hello World", response);
}
@Configuration
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java?rev=1076574&r1=1076573&r2=1076574&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
Thu Mar 3 10:05:00 2011
@@ -15,12 +15,11 @@
* limitations under the License.
*/
package org.apache.camel.itest.osgi.servlet.support;
+
// START SNIPPET: activator
import java.util.Dictionary;
import java.util.Hashtable;
-import javax.servlet.Servlet;
-
import org.apache.camel.component.servlet.CamelHttpTransportServlet;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
@@ -61,7 +60,7 @@ public final class ServletActivator impl
httpServiceRef =
bundleContext.getServiceReference(HttpService.class.getName());
if (httpServiceRef != null && !registerService) {
- LOG.info("Regist the servlet service");
+ LOG.info("Register the servlet service");
final HttpService httpService =
(HttpService)bundleContext.getService(httpServiceRef);
if (httpService != null) {
// create a default context to share between registrations
@@ -69,9 +68,9 @@ public final class ServletActivator impl
// register the hello world servlet
final Dictionary<String, String> initParams = new
Hashtable<String, String>();
initParams.put("matchOnUriPrefix", "false");
- initParams.put("servlet-name", "camelServlet");
+ initParams.put("servlet-name", "CamelServlet");
httpService.registerServlet("/camel/services", // alias
- (Servlet)new CamelHttpTransportServlet(), // register
servlet
+ new CamelHttpTransportServlet(), // register servlet
initParams, // init params
httpContext // http context
);
@@ -84,7 +83,7 @@ public final class ServletActivator impl
try {
registerServlet(bc);
} catch (Exception e) {
- LOG.error("Can't register the servlet, the reason is " + e);
+ LOG.error("Cannot register the servlet, the reason is " + e);
}
}
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletWithServletServiceContext.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletWithServletServiceContext.xml?rev=1076574&r1=1076573&r2=1076574&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletWithServletServiceContext.xml
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletWithServletServiceContext.xml
Thu Mar 3 10:05:00 2011
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <!-- START SNIPPET: camelContext -->
+<!-- START SNIPPET: camelContext -->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:camel="http://camel.apache.org/schema/spring";
@@ -25,20 +25,19 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <osgi:reference id="camelHttpTransportServlet"
interface="org.apache.camel.component.servlet.CamelServletService"/>
-
- <bean id="servlet"
class="org.apache.camel.component.servlet.ServletComponent">
- <property name = "camelServletService" ref="camelHttpTransportServlet" />
- </bean>
+ <!-- refer to the CamelServlet using servlet as id, which we can use in
the Camel routes -->
+ <osgi:reference id="servlet" interface="javax.servlet.Servlet"
bean-name="camelServlet"/>
- <bean id="servletProcessor"
class="org.apache.camel.itest.osgi.servlet.ServletProcessor" />
-
- <camelContext xmlns="http://camel.apache.org/schema/spring";>
- <camel:route>
- <camel:from uri="servlet:///hello"/>
- <camel:process ref="servletProcessor"/>
- </camel:route>
- </camelContext>
+ <!-- a processor to compute the reply to send back -->
+ <bean id="servletProcessor"
class="org.apache.camel.itest.osgi.servlet.ServletProcessor"/>
+
+ <camelContext xmlns="http://camel.apache.org/schema/spring";>
+ <route>
+ <!-- notice how we can use the servlet scheme which is that
osgi:reference above -->
+ <from uri="servlet:///hello"/>
+ <process ref="servletProcessor"/>
+ </route>
+ </camelContext>
</beans>
<!-- END SNIPPET: camelContext -->
\ No newline at end of file
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/ServletServiceContext.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/ServletServiceContext.xml?rev=1076574&r1=1076573&r2=1076574&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/ServletServiceContext.xml
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/ServletServiceContext.xml
Thu Mar 3 10:05:00 2011
@@ -22,13 +22,14 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd";>
-
- <bean id="osgiServlet"
class="org.apache.camel.component.servlet.CamelHttpTransportServlet"/>
-
- <osgi:service ref="osgiServlet">
+
+ <!-- define the Camel servlet -->
+ <bean id="camelServlet"
class="org.apache.camel.component.servlet.CamelHttpTransportServlet"/>
+
+ <!-- enlist it in OSGi HTTP service registry -->
+ <osgi:service ref="camelServlet">
<osgi:interfaces>
<value>javax.servlet.Servlet</value>
-
<value>org.apache.camel.component.servlet.CamelServletService</value>
</osgi:interfaces>
<osgi:service-properties>
<entry key="alias" value="/camel/services" />
