camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r644159 - in /activemq/camel/trunk/examples: camel-example-bam/ camel-example-bam/src/main/java/org/apache/camel/example/bam/ camel-example-bam/src/main/resources/ camel-example-bam/src/main/resources/META-INF/spring/ camel-example-docs/ ca...
Date Thu, 03 Apr 2008 04:32:23 GMT
Author: davsclaus
Date: Wed Apr  2 21:32:21 2008
New Revision: 644159

URL: http://svn.apache.org/viewvc?rev=644159&view=rev
Log:
CAMEL-427 Applied patch with thanks to Glen Mazza

Modified:
    activemq/camel/trunk/examples/camel-example-bam/README.txt
    activemq/camel/trunk/examples/camel-example-bam/pom.xml
    activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
    activemq/camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
    activemq/camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties
    activemq/camel/trunk/examples/camel-example-docs/README.txt
    activemq/camel/trunk/examples/camel-example-docs/pom.xml
    activemq/camel/trunk/examples/camel-example-docs/src/main/java/org/apache/camel/example/docs/PipelineRoute.java
    activemq/camel/trunk/examples/camel-example-docs/src/main/resources/log4j.properties
    activemq/camel/trunk/examples/camel-example-docs/src/test/java/org/apache/camel/example/docs/IntegrationTest.java
    activemq/camel/trunk/examples/camel-example-etl/README.txt
    activemq/camel/trunk/examples/camel-example-etl/pom.xml
    activemq/camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
    activemq/camel/trunk/examples/camel-example-etl/src/main/resources/log4j.properties

Modified: activemq/camel/trunk/examples/camel-example-bam/README.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-bam/README.txt?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-bam/README.txt (original)
+++ activemq/camel/trunk/examples/camel-example-bam/README.txt Wed Apr  2 21:32:21 2008
@@ -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.
@@ -23,4 +23,5 @@
 
 ------------------------
 The Camel riders!
+
 

Modified: activemq/camel/trunk/examples/camel-example-bam/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-bam/pom.xml?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-bam/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-bam/pom.xml Wed Apr  2 21:32:21 2008
@@ -95,13 +95,13 @@
   <build>
     <plugins>
 
-      <!-- allows the example to be ran via 'mvn camel:run' -->
+      <!-- Allows the example to be run via 'mvn camel:run' -->
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
       </plugin>
 
-      <!-- allows the example to be ran via 'mvn compile exec:java' -->
+      <!-- Allows the example to be run via 'mvn compile exec:java' -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -116,7 +116,7 @@
   
   <reporting>
     <plugins>
-      <!-- lets generate nice PNG / SVG diagrams from our routes -->
+      <!-- let's generate nice PNG / SVG diagrams from our routes -->
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>

Modified: activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
(original)
+++ activemq/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
Wed Apr  2 21:32:21 2008
@@ -38,17 +38,17 @@
 
     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");
     }
 }
-// END SNIPPET: demo
\ No newline at end of file
+// END SNIPPET: demo

Modified: activemq/camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
(original)
+++ activemq/camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
Wed Apr  2 21:32:21 2008
@@ -45,7 +45,7 @@
     <property name="persistenceUnitName" value="bam"/>
   </bean>
 
-  <!-- lets show a simple UI to browse the database -->
+  <!-- let's show a simple UI to browse the database -->
   <bean id="databaseExplorer" class="org.apache.camel.spring.util.MainRunner" lazy-init="false">
     <property name="main" value="org.hsqldb.util.DatabaseManagerSwing"/>
     <property name="args">

Modified: activemq/camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties (original)
+++ activemq/camel/trunk/examples/camel-example-bam/src/main/resources/log4j.properties Wed
Apr  2 21:32:21 2008
@@ -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
 

Modified: activemq/camel/trunk/examples/camel-example-docs/README.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-docs/README.txt?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-docs/README.txt (original)
+++ activemq/camel/trunk/examples/camel-example-docs/README.txt Wed Apr  2 21:32:21 2008
@@ -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.
@@ -25,4 +25,5 @@
 
 ------------------------
 The Camel riders!
+
 

Modified: activemq/camel/trunk/examples/camel-example-docs/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-docs/pom.xml?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-docs/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-docs/pom.xml Wed Apr  2 21:32:21 2008
@@ -39,7 +39,7 @@
       <artifactId>camel-spring</artifactId>
     </dependency>
 
-    <!-- lets use log4j -->
+    <!-- let's use log4j -->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
@@ -61,7 +61,7 @@
   <build>
     <plugins>
 
-      <!-- allows the example to be ran via 'mvn camel:run' -->
+      <!-- Allows the example to be run via 'mvn camel:run' -->
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
@@ -72,7 +72,7 @@
 
   <reporting>
     <plugins>
-      <!-- lets generate nice PNG / SVG diagrams from our routes -->
+      <!-- let's generate nice PNG / SVG diagrams from our routes -->
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>

Modified: activemq/camel/trunk/examples/camel-example-docs/src/main/java/org/apache/camel/example/docs/PipelineRoute.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-docs/src/main/java/org/apache/camel/example/docs/PipelineRoute.java?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-docs/src/main/java/org/apache/camel/example/docs/PipelineRoute.java
(original)
+++ activemq/camel/trunk/examples/camel-example-docs/src/main/java/org/apache/camel/example/docs/PipelineRoute.java
Wed Apr  2 21:32:21 2008
@@ -19,7 +19,7 @@
 import org.apache.camel.builder.RouteBuilder;
 
 /**
- * A simple pipilne example
+ * A simple pipeline example
  *
  * @version $Revision$
  */

Modified: activemq/camel/trunk/examples/camel-example-docs/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-docs/src/main/resources/log4j.properties?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-docs/src/main/resources/log4j.properties (original)
+++ activemq/camel/trunk/examples/camel-example-docs/src/main/resources/log4j.properties Wed
Apr  2 21:32:21 2008
@@ -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
 

Modified: activemq/camel/trunk/examples/camel-example-docs/src/test/java/org/apache/camel/example/docs/IntegrationTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-docs/src/test/java/org/apache/camel/example/docs/IntegrationTest.java?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-docs/src/test/java/org/apache/camel/example/docs/IntegrationTest.java
(original)
+++ activemq/camel/trunk/examples/camel-example-docs/src/test/java/org/apache/camel/example/docs/IntegrationTest.java
Wed Apr  2 21:32:21 2008
@@ -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");
     }
 }

Modified: activemq/camel/trunk/examples/camel-example-etl/README.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-etl/README.txt?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-etl/README.txt (original)
+++ activemq/camel/trunk/examples/camel-example-etl/README.txt Wed Apr  2 21:32:21 2008
@@ -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.
@@ -21,4 +21,5 @@
 
 ------------------------
 The Camel riders!
+
 

Modified: activemq/camel/trunk/examples/camel-example-etl/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-etl/pom.xml?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-etl/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-etl/pom.xml Wed Apr  2 21:32:21 2008
@@ -30,7 +30,7 @@
 
   <artifactId>camel-example-etl</artifactId>
   <name>Camel :: Example :: ETL</name>
-  <description>An example showing how to use Camel as an Extract Transform and Load
tool</description>
+  <description>An example showing how to use Camel as an Extract Transform and Load
(ETL) tool</description>
 
   <dependencies>
     <dependency>
@@ -99,13 +99,13 @@
   <build>
     <plugins>
 
-      <!-- allows the example to be ran via 'mvn camel:run' -->
+      <!-- Allows the example to be run via 'mvn camel:run' -->
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>
       </plugin>
 
-      <!-- allows the example to be ran via 'mvn compile exec:java' -->
+      <!-- Allows the example to be run via 'mvn compile exec:java' -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -131,7 +131,7 @@
   
   <reporting>
     <plugins>
-      <!-- lets generate nice PNG / SVG diagrams from our routes -->
+      <!-- let's generate nice PNG / SVG diagrams from our routes -->
       <plugin>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-maven-plugin</artifactId>

Modified: activemq/camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
(original)
+++ activemq/camel/trunk/examples/camel-example-etl/src/main/java/org/apache/camel/example/etl/CustomerTransformer.java
Wed Apr  2 21:32:21 2008
@@ -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());

Modified: activemq/camel/trunk/examples/camel-example-etl/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-etl/src/main/resources/log4j.properties?rev=644159&r1=644158&r2=644159&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-etl/src/main/resources/log4j.properties (original)
+++ activemq/camel/trunk/examples/camel-example-etl/src/main/resources/log4j.properties Wed
Apr  2 21:32:21 2008
@@ -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
 



Mime
View raw message