Repository: camel Updated Branches: refs/heads/camel-2.15.x e3c695004 -> 0d8635d2f
Fixed web archetype and polished it Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0d8635d2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0d8635d2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0d8635d2 Branch: refs/heads/camel-2.15.x Commit: 0d8635d2f5016dbc2ca1affd0fdfa0ddf7bee5e0 Parents: e3c6950 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Jun 5 10:07:01 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Jun 5 10:21:11 2015 +0200 ---------------------------------------------------------------------- .../META-INF/maven/archetype-metadata.xml | 3 +++ .../src/main/webapp/WEB-INF/applicationContext.xml | 2 +- .../archetype-resources/src/main/webapp/index.html | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0d8635d2/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index a73750d..e0e6b3b 100644 --- a/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -27,6 +27,9 @@ <requiredProperty key="jetty-version"> <defaultValue>${jetty-version}</defaultValue> </requiredProperty> + <requiredProperty key="jetty-plugin-version"> + <defaultValue>${jetty-plugin-version}</defaultValue> + </requiredProperty> <requiredProperty key="log4j-version"> <defaultValue>${log4j-version}</defaultValue> </requiredProperty> http://git-wip-us.apache.org/repos/asf/camel/blob/0d8635d2/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml index 8ee1b03..d12a23c 100644 --- a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml +++ b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml @@ -28,7 +28,7 @@ <route id="timer-to-console"> <from uri="timer://foo?fixedRate=true&period=10s"/> <transform> - <simple>Hello Web Application, how are you?</simple> + <simple>I am ${sysenv.HOSTNAME} and I have run ${header.CamelTimerCounter} times</simple> </transform> <to uri="stream:out"/> </route> http://git-wip-us.apache.org/repos/asf/camel/blob/0d8635d2/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html new file mode 100644 index 0000000..7e212ba --- /dev/null +++ b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/src/main/webapp/index.html @@ -0,0 +1,12 @@ +<html> + +<body> +<h2>Camel Archetype Web</h2> + + This is a simple example that was created with camel-archetype-web. + <p/> + A Camel route is deployed that logs to system.out every 10 seconds. + +</body> + +</html> \ No newline at end of file
