Polished some examples
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16b988ef Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16b988ef Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16b988ef Branch: refs/heads/master Commit: 16b988ef979a27299adc820dda41e8e802af4e05 Parents: 07a0b9e Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Nov 28 18:17:27 2013 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Nov 28 18:20:37 2013 +0100 ---------------------------------------------------------------------- examples/camel-example-cafe/README.txt | 2 +- examples/camel-example-cafe/pom.xml | 221 +++++++++++++------------ examples/camel-example-console/README.txt | 2 +- examples/camel-example-console/pom.xml | 13 +- 4 files changed, 119 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/16b988ef/examples/camel-example-cafe/README.txt ---------------------------------------------------------------------- diff --git a/examples/camel-example-cafe/README.txt b/examples/camel-example-cafe/README.txt index 692a118..205b834 100644 --- a/examples/camel-example-cafe/README.txt +++ b/examples/camel-example-cafe/README.txt @@ -7,7 +7,7 @@ You will need to compile this example first: mvn compile To run the example type - mvn exec:java + mvn camel:run You can see the routing rules by looking at the java code in the src/main/java directory and the Spring XML configuration lives in http://git-wip-us.apache.org/repos/asf/camel/blob/16b988ef/examples/camel-example-cafe/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cafe/pom.xml b/examples/camel-example-cafe/pom.xml index 6f3471e..57b56bd 100755 --- a/examples/camel-example-cafe/pom.xml +++ b/examples/camel-example-cafe/pom.xml @@ -1,114 +1,115 @@ <?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.13-SNAPSHOT</version> - </parent> - - <artifactId>camel-example-cafe</artifactId> - <packaging>bundle</packaging> - <name>Camel :: Example :: Cafe </name> - <description>A cafe example showing how to work with Camel</description> - - <properties> - <camel.osgi.export.pkg>org.apache.camel.example.cafe.*</camel.osgi.export.pkg> - </properties> - - <dependencies> - - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-spring</artifactId> - </dependency> - - <!-- lets use log4j --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <!-- for testing --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>target/classes/features.xml</file> - <type>xml</type> - <classifier>features</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - - <!-- Allows the routes to be run via 'mvn camel:run' --> - <plugin> - <groupId>org.apache.camel</groupId> - <artifactId>camel-maven-plugin</artifactId> - <version>${project.version}</version> - </plugin> - - <!-- Allows the example to be run via 'mvn compile exec:java' --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <mainClass>org.apache.camel.example.cafe.CafeRouteBuilder</mainClass> - <includePluginDependencies>false</includePluginDependencies> - </configuration> - </plugin> - - </plugins> - </build> +<!-- + 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.13-SNAPSHOT</version> + </parent> + + <artifactId>camel-example-cafe</artifactId> + <packaging>bundle</packaging> + <name>Camel :: Example :: Cafe</name> + <description>A cafe example showing how to work with Camel</description> + + <properties> + <camel.osgi.export.pkg>org.apache.camel.example.cafe.*</camel.osgi.export.pkg> + </properties> + + <dependencies> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-spring</artifactId> + </dependency> + + <!-- lets use log4j --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + + <!-- for testing --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/classes/features.xml</file> + <type>xml</type> + <classifier>features</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + + <!-- Allows the routes to be run via 'mvn camel:run' --> + <plugin> + <groupId>org.apache.camel</groupId> + <artifactId>camel-maven-plugin</artifactId> + <version>${project.version}</version> + </plugin> + + <!-- Allows the example to be run via 'mvn compile exec:java' --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <configuration> + <mainClass>org.apache.camel.example.cafe.CafeRouteBuilder</mainClass> + <includePluginDependencies>false</includePluginDependencies> + </configuration> + </plugin> + + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/16b988ef/examples/camel-example-console/README.txt ---------------------------------------------------------------------- diff --git a/examples/camel-example-console/README.txt b/examples/camel-example-console/README.txt index 6e9ec99..7002036 100644 --- a/examples/camel-example-console/README.txt +++ b/examples/camel-example-console/README.txt @@ -7,7 +7,7 @@ You will need to compile this example first: mvn compile To run the example type - mvn exec:java + mvn camel:run You can see the routing rules by looking at the XML in the directory: src/main/resources/META-INF/spring http://git-wip-us.apache.org/repos/asf/camel/blob/16b988ef/examples/camel-example-console/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-console/pom.xml b/examples/camel-example-console/pom.xml index 08babc6..6ba7c75 100644 --- a/examples/camel-example-console/pom.xml +++ b/examples/camel-example-console/pom.xml @@ -59,15 +59,14 @@ <build> <plugins> - <!-- Allows the example to be run via 'mvn compile exec:java' --> + + <!-- Allows the routes to be run via 'mvn camel:run' --> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <configuration> - <mainClass>org.apache.camel.example.console.CamelConsoleMain</mainClass> - <includePluginDependencies>false</includePluginDependencies> - </configuration> + <groupId>org.apache.camel</groupId> + <artifactId>camel-maven-plugin</artifactId> + <version>${project.version}</version> </plugin> + </plugins> </build>
