Author: ningjiang Date: Thu Jul 16 09:45:05 2009 New Revision: 794608 URL: http://svn.apache.org/viewvc?rev=794608&view=rev Log: CAMEL-1833 Added the snippet tags for camel-servlet wiki
Modified: camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web.xml 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/support/ServletActivator.java camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletContext.xml Modified: camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java?rev=794608&r1=794607&r2=794608&view=diff ============================================================================== --- camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java (original) +++ camel/trunk/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/HttpClientRouteTest.java Thu Jul 16 09:45:05 2009 @@ -59,6 +59,7 @@ return new RouteBuilder() { public void configure() { errorHandler(noErrorHandler()); + // START SNIPPET: route from("servlet:///hello").process(new Processor() { public void process(Exchange exchange) throws Exception { String contentType = exchange.getIn().getHeader(Exchange.CONTENT_TYPE, String.class); @@ -71,6 +72,7 @@ exchange.getOut().setBody("<b>Hello World</b>"); } }); + // END SNIPPET: route } }; } Modified: camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web.xml?rev=794608&r1=794607&r2=794608&view=diff ============================================================================== --- camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web.xml (original) +++ camel/trunk/components/camel-servlet/src/test/resources/org/apache/camel/component/servlet/web.xml Thu Jul 16 09:45:05 2009 @@ -22,7 +22,7 @@ specific language governing permissions and limitations under the License. --> - +<!-- START SNIPPET: web --> <web-app> <servlet> @@ -42,5 +42,5 @@ <url-pattern>/services/*</url-pattern> </servlet-mapping> - -</web-app> \ No newline at end of file +</web-app> +<!-- END SNIPPET: web --> \ No newline at end of file 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=794608&r1=794607&r2=794608&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 Jul 16 09:45:05 2009 @@ -47,7 +47,7 @@ @Test public void testSendMessage() { - String endpointURI = "http://localhost:9080/camel/services"; + String endpointURI = "http://localhost:9080/camel/services/hello"; String response = template.requestBody(endpointURI, "Hello World", String.class); assertEquals("response is " , "Echo Hello World", response); } 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=794608&r1=794607&r2=794608&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 Jul 16 09:45:05 2009 @@ -15,7 +15,7 @@ * limitations under the License. */ package org.apache.camel.itest.osgi.servlet.support; - +// START SNIPPET: activator import java.util.Dictionary; import java.util.Hashtable; @@ -50,7 +50,7 @@ final Dictionary initParams = new Hashtable(); initParams.put("matchOnUriPrefix", "false"); initParams.put("servlet-name", "camelServlet"); - httpService.registerServlet("/camel", // alias + httpService.registerServlet("/camel/services", // alias (Servlet)new CamelHttpTransportServlet(), // register servlet initParams, // init params httpContext // http context @@ -71,3 +71,4 @@ } } +// END SNIPPET: activator Modified: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletContext.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletContext.xml?rev=794608&r1=794607&r2=794608&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletContext.xml (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/servlet/CamelServletContext.xml Thu Jul 16 09:45:05 2009 @@ -30,7 +30,7 @@ <camelContext xmlns="http://camel.apache.org/schema/spring"> <camel:route> - <camel:from uri="servlet:///services"/> + <camel:from uri="servlet:///hello"/> <camel:process ref="servletProcessor"/> </camel:route> </camelContext>