camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [3/5] CAMEL-7354: renamed camel-spark to camel-spark-rest to aovid ppl mistaking it for Apache Spark integration.
Date Tue, 01 Jul 2014 06:41:26 GMT
http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
deleted file mode 100644
index c2d382d..0000000
--- a/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-org.apache.camel.component.spark.SparkConverter
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/component/spark
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/component/spark b/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/component/spark
deleted file mode 100644
index 43fc06f001..0000000
--- a/components/camel-spark/src/main/resources/META-INF/services/org/apache/camel/component/spark
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class=org.apache.camel.component.spark.SparkComponent

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/components/camel-spark/src/test/java/org/apache/camel/component/spark/BaseSparkTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/java/org/apache/camel/component/spark/BaseSparkTest.java b/components/camel-spark/src/test/java/org/apache/camel/component/spark/BaseSparkTest.java
deleted file mode 100644
index ab5f0e7..0000000
--- a/components/camel-spark/src/test/java/org/apache/camel/component/spark/BaseSparkTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.spark;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-
-public abstract class BaseSparkTest extends CamelTestSupport {
-
-    protected int port;
-
-    public int getPort() {
-        return port;
-    }
-
-    @Override
-    public void setUp() throws Exception {
-        port = AvailablePortFinder.getNextAvailable(24500);
-        super.setUp();
-    }
-
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        CamelContext context = super.createCamelContext();
-
-        SparkComponent spark = context.getComponent("spark", SparkComponent.class);
-        spark.setPort(port);
-
-        return context;
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkAcceptTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkAcceptTest.java b/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkAcceptTest.java
deleted file mode 100644
index eb0df15..0000000
--- a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkAcceptTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.spark;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.http.HttpOperationFailedException;
-import org.junit.Test;
-
-public class CamelSparkAcceptTest extends BaseSparkTest {
-
-    @Test
-    public void testSparkGet() throws Exception {
-        getMockEndpoint("mock:foo").expectedMessageCount(1);
-
-        try {
-            template.requestBodyAndHeader("http://0.0.0.0:" + getPort() + "/hello", null, "Accept", "text/plain", String.class);
-            fail("Should fail");
-        } catch (CamelExecutionException e) {
-            HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause());
-            assertEquals(404, cause.getStatusCode());
-        }
-
-        String out2 = template.requestBodyAndHeader("http://0.0.0.0:" + getPort() + "/hello", null, "Accept", "application/json", String.class);
-        assertEquals("{ \"reply\": \"Bye World\" }", out2);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("spark:get:hello?accept=application/json")
-                        .to("mock:foo")
-                        .transform().constant("{ \"reply\": \"Bye World\" }");
-            }
-        };
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkParamTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkParamTest.java b/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkParamTest.java
deleted file mode 100644
index ad40fb4..0000000
--- a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkParamTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.spark;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
-
-public class CamelSparkParamTest extends BaseSparkTest {
-
-    @Test
-    public void testSparkGet() throws Exception {
-        getMockEndpoint("mock:foo").expectedMessageCount(1);
-        getMockEndpoint("mock:foo").expectedHeaderReceived("name", "world");
-
-        String out = template.requestBody("http://0.0.0.0:" + getPort() + "/hello/world", null, String.class);
-        assertEquals("Bye world", out);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("spark:get:/hello/:name")
-                        .to("mock:foo")
-                        .transform().simple("Bye ${header.name}");
-            }
-        };
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkRequestBeanTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkRequestBeanTest.java b/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkRequestBeanTest.java
deleted file mode 100644
index 5c7436d..0000000
--- a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkRequestBeanTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.spark;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
-import spark.Request;
-
-public class CamelSparkRequestBeanTest extends BaseSparkTest {
-
-    @Test
-    public void testSparkGet() throws Exception {
-        getMockEndpoint("mock:foo").expectedMessageCount(1);
-
-        String out = template.requestBody("http://0.0.0.0:" + getPort() + "/hello/camel/to/world", null, String.class);
-        assertEquals("Bye big world from camel", out);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("spark:get:/hello/*/to/*")
-                        .to("mock:foo")
-                        .bean(CamelSparkRequestBeanTest.class, "doSomething");
-            }
-        };
-    }
-
-    public String doSomething(Request request) {
-        return "Bye big " + request.splat()[1] + " from " + request.splat()[0];
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkRouteBuilderPostTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkRouteBuilderPostTest.java b/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkRouteBuilderPostTest.java
deleted file mode 100644
index b455e1c..0000000
--- a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkRouteBuilderPostTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.spark;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
-
-public class CamelSparkRouteBuilderPostTest extends BaseSparkTest {
-
-    @Test
-    public void testSparkPost() throws Exception {
-        getMockEndpoint("mock:foo").expectedMessageCount(1);
-
-        String out = template.requestBody("http://0.0.0.0:" + getPort() + "/hello", "I was here", String.class);
-        assertEquals("Bye I was here", out);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new SparkRouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                post("hello")
-                    .to("mock:foo")
-                    .transform().simple("Bye ${body}");
-            }
-        };
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkRouteBuilderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkRouteBuilderTest.java b/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkRouteBuilderTest.java
deleted file mode 100644
index e670b062..0000000
--- a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkRouteBuilderTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.spark;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
-
-public class CamelSparkRouteBuilderTest extends BaseSparkTest {
-
-    @Test
-    public void testSparkGet() throws Exception {
-        getMockEndpoint("mock:foo").expectedMessageCount(1);
-
-        String out = template.requestBody("http://0.0.0.0:" + getPort() + "/hello", null, String.class);
-        assertEquals("Bye World", out);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new SparkRouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                get("hello")
-                    .to("mock:foo")
-                    .transform().constant("Bye World");
-            }
-        };
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkSplatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkSplatTest.java b/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkSplatTest.java
deleted file mode 100644
index d6cfd27..0000000
--- a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkSplatTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.spark;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
-
-public class CamelSparkSplatTest extends BaseSparkTest {
-
-    @Test
-    public void testSparkGet() throws Exception {
-        getMockEndpoint("mock:foo").expectedMessageCount(1);
-
-        String out = template.requestBody("http://0.0.0.0:" + getPort() + "/hello/camel/to/world", null, String.class);
-        assertEquals("Bye big world from camel", out);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("spark:get:/hello/*/to/*")
-                        .to("mock:foo")
-                        .transform().simple("Bye big ${header.splat[1]} from ${header.splat[0]}");
-            }
-        };
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkTest.java b/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkTest.java
deleted file mode 100644
index 71279cf..0000000
--- a/components/camel-spark/src/test/java/org/apache/camel/component/spark/CamelSparkTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.spark;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.junit.Test;
-
-public class CamelSparkTest extends BaseSparkTest {
-
-    @Test
-    public void testSparkGet() throws Exception {
-        getMockEndpoint("mock:foo").expectedMessageCount(1);
-
-        String out = template.requestBody("http://0.0.0.0:" + getPort() + "/hello", null, String.class);
-        assertEquals("Bye World", out);
-
-        assertMockEndpointsSatisfied();
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("spark:get:hello")
-                        .to("mock:foo")
-                        .transform().constant("Bye World");
-            }
-        };
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/components/camel-spark/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/test/resources/log4j.properties b/components/camel-spark/src/test/resources/log4j.properties
deleted file mode 100644
index 01148a0..0000000
--- a/components/camel-spark/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,36 +0,0 @@
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-
-#
-# The logging properties used for eclipse testing, We want to see debug output on the console.
-#
-log4j.rootLogger=INFO, file
-
-#log4j.logger.org.apache.camel.component.spark=DEBUG
-
-# CONSOLE appender not used by default
-log4j.appender.out=org.apache.log4j.ConsoleAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
-#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.file.file=target/camel-spark-test.log
-log4j.appender.file.append=true

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 108ecc6..0d6c971 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -170,7 +170,7 @@
     <module>camel-sjms</module>
     <module>camel-soap</module>
     <module>camel-solr</module>
-    <module>camel-spark</module>
+    <module>camel-spark-rest</module>
     <module>camel-splunk</module>
     <module>camel-spring-batch</module>
     <module>camel-spring-javaconfig</module>

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-rest-tomcat/README.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-rest-tomcat/README.txt b/examples/camel-example-spark-rest-tomcat/README.txt
new file mode 100644
index 0000000..809c2ab
--- /dev/null
+++ b/examples/camel-example-spark-rest-tomcat/README.txt
@@ -0,0 +1,25 @@
+Camel Spark REST and Apache Tomcat example
+=======================================
+
+This example shows how to use Spark REST to define REST endpoints in Camel routes using the CamelSparkRouteBuilder DSL
+
+You will need to package this example first:
+  mvn package
+
+Spark requires Java 8, so you will need to use Java 8.
+
+To run the example deploy it in Apache Tomcat by copying the .war to the
+deploy folder of Apache Tomcat.
+
+And then hit this url from a web browser which has further
+instructions (use correct version number)
+  http://localhost:8080/camel-example-spark-rest-tomcat-{version}
+
+If you hit any problems please let us know on the Camel Forums
+  http://camel.apache.org/discussion-forums.html
+
+Please help us make Apache Camel better - we appreciate any feedback you may
+have.  Enjoy!
+
+------------------------
+The Camel riders!

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-rest-tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-rest-tomcat/pom.xml b/examples/camel-example-spark-rest-tomcat/pom.xml
new file mode 100755
index 0000000..c181982
--- /dev/null
+++ b/examples/camel-example-spark-rest-tomcat/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>examples</artifactId>
+    <version>2.14-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>camel-example-spark-rest-tomcat</artifactId>
+  <name>Camel :: Example :: Spark REST Tomcat</name>
+  <description>An example using Spark REST with Apache Tomcat</description>
+  <packaging>war</packaging>
+
+  <dependencies>
+
+    <!-- camel -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-spring</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-spark-rest</artifactId>
+      <!-- exclude javax servlet as its already part of the servlet container -->
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.jetty.orbit</groupId>
+          <artifactId>javax.servlet</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <!-- we need spring web -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
+
+    <!-- logging -->
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>${jetty9-version}</version>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-rest-tomcat/src/main/java/org/apache/camel/example/spark/MySparkRouteBuilder.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-rest-tomcat/src/main/java/org/apache/camel/example/spark/MySparkRouteBuilder.java b/examples/camel-example-spark-rest-tomcat/src/main/java/org/apache/camel/example/spark/MySparkRouteBuilder.java
new file mode 100644
index 0000000..ce7b137
--- /dev/null
+++ b/examples/camel-example-spark-rest-tomcat/src/main/java/org/apache/camel/example/spark/MySparkRouteBuilder.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.example.spark;
+
+import org.apache.camel.component.sparkrest.SparkRouteBuilder;
+
+/**
+ * Define REST services using {@link SparkRouteBuilder}.
+ */
+public class MySparkRouteBuilder extends SparkRouteBuilder {
+
+    @Override
+    public void configure() throws Exception {
+        // this is a very simple Camel route, but we can do more routing
+        // as SparkRouteBuilder extends the regular RouteBuilder from camel-core
+        // which means we can do any kind of Camel Java DSL routing here
+
+        // we only have a GET service, but we have PUT, POST, and all the other REST verbs we can use
+
+        get("hello/:me", "text/plain")
+            .transform().simple("Hello ${header.me}");
+
+        get("hello/:me", "application/json")
+            .transform().simple("{ \"message\": \"Hello ${header.me}\" }");
+
+        get("hello/:me", "text/xml")
+            .transform().simple("<message>Hello ${header.me}</message>");
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-rest-tomcat/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-rest-tomcat/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-spark-rest-tomcat/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/examples/camel-example-spark-rest-tomcat/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-rest-tomcat/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-rest-tomcat/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-spark-rest-tomcat/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/examples/camel-example-spark-rest-tomcat/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-rest-tomcat/src/main/resources/camel-config.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-rest-tomcat/src/main/resources/camel-config.xml b/examples/camel-example-spark-rest-tomcat/src/main/resources/camel-config.xml
new file mode 100755
index 0000000..fb98fce
--- /dev/null
+++ b/examples/camel-example-spark-rest-tomcat/src/main/resources/camel-config.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<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"
+       xsi:schemaLocation="
+         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+         http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+  <bean id="mySparkRoutes" class="org.apache.camel.example.spark.MySparkRouteBuilder"/>
+
+  <camelContext xmlns="http://camel.apache.org/schema/spring">
+
+    <routeBuilder ref="mySparkRoutes"/>
+
+  </camelContext>
+
+</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-rest-tomcat/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-rest-tomcat/src/main/resources/log4j.properties b/examples/camel-example-spark-rest-tomcat/src/main/resources/log4j.properties
new file mode 100755
index 0000000..6cf71c5
--- /dev/null
+++ b/examples/camel-example-spark-rest-tomcat/src/main/resources/log4j.properties
@@ -0,0 +1,28 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+
+# default properties to initialise log4j
+log4j.rootLogger=INFO, console
+
+# settings for specific packages
+#log4j.logger.org.apache.camel.component.sparkrest=DEBUG
+#log4j.logger.org.apache.camel=DEBUG
+
+# Console appender
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-rest-tomcat/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-rest-tomcat/src/main/webapp/WEB-INF/web.xml b/examples/camel-example-spark-rest-tomcat/src/main/webapp/WEB-INF/web.xml
new file mode 100755
index 0000000..831aeba
--- /dev/null
+++ b/examples/camel-example-spark-rest-tomcat/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+  <display-name>My Spark Application</display-name>
+
+  <!-- location of Camel Spring xml files -->
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>classpath:camel-config.xml</param-value>
+  </context-param>
+
+  <!-- the listener that configures camel-spark-rest in servlet mode -->
+  <!-- this listener must be defined first -->
+  <listener>
+    <listener-class>org.apache.camel.component.sparkrest.SparkServletContextListener</listener-class>
+  </listener>
+
+  <!-- the listener that kick-starts Spring -->
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+
+  <!-- to setup spark use the SparkFilter -->
+  <filter>
+    <filter-name>SparkFilter</filter-name>
+    <filter-class>spark.servlet.SparkFilter</filter-class>
+    <!-- must use Camels ServletSparkApplication as the application class -->
+    <init-param>
+      <param-name>applicationClass</param-name>
+      <param-value>org.apache.camel.component.sparkrest.ServletSparkApplication</param-value>
+    </init-param>
+  </filter>
+
+  <!-- define the url mapping for spark -->
+  <filter-mapping>
+    <filter-name>SparkFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+</web-app>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-rest-tomcat/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-rest-tomcat/src/main/webapp/index.html b/examples/camel-example-spark-rest-tomcat/src/main/webapp/index.html
new file mode 100644
index 0000000..d163f7e
--- /dev/null
+++ b/examples/camel-example-spark-rest-tomcat/src/main/webapp/index.html
@@ -0,0 +1,70 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<html>
+
+<body>
+<h2>Spark REST and Apache Tomcat example</h2>
+
+This example shows how to use Spark REST to define REST endpoints in Camel routes using the CamelSparkRouteBuilder DSL
+
+<br/>
+The routes are defined in Java code, in the <tt>org.apache.camel.example.sparkrest.MySparkRouteBuilder</tt> class.
+
+<p/>
+There is a <i>hello</i> REST service that supports different content-type
+ <ul>
+   <li>text/plain</li>
+   <li>text/xml</li>
+   <li>application/xml</li>
+ </ul>
+
+The REST service is defined using Spark syntax as <tt>hello/:me</tt> which means that it starts with a fixed <tt>hello/</tt>
+path, and then accepts a parameter which is named <b>:me</b> which will be mapped to a Camel header with key <b>me</b>.
+
+<br/>
+This allows you to access the REST service and include a parameter, for example
+<p/>
+    <tt>hello/world</tt>
+<p/>
+This means that world is the parameter.
+
+<p/>
+You can access the <i>text/plain</i> service from the web browser by clicking <a href="hello/yourname">this link</a>.
+<p/>
+You can try the <i>text/xml</i> or <i>application/json</i> from the command line using <b>curl</b> or similar tool.
+
+<pre>
+    curl -H "Accept: application/json" http://localhost:8080/camel-example-spark-rest-tomcat-{version}/hello/you
+    curl -H "Accept: text/xml" http://localhost:8080/camel-example-spark-rest-tomcat-{version}/hello/you
+</pre>
+
+This assume you installed the example by copying the .war as <tt>camel-example-spark-rest-tomcat-VERSION.war</tt>
+, where VERSION is the Camel version such as 2.14.0, into the <b>webapps</b> directory of Apache Tomcat.
+
+<p/>
+If you hit any problems please let us know on the
+<a href="http://camel.apache.org/discussion-forums.html">Camel Forums</a>
+<br/>
+<br/>
+Please help us make Apache Camel better - we appreciate any feedback you may
+have. Enjoy!
+<br/>
+<br/>
+The Camel riders!
+</body>
+
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-tomcat/README.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-tomcat/README.txt b/examples/camel-example-spark-tomcat/README.txt
deleted file mode 100644
index 962d2f2..0000000
--- a/examples/camel-example-spark-tomcat/README.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Camel Spark and Apache Tomcat example
-=======================================
-
-This example shows how to use Spark Java to define REST endpoints in Camel routes using the CamelSparkRouteBuilder DSL
-
-You will need to package this example first:
-  mvn package
-
-Spark requires Java 8, so you will need to use Java 8.
-
-To run the example deploy it in Apache Tomcat by copying the .war to the
-deploy folder of Apache Tomcat.
-
-And then hit this url from a web browser which has further
-instructions (use correct version number)
-  http://localhost:8080/camel-example-spark-tomcat-{version}
-
-If you hit any problems please let us know on the Camel Forums
-  http://camel.apache.org/discussion-forums.html
-
-Please help us make Apache Camel better - we appreciate any feedback you may
-have.  Enjoy!
-
-------------------------
-The Camel riders!

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-tomcat/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-tomcat/pom.xml b/examples/camel-example-spark-tomcat/pom.xml
deleted file mode 100755
index 8fa1ea8..0000000
--- a/examples/camel-example-spark-tomcat/pom.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.camel</groupId>
-    <artifactId>examples</artifactId>
-    <version>2.14-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>camel-example-spark-tomcat</artifactId>
-  <name>Camel :: Example :: Spark Tomcat</name>
-  <description>An example using Spark with Apache Tomcat</description>
-  <packaging>war</packaging>
-
-  <dependencies>
-
-    <!-- camel -->
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spark</artifactId>
-      <!-- exclude javax servlet as its already part of the servlet container -->
-      <exclusions>
-        <exclusion>
-          <groupId>org.eclipse.jetty.orbit</groupId>
-          <artifactId>javax.servlet</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <!-- we need spring web -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-    </dependency>
-
-    <!-- logging -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-maven-plugin</artifactId>
-        <version>${jetty9-version}</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-tomcat/src/main/java/org/apache/camel/example/spark/MySparkRouteBuilder.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-tomcat/src/main/java/org/apache/camel/example/spark/MySparkRouteBuilder.java b/examples/camel-example-spark-tomcat/src/main/java/org/apache/camel/example/spark/MySparkRouteBuilder.java
deleted file mode 100644
index e31d8b3..0000000
--- a/examples/camel-example-spark-tomcat/src/main/java/org/apache/camel/example/spark/MySparkRouteBuilder.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.example.spark;
-
-import org.apache.camel.component.spark.SparkRouteBuilder;
-
-/**
- * Define REST services using {@link SparkRouteBuilder}.
- */
-public class MySparkRouteBuilder extends SparkRouteBuilder {
-
-    @Override
-    public void configure() throws Exception {
-        // this is a very simple Camel route, but we can do more routing
-        // as SparkRouteBuilder extends the regular RouteBuilder from camel-core
-        // which means we can do any kind of Camel Java DSL routing here
-
-        // we only have a GET service, but we have PUT, POST, and all the other REST verbs we can use
-
-        get("hello/:me", "text/plain")
-            .transform().simple("Hello ${header.me}");
-
-        get("hello/:me", "application/json")
-            .transform().simple("{ \"message\": \"Hello ${header.me}\" }");
-
-        get("hello/:me", "text/xml")
-            .transform().simple("<message>Hello ${header.me}</message>");
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-tomcat/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-tomcat/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-spark-tomcat/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/examples/camel-example-spark-tomcat/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-tomcat/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-tomcat/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-spark-tomcat/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/examples/camel-example-spark-tomcat/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-tomcat/src/main/resources/camel-config.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-tomcat/src/main/resources/camel-config.xml b/examples/camel-example-spark-tomcat/src/main/resources/camel-config.xml
deleted file mode 100755
index fb98fce..0000000
--- a/examples/camel-example-spark-tomcat/src/main/resources/camel-config.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<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"
-       xsi:schemaLocation="
-         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-         http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-  <bean id="mySparkRoutes" class="org.apache.camel.example.spark.MySparkRouteBuilder"/>
-
-  <camelContext xmlns="http://camel.apache.org/schema/spring">
-
-    <routeBuilder ref="mySparkRoutes"/>
-
-  </camelContext>
-
-</beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-tomcat/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-tomcat/src/main/resources/log4j.properties b/examples/camel-example-spark-tomcat/src/main/resources/log4j.properties
deleted file mode 100755
index a6b00bb..0000000
--- a/examples/camel-example-spark-tomcat/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-## ------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ------------------------------------------------------------------------
-
-# default properties to initialise log4j
-log4j.rootLogger=INFO, console
-
-# settings for specific packages
-#log4j.logger.org.apache.camel.component.http=DEBUG
-#log4j.logger.org.apache.camel.component.servlet=DEBUG
-#log4j.logger.org.apache.camel=DEBUG
-
-# Console appender
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-tomcat/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-tomcat/src/main/webapp/WEB-INF/web.xml b/examples/camel-example-spark-tomcat/src/main/webapp/WEB-INF/web.xml
deleted file mode 100755
index a7ba4e9..0000000
--- a/examples/camel-example-spark-tomcat/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-  <display-name>My Spark Application</display-name>
-
-  <!-- location of Camel Spring xml files -->
-  <context-param>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>classpath:camel-config.xml</param-value>
-  </context-param>
-
-  <!-- the listener that configures camel-spark in servlet mode -->
-  <!-- this listener must be first -->
-  <listener>
-    <listener-class>org.apache.camel.component.spark.SparkServletContextListener</listener-class>
-  </listener>
-
-  <!-- the listener that kick-starts Spring -->
-  <listener>
-    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
-
-  <!-- to setup spark use the SparkFilter -->
-  <filter>
-    <filter-name>SparkFilter</filter-name>
-    <filter-class>spark.servlet.SparkFilter</filter-class>
-    <!-- must use Camels ServletSparkApplication as the application class -->
-    <init-param>
-      <param-name>applicationClass</param-name>
-      <param-value>org.apache.camel.component.spark.ServletSparkApplication</param-value>
-    </init-param>
-  </filter>
-
-  <!-- define the url mapping for spark -->
-  <filter-mapping>
-    <filter-name>SparkFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-</web-app>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/camel-example-spark-tomcat/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/examples/camel-example-spark-tomcat/src/main/webapp/index.html b/examples/camel-example-spark-tomcat/src/main/webapp/index.html
deleted file mode 100644
index be192f6..0000000
--- a/examples/camel-example-spark-tomcat/src/main/webapp/index.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<html>
-
-<body>
-<h2>Spark and Apache Tomcat example</h2>
-
-This example shows how to use Spark Java to define REST endpoints in Camel routes using the CamelSparkRouteBuilder DSL
-
-<br/>
-The routes are defined in Java code, in the <tt>org.apache.camel.example.spark.MySparkRouteBuilder</tt> class.
-
-<p/>
-There is a <i>hello</i> REST service that supports different content-type
- <ul>
-   <li>text/plain</li>
-   <li>text/xml</li>
-   <li>application/xml</li>
- </ul>
-
-The REST service is defined using Spark syntax as <tt>hello/:me</tt> which means that it starts with a fixed <tt>hello/</tt>
-path, and then accepts a parameter which is named <b>:me</b> which will be mapped to a Camel header with key <b>me</b>.
-
-<br/>
-This allows you to access the REST service and include a parameter, for example
-<p/>
-    <tt>hello/world</tt>
-<p/>
-This means that world is the parameter.
-
-<p/>
-You can access the <i>text/plain</i> service from the web browser by clicking <a href="hello/yourname">this link</a>.
-<p/>
-You can try the <i>text/xml</i> or <i>application/json</i> from the command line using <b>curl</b> or similar tool.
-
-<pre>
-    curl -H "Accept: application/json" http://localhost:8080/camel-example-spark-tomcat/hello/you
-    curl -H "Accept: text/xml" http://localhost:8080/camel-example-spark-tomcat/hello/you
-</pre>
-
-This assume you installed the example by copying the .war as <tt>camel-example-spark-tomcat.war</tt>
-into the <b>webapps</b> directory of Apache Tomcat.
-
-<p/>
-If you hit any problems please let us know on the
-<a href="http://camel.apache.org/discussion-forums.html">Camel Forums</a>
-<br/>
-<br/>
-Please help us make Apache Camel better - we appreciate any feedback you may
-have. Enjoy!
-<br/>
-<br/>
-The Camel riders!
-</body>
-
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 2a65ab7..7e5a5fb 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -67,7 +67,7 @@
     <module>camel-example-servlet-tomcat-blueprintweb</module>
     <module>camel-example-servlet-tomcat-no-spring</module>
     <module>camel-example-simplejirabot</module>
-    <module>camel-example-spark-tomcat</module>
+    <module>camel-example-spark-rest-tomcat</module>
     <module>camel-example-spring</module>
     <module>camel-example-spring-javaconfig</module>
     <module>camel-example-spring-jms</module>

http://git-wip-us.apache.org/repos/asf/camel/blob/3c2252aa/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fce6bed..d68fd41 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -374,7 +374,7 @@
     <solr-bundle-version>4.6.1_1</solr-bundle-version>
     <solr-version>4.6.1</solr-version>
     <solr-version-range>[4.5,5)</solr-version-range>
-    <spark-version>2.0.0</spark-version>
+    <spark-rest-version>2.0.0</spark-rest-version>
     <splunk-version>1.3.0_1</splunk-version>
     <spring-batch-version>2.2.5.RELEASE</spring-batch-version>
     <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
@@ -1159,7 +1159,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-spark</artifactId>
+        <artifactId>camel-spark-rest</artifactId>
         <version>${project.version}</version>
       </dependency>    
       <dependency>
@@ -1488,7 +1488,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-example-spark-tomcat</artifactId>
+        <artifactId>camel-example-spark-rest-tomcat</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>


Mime
View raw message