camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-9043 Fix camel-example-cxf-osgi/blueprint examples
Date Mon, 03 Aug 2015 10:04:50 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 0e259dfbb -> e3f88794d


CAMEL-9043 Fix camel-example-cxf-osgi/blueprint examples

Conflicts:
	examples/camel-example-cxf-osgi/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e3f88794
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e3f88794
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e3f88794

Branch: refs/heads/camel-2.15.x
Commit: e3f88794dc30c8c070351bbb042e2b7cd64dc3c9
Parents: 0e259df
Author: Tomas Rohovsky <trohovsk@redhat.com>
Authored: Fri Jul 31 20:04:15 2015 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Aug 3 12:11:52 2015 +0200

----------------------------------------------------------------------
 examples/camel-example-aggregate/data/hawtdb.dat  | Bin 0 -> 602400 bytes
 examples/camel-example-cxf-blueprint/README.txt   |   2 +-
 .../reportincident/ReportIncidentRoutes.java      |   8 +++-----
 examples/camel-example-cxf-osgi/README.txt        |   2 +-
 examples/camel-example-cxf-osgi/pom.xml           |   5 -----
 .../reportincident/ReportIncidentRoutes.java      |   9 +++------
 6 files changed, 8 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e3f88794/examples/camel-example-aggregate/data/hawtdb.dat
----------------------------------------------------------------------
diff --git a/examples/camel-example-aggregate/data/hawtdb.dat b/examples/camel-example-aggregate/data/hawtdb.dat
new file mode 100644
index 0000000..abca5d9
Binary files /dev/null and b/examples/camel-example-aggregate/data/hawtdb.dat differ

http://git-wip-us.apache.org/repos/asf/camel/blob/e3f88794/examples/camel-example-cxf-blueprint/README.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-blueprint/README.txt b/examples/camel-example-cxf-blueprint/README.txt
index d6911e9..a27746b 100644
--- a/examples/camel-example-cxf-blueprint/README.txt
+++ b/examples/camel-example-cxf-blueprint/README.txt
@@ -71,7 +71,7 @@ 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!
+have. Enjoy!
 
 ------------------------
 The Camel Riders!

http://git-wip-us.apache.org/repos/asf/camel/blob/e3f88794/examples/camel-example-cxf-blueprint/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-blueprint/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
b/examples/camel-example-cxf-blueprint/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
index 033621b..1b834b7 100644
--- a/examples/camel-example-cxf-blueprint/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
+++ b/examples/camel-example-cxf-blueprint/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.example.reportincident;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 
 /**
@@ -25,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
  * In the configure method we have all kind of DSL methods we use for expressing our routes.
  */
 public class ReportIncidentRoutes extends RouteBuilder {
-    
+
     public void configure() throws Exception {
         // webservice responses
         OutputReportIncident ok = new OutputReportIncident();
@@ -36,11 +35,10 @@ public class ReportIncidentRoutes extends RouteBuilder {
 
         from("cxf:bean:reportIncident")
             .convertBodyTo(InputReportIncident.class)
-            .setHeader(Exchange.FILE_NAME, constant("request-${date:now:yyyy-MM-dd-HHmmssSSS}"))
-            .wireTap("file://target/inbox/")
+            .wireTap("file://target/inbox/?fileName=request-${date:now:yyyy-MM-dd-HHmmssSSS}")
             .choice().when(simple("${body.givenName} == 'Claus'"))
                 .transform(constant(ok))
             .otherwise()
                 .transform(constant(accepted));
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/e3f88794/examples/camel-example-cxf-osgi/README.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/README.txt b/examples/camel-example-cxf-osgi/README.txt
index 9708874..fb49213 100644
--- a/examples/camel-example-cxf-osgi/README.txt
+++ b/examples/camel-example-cxf-osgi/README.txt
@@ -94,7 +94,7 @@ 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!
+have. Enjoy!
 
 ------------------------
 The Camel Riders!

http://git-wip-us.apache.org/repos/asf/camel/blob/e3f88794/examples/camel-example-cxf-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/pom.xml b/examples/camel-example-cxf-osgi/pom.xml
index 58d53bb..cf04e9a 100644
--- a/examples/camel-example-cxf-osgi/pom.xml
+++ b/examples/camel-example-cxf-osgi/pom.xml
@@ -142,14 +142,9 @@
 							org.apache.cxf.transport.http.policy,
 							org.apache.cxf.transport.http_jetty,
 							org.apache.cxf.transport.jms,
-							org.apache.cxf.transports.http,
 							org.apache.cxf.workqueue,
 							org.apache.cxf.wsdl,
 							org.apache.cxf.wsdl11,
-							org.apache.ws.security.action,
-							org.apache.ws.security.processor,
-							org.springframework.beans.factory.config,
-							org.springframework.mail.javamail,
 							*
 					    </Import-Package>
 					</instructions>

http://git-wip-us.apache.org/repos/asf/camel/blob/e3f88794/examples/camel-example-cxf-osgi/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
b/examples/camel-example-cxf-osgi/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
index 0d4b0ab..1b834b7 100644
--- a/examples/camel-example-cxf-osgi/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
+++ b/examples/camel-example-cxf-osgi/src/main/java/org/apache/camel/example/reportincident/ReportIncidentRoutes.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.example.reportincident;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 
 /**
@@ -25,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
  * In the configure method we have all kind of DSL methods we use for expressing our routes.
  */
 public class ReportIncidentRoutes extends RouteBuilder {
-    
+
     public void configure() throws Exception {
         // webservice responses
         OutputReportIncident ok = new OutputReportIncident();
@@ -36,12 +35,10 @@ public class ReportIncidentRoutes extends RouteBuilder {
 
         from("cxf:bean:reportIncident")
             .convertBodyTo(InputReportIncident.class)
-            .setHeader(Exchange.FILE_NAME, constant("request-${date:now:yyyy-MM-dd-HHmmssSSS}"))
-            .wireTap("file://target/inbox/")
+            .wireTap("file://target/inbox/?fileName=request-${date:now:yyyy-MM-dd-HHmmssSSS}")
             .choice().when(simple("${body.givenName} == 'Claus'"))
                 .transform(constant(ok))
             .otherwise()
                 .transform(constant(accepted));
-            
     }
-}
\ No newline at end of file
+}


Mime
View raw message