"... it happens for all committers"
On 11/22/2011 10:36 PM, hadr...@apache.org wrote:
Author: hadrian Date: Wed Nov 23 03:36:02 2011 New Revision: 1205273 URL: http://svn.apache.org/viewvc?rev=1205273&view=rev Log: CAMEL-4607. Fix for the scala dsl Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SLogProcessorTest.scala Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala?rev=1205273&r1=1205272&r2=1205273&view=diff ============================================================================== --- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala (original) +++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/DSL.scala Wed Nov 23 03:36:02 2011 @@ -56,6 +56,7 @@ trait DSL { def log(message: String) : DSL def log(level: LoggingLevel, message: String) : DSL def log(level: LoggingLevel, logName: String, message: String) : DSL + def log(level: LoggingLevel, logName: String, marker: String, message: String) : DSL def loop(expression: Exchange => Any) : SLoopDefinition def marshal(format : DataFormatDefinition) : DSL Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala?rev=1205273&r1=1205272&r2=1205273&view=diff ============================================================================== --- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala (original) +++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala Wed Nov 23 03:36:02 2011 @@ -85,6 +85,7 @@ abstract class SAbstractDefinition[P<: def log(message: String) = wrap(target.log(message)) def log(level: LoggingLevel, message: String) = wrap(target.log(level, message)) def log(level: LoggingLevel, logName: String, message: String) = wrap(target.log(level, logName, message)) + def log(level: LoggingLevel, logName: String, marker: String, message: String) = wrap(target.log(level, logName, marker, message)) def loop(expression: Exchange => Any) = SLoopDefinition(target.loop(expression)) def marshal(format: DataFormatDefinition) = wrap(target.marshal(format)) Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala?rev=1205273&r1=1205272&r2=1205273&view=diff ============================================================================== --- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala (original) +++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala Wed Nov 23 03:36:02 2011 @@ -139,6 +139,7 @@ class RouteBuilder extends Preamble with def log(message: String) = stack.top.log(message) def log(level: LoggingLevel, message: String) = stack.top.log(level, message) def log(level: LoggingLevel, logName: String, message: String) = stack.top.log(level, logName, message) + def log(level: LoggingLevel, logName: String, marker: String, message: String) = stack.top.log(level, logName, marker, message) def loop(expression: Exchange => Any) = stack.top.loop(expression) def marshal(format: DataFormatDefinition) = stack.top.marshal(format) Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SLogProcessorTest.scala URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SLogProcessorTest.scala?rev=1205273&r1=1205272&r2=1205273&view=diff ============================================================================== --- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SLogProcessorTest.scala (original) +++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SLogProcessorTest.scala Wed Nov 23 03:36:02 2011 @@ -34,5 +34,10 @@ class SLogProcessorTest extends LogProce log(LoggingLevel.ERROR, "cool", "Me got ${body}") to("mock:baz") } + + "wombat" :: "direct:wombat" ==> { + // log(LoggingLevel.INFO, "cool", "mymarker", "Me got ${body}") + to("mock:wombat") + } } }
-- Hadrian Zbarcea Principal Software Architect Talend, Inc http://coders.talend.com/ http://camelbot.blogspot.com/
