svn commit: r1391762 - in /camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl: SAggregateDefinition.scala SEnrichDefinition.scala SLoadBalanceDefinition.scala SMulticastDefinition.scala

[ni...@apache.org]

Author: ningjiang
Date: Sat Sep 29 07:17:48 2012
New Revision: 1391762

URL: http://svn.apache.org/viewvc?rev=1391762&view=rev
Log:
CAMEL-5667 Update the camel-scala DSL with latest camel Java DSL

Modified:
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala

Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala?rev=1391762&r1=1391761&r2=1391762&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala Sat Sep 29 07:17:48 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.scala.dsl;
 
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.ScheduledExecutorService
 import org.apache.camel.model.AggregateDefinition
 import org.apache.camel.processor.aggregate.AggregationStrategy
 import org.apache.camel.scala.dsl.builder.RouteBuilder
@@ -50,6 +52,19 @@ case class SAggregateDefinition(override
   def eagerCheckCompletion = wrap(target.eagerCheckCompletion)
   def ignoreInvalidCorrelationKeys = wrap(target.ignoreInvalidCorrelationKeys)
   def groupExchanges = wrap(target.groupExchanges)
+ 
+  def discardOnCompletionTimeout = wrap(target.discardOnCompletionTimeout)
+  def forceCompletionOnStop = wrap(target.forceCompletionOnStop())
+  def timeoutCheckerExecutorService(executorService: ScheduledExecutorService) 
+      = wrap(target.setTimeoutCheckerExecutorService(executorService))
+  def executorService(executorService: ExecutorService) = wrap(target.setExecutorService(executorService))
+  def executorServiceRef(ref: String) = wrap(target.setExecutorServiceRef(ref))
+  
+  def completionPredicate(filter: Exchange => Any) {
+     // uses implicit conversion
+     val predicate = filter
+     target.completionPredicate(predicate)
+  }
 
   override def wrap(block: => Unit) = super.wrap(block).asInstanceOf[SAggregateDefinition]
 }

Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala?rev=1391762&r1=1391761&r2=1391762&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SEnrichDefinition.scala Sat Sep 29 07:17:48 2012
@@ -17,11 +17,20 @@
 package org.apache.camel.scala.dsl;
 
 import org.apache.camel.model.EnrichDefinition
+import org.apache.camel.processor.aggregate.AggregationStrategy
 import org.apache.camel.scala.dsl.builder.RouteBuilder
 
 /**
  * Scala enrichment for Camel's EnrichDefinition
  */
 case class SEnrichDefinition(override val target: EnrichDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition[EnrichDefinition] {
+  
+  def aggregationStrategy(strategy: AggregationStrategy) = wrap(target.setAggregationStrategy(strategy))
+  def aggregationStrategyRef(ref: String) = wrap(target.setAggregationStrategyRef(ref))
+  
+  def resourceRef(ref: String) = wrap(target.setResourceRef(ref))
+  def resourceUri(resourceUri: String) = wrap(target.setResourceUri(resourceUri))
+  
+  override def wrap(block: => Unit) = super.wrap(block).asInstanceOf[SEnrichDefinition]
 
 }

Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala?rev=1391762&r1=1391761&r2=1391762&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala Sat Sep 29 07:17:48 2012
@@ -36,6 +36,10 @@ case class SLoadBalanceDefinition(overri
   def sticky(expression: Exchange => Any) = wrap(target.sticky(expression))
 
   def topic = wrap(target.topic)
+  
+  def weighted(roundRobin: Boolean, distributionRatio: String, distributionRatioDelimiter :String = ",") 
+      = wrap(target.weighted(roundRobin, distributionRatio, distributionRatioDelimiter))
+  def custom(ref: String) = wrap(target.custom(ref))
 
   override def wrap(block: => Unit) : SLoadBalanceDefinition = super.wrap(block).asInstanceOf[SLoadBalanceDefinition] 
 }

Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala?rev=1391762&r1=1391761&r2=1391762&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala Sat Sep 29 07:17:48 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.scala.dsl;
 
+import java.util.concurrent.ExecutorService
 import org.apache.camel.model.MulticastDefinition
 import org.apache.camel.scala.dsl.builder.RouteBuilder
 import org.apache.camel.Exchange
@@ -37,7 +38,17 @@ case class SMulticastDefinition(override
   def parallel = wrap(target.parallelProcessing)
 
   def streaming = wrap(target.streaming)
-
+  
+  def stopOnException = wrap(target.stopOnException())
+  
+  def executorService(executorService: ExecutorService) = wrap(target.setExecutorService(executorService))
+  
+  def executorServiceRef(ref: String) = wrap(target.setExecutorServiceRef(ref))
+  
+  def timeout(timeout: Long) = wrap(target.timeout(timeout))
+  
+  
+ 
   override def wrap(block: => Unit) = super.wrap(block).asInstanceOf[SMulticastDefinition]
   
 }