Index: camel-example-docs/src/test/java/org/apache/camel/example/docs/IntegrationTest.java
===================================================================
--- camel-example-docs/src/test/java/org/apache/camel/example/docs/IntegrationTest.java (Revision 643714)
+++ camel-example-docs/src/test/java/org/apache/camel/example/docs/IntegrationTest.java (Arbeitskopie)
@@ -25,7 +25,7 @@
public class IntegrationTest extends TestCase {
public void testCamelRulesDeployCorrectlyInSpring() throws Exception {
- // lets boot up the Spring application context for 2 seconds to check it works OK
+ // let's boot up the Spring application context for 2 seconds to check it works OK
Main.main("-duration", "2s", "-o", "target/site/cameldoc");
}
}
Index: camel-example-docs/src/main/java/org/apache/camel/example/docs/PipelineRoute.java
===================================================================
--- camel-example-docs/src/main/java/org/apache/camel/example/docs/PipelineRoute.java (Revision 643714)
+++ camel-example-docs/src/main/java/org/apache/camel/example/docs/PipelineRoute.java (Arbeitskopie)
@@ -19,7 +19,7 @@
import org.apache.camel.builder.RouteBuilder;
/**
- * A simple pipilne example
+ * A simple pipeline example
*
* @version $Revision$
*/
Index: camel-example-docs/src/main/resources/log4j.properties
===================================================================
--- camel-example-docs/src/main/resources/log4j.properties (Revision 643714)
+++ camel-example-docs/src/main/resources/log4j.properties (Arbeitskopie)
@@ -16,7 +16,7 @@
## ------------------------------------------------------------------------
#
-# The logging properties used for eclipse testing, We want to see debug output on the console.
+# The logging properties used for eclipse testing, We want to see INFO output on the console.
#
log4j.rootLogger=INFO, out
Index: camel-example-docs/pom.xml
===================================================================
--- camel-example-docs/pom.xml (Revision 643714)
+++ camel-example-docs/pom.xml (Arbeitskopie)
@@ -39,7 +39,7 @@
camel-spring
-
+
commons-logging
commons-logging
@@ -61,7 +61,7 @@
-
+
org.apache.camel
camel-maven-plugin
@@ -72,7 +72,7 @@
-
+
org.apache.camel
camel-maven-plugin
Index: camel-example-docs/README.txt
===================================================================
--- camel-example-docs/README.txt (Revision 643714)
+++ camel-example-docs/README.txt (Arbeitskopie)
@@ -5,7 +5,7 @@
the Maven reporting tools can visualise routes
http://activemq.apache.org/camel/docs-example.html
-This example also acts as an integration test case for the Visualisation
+This example also acts as an integration test case for the GraphViz visualisation feature
http://activemq.apache.org/camel/visualisation.html
To generate the documentation type
@@ -15,9 +15,9 @@
target/site/cameldoc/index.html
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 src/main/resources/META-INF/spring
+and the Spring XML configuration file in src/main/resources/META-INF/spring
-If you hit any problems please talk to us on the Camel Forums
+If you hit any problems please let us know on the Camel Forums
http://activemq.apache.org/camel/discussion-forums.html
Please help us make Apache Camel better - we appreciate any feedback you may have.
Index: camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
===================================================================
--- camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java (Revision 643714)
+++ camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java (Arbeitskopie)
@@ -38,14 +38,14 @@
public void configure() throws Exception {
- // lets define some activities, correlating on an XPath on the message bodies
+ // let's define some activities, correlating on an XPath on the message bodies
ActivityBuilder purchaseOrder = activity("file:src/data/purchaseOrders?noop=true")
.correlate(xpath("/purchaseOrder/@id").stringResult());
ActivityBuilder invoice = activity("file:src/data/invoices?noop=true")
.correlate(xpath("/invoice/@purchaseOrderId").stringResult());
- // now lets add some BAM rules
+ // now let's add some BAM rules
invoice.starts().after(purchaseOrder.completes())
.expectWithin(seconds(1))
.errorIfOver(seconds(2)).to("log:org.apache.camel.example.bam.BamFailures?level=error");
Index: camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
===================================================================
--- camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml (Revision 643714)
+++ camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml (Arbeitskopie)
@@ -45,7 +45,7 @@
-
+
Index: camel-example-bam/src/main/resources/log4j.properties
===================================================================
--- camel-example-bam/src/main/resources/log4j.properties (Revision 643714)
+++ camel-example-bam/src/main/resources/log4j.properties (Arbeitskopie)
@@ -16,7 +16,7 @@
## ------------------------------------------------------------------------
#
-# The logging properties used for eclipse testing, We want to see debug output on the console.
+# The logging properties used for eclipse testing, We want to see INFO output on the console.
#
log4j.rootLogger=INFO, out
Index: camel-example-bam/pom.xml
===================================================================
--- camel-example-bam/pom.xml (Revision 643714)
+++ camel-example-bam/pom.xml (Arbeitskopie)
@@ -95,13 +95,13 @@
-
+
org.apache.camel
camel-maven-plugin
-
+
org.codehaus.mojo
exec-maven-plugin
@@ -116,7 +116,7 @@
-
+
org.apache.camel
camel-maven-plugin
Index: camel-example-bam/README.txt
===================================================================
--- camel-example-bam/README.txt (Revision 643714)
+++ camel-example-bam/README.txt (Arbeitskopie)
@@ -9,13 +9,13 @@
To run the example type
mvn camel:run
-You can see the BAM activies defined in
- src/main/java/org/apache/camel/example/bam/MyActivites.java
+You can see the BAM activities defined in
+ src/main/java/org/apache/camel/example/bam/MyActivities.java
For the latest & greatest documentation on how to use this example please see
http://activemq.apache.org/camel/bam-example.html
-If you hit any problems please talk to us on the Camel Forums
+If you hit any problems please let us know on the Camel Forums
http://activemq.apache.org/camel/discussion-forums.html
Please help us make Apache Camel better - we appreciate any feedback you may have.
Index: camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
===================================================================
--- camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java (Revision 643714)
+++ camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java (Arbeitskopie)
@@ -48,7 +48,7 @@
String user = doc.getUser();
CustomerEntity customer = findCustomerByName(user);
- // lets convert information from the document into the entity bean
+ // let's convert information from the document into the entity bean
customer.setFirstName(doc.getFirstName());
customer.setSurname(doc.getLastName());
Index: camel-example-etl/src/main/resources/log4j.properties
===================================================================
--- camel-example-etl/src/main/resources/log4j.properties (Revision 643714)
+++ camel-example-etl/src/main/resources/log4j.properties (Arbeitskopie)
@@ -16,7 +16,7 @@
## ------------------------------------------------------------------------
#
-# The logging properties used for eclipse testing, We want to see debug output on the console.
+# The logging properties used for eclipse testing, We want to see INFO output on the console.
#
log4j.rootLogger=INFO, out
Index: camel-example-etl/pom.xml
===================================================================
--- camel-example-etl/pom.xml (Revision 643714)
+++ camel-example-etl/pom.xml (Arbeitskopie)
@@ -30,7 +30,7 @@
camel-example-etl
Camel :: Example :: ETL
- An example showing how to use Camel as an Extract Transform and Load tool
+ An example showing how to use Camel as an Extract Transform and Load (ETL) tool
@@ -99,13 +99,13 @@
-
+
org.apache.camel
camel-maven-plugin
-
+
org.codehaus.mojo
exec-maven-plugin
@@ -131,7 +131,7 @@
-
+
org.apache.camel
camel-maven-plugin
Index: camel-example-etl/README.txt
===================================================================
--- camel-example-etl/README.txt (Revision 643714)
+++ camel-example-etl/README.txt (Arbeitskopie)
@@ -13,7 +13,7 @@
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 src/main/resources/META-INF/spring
-If you hit any problems please talk to us on the Camel Forums
+If you hit any problems please let us know on the Camel Forums
http://activemq.apache.org/camel/discussion-forums.html
Please help us make Apache Camel better - we appreciate any feedback you may have.