svn commit: r751371 - in /camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl: ./ builder/

[ha...@apache.org]

Author: hadrian
Date: Sun Mar  8 05:36:12 2009
New Revision: 751371

URL: http://svn.apache.org/viewvc?rev=751371&view=rev
Log:
CAMEL-1395.  Completed api refactor to mach camel model.

Added:
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala
      - copied, changed from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregatorType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregatorDefinition.scala
      - copied unchanged from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregatorType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceDefinition.scala
      - copied, changed from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala
      - copied, changed from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayerType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerDefinition.scala
      - copied, changed from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala
      - copied, changed from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopDefinition.scala
      - copied, changed from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala
      - copied, changed from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala
      - copied, changed from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SExceptionType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessDefinition.scala
      - copied unchanged from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorDefinition.scala
      - copied, changed from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequenceDefinition.scala
      - copied, changed from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequencerType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala
      - copied, changed from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala
      - copied, changed from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitterType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadDefinition.scala
      - copied, changed from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala
      - copied, changed from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottlerType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala
      - copied, changed from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryType.scala
Removed:
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregatorType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayerType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SExceptionType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequencerType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitterType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottlerType.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryType.scala
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

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=751371&r1=751370&r2=751371&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 Sun Mar  8 05:36:12 2009
@@ -23,31 +23,31 @@
  */
 trait DSL {
   
-  def aggregate(expression: Exchange => Any) : SAggregatorType
+  def aggregate(expression: Exchange => Any) : SAggregateDefinition
   def as[Target](toType: Class[Target]) : DSL
-  def attempt : STryType
+  def attempt : STryDefinition
   def bean(bean: Any) : DSL
-  def choice : SChoiceType
-  def delay(delay: Period) : SDelayerType
-  def idempotentconsumer(expression: Exchange => Any): SIdempotentConsumerType
-  def inOnly(): SProcessorType
-  def inOut(): SProcessorType
-  def loadbalance : SLoadBalanceType
-  def loop(expression: Exchange => Any) : SLoopType
+  def choice : SChoiceDefinition
+  def delay(delay: Period) : SDelayDefinition
+  def idempotentconsumer(expression: Exchange => Any): SIdempotentConsumerDefinition
+  def inOnly(): SProcessorDefinition
+  def inOut(): SProcessorDefinition
+  def loadbalance : SLoadBalanceDefinition
+  def loop(expression: Exchange => Any) : SLoopDefinition
   def marshal(format : DataFormatDefinition) : DSL
-  def multicast : SMulticastType
+  def multicast : SMulticastDefinition
   def otherwise : DSL
   def process(function: Exchange => Unit) : DSL
   def recipients(expression: Exchange => Any) : DSL
-  def resequence(expression: Exchange => Any) : SResequencerType
+  def resequence(expression: Exchange => Any) : SResequenceDefinition
   def setbody(expression: Exchange => Any) : DSL
   def setheader(header: String, expression: Exchange => Any) : DSL
-  def split(expression: Exchange => Any) : SSplitterType
-  def thread(number: Int) : SThreadType
-  def throttle(frequency: Frequency) : SThrottlerType
+  def split(expression: Exchange => Any) : SSplitDefinition
+  def thread(number: Int) : SThreadDefinition
+  def throttle(frequency: Frequency) : SThrottleDefinition
   def to(uris: String*) : DSL
   def unmarshal(format: DataFormatDefinition) : DSL
-  def when(filter: Exchange => Boolean) : SChoiceType
+  def when(filter: Exchange => Boolean) : SChoiceDefinition
   def -->(uris: String*) : 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=751371&r1=751370&r2=751371&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 Sun Mar  8 05:36:12 2009
@@ -45,21 +45,21 @@
     this
   }
   
-  def when(filter: Exchange => Boolean) : SChoiceType =
-    new SChoiceType(target.choice).when(filter)
+  def when(filter: Exchange => Boolean) : SChoiceDefinition =
+    new SChoiceDefinition(target.choice).when(filter)
     
   def as[Target](toType: Class[Target]) = {
     target.convertBodyTo(toType)
-    new SProcessorType(target.asInstanceOf[RawProcessorDefinition])
+    new SProcessorDefinition(target.asInstanceOf[RawProcessorDefinition])
   }
   
-  def attempt : STryType = new STryType(target.tryBlock)
+  def attempt : STryDefinition = new STryDefinition(target.tryBlock)
   
   def split(expression: Exchange => Any) = 
-    new SSplitterType(target.split(expression))
+    new SSplitDefinition(target.split(expression))
     
   def recipients(expression: Exchange => Any) = 
-    new SProcessorType(target.recipientList(expression).asInstanceOf[RawProcessorDefinition])
+    new SProcessorDefinition(target.recipientList(expression).asInstanceOf[RawProcessorDefinition])
 
   def apply(block: => Unit) = {
     builder.build(this, block)
@@ -67,54 +67,54 @@
   }
 
   def bean(bean: Any) = bean match {
-    case cls: Class[_] => new SProcessorType(target.bean(cls).asInstanceOf[RawProcessorDefinition])
-    case ref: String => new SProcessorType(target.beanRef(ref).asInstanceOf[RawProcessorDefinition])
-    case obj: Any => new SProcessorType(target.bean(obj).asInstanceOf[RawProcessorDefinition])
+    case cls: Class[_] => new SProcessorDefinition(target.bean(cls).asInstanceOf[RawProcessorDefinition])
+    case ref: String => new SProcessorDefinition(target.beanRef(ref).asInstanceOf[RawProcessorDefinition])
+    case obj: Any => new SProcessorDefinition(target.bean(obj).asInstanceOf[RawProcessorDefinition])
   }
   
-  def choice = new SChoiceType(target.choice)
+  def choice = new SChoiceDefinition(target.choice)
     
-  def otherwise : SChoiceType = 
+  def otherwise : SChoiceDefinition = 
     throw new Exception("otherwise is only supported in a choice block or after a when statement")
   
-  def idempotentconsumer(expression: Exchange => Any) = new SIdempotentConsumerType(target.idempotentConsumer(expression, null))
+  def idempotentconsumer(expression: Exchange => Any) = new SIdempotentConsumerDefinition(target.idempotentConsumer(expression, null))
   
-  def inOnly = new SProcessorType(target.inOnly.asInstanceOf[RawProcessorDefinition])
-  def inOut = new SProcessorType(target.inOut.asInstanceOf[RawProcessorDefinition])
+  def inOnly = new SProcessorDefinition(target.inOnly.asInstanceOf[RawProcessorDefinition])
+  def inOut = new SProcessorDefinition(target.inOut.asInstanceOf[RawProcessorDefinition])
  
-  def loop(expression: Exchange => Any) = new SLoopType(target.loop(expression))
+  def loop(expression: Exchange => Any) = new SLoopDefinition(target.loop(expression))
   
   def marshal(format: DataFormatDefinition) = {
     target.marshal(format)
     this
   }
   
-  def multicast = new SMulticastType(target.multicast)
+  def multicast = new SMulticastDefinition(target.multicast)
   
   def process(function: Exchange => Unit) = {
     target.process(new ScalaProcessor(function))
     this
   }
  
-  def throttle(frequency: Frequency) = new SThrottlerType(target.throttle(frequency.count).timePeriodMillis(frequency.period.milliseconds))
+  def throttle(frequency: Frequency) = new SThrottleDefinition(target.throttle(frequency.count).timePeriodMillis(frequency.period.milliseconds))
   
-  def loadbalance = new SLoadBalanceType(target.loadBalance)
+  def loadbalance = new SLoadBalanceDefinition(target.loadBalance)
   
-  def delay(period: Period) = new SDelayerType(target.delay(period.milliseconds))
+  def delay(period: Period) = new SDelayDefinition(target.delay(period.milliseconds))
   
-  def resequence(expression: Exchange => Any) = new SResequencerType(target.resequence(expression))
+  def resequence(expression: Exchange => Any) = new SResequenceDefinition(target.resequence(expression))
   
-  def setbody(expression: Exchange => Any) = new SProcessorType(target.setBody(expression).asInstanceOf[ProcessorDefinition[P] forSome {type P}])
+  def setbody(expression: Exchange => Any) = new SProcessorDefinition(target.setBody(expression).asInstanceOf[ProcessorDefinition[P] forSome {type P}])
   
-  def setheader(name: String, expression: Exchange => Any) = new SProcessorType(target.setHeader(name, expression).asInstanceOf[ProcessorDefinition[P] forSome {type P}])
+  def setheader(name: String, expression: Exchange => Any) = new SProcessorDefinition(target.setHeader(name, expression).asInstanceOf[ProcessorDefinition[P] forSome {type P}])
   
-  def thread(count: Int) = new SThreadType(target.thread(count))
+  def thread(count: Int) = new SThreadDefinition(target.thread(count))
   
   def unmarshal(format: DataFormatDefinition) = {
     target.unmarshal(format)
     this
   }
   
-  def aggregate(expression: Exchange => Any) = new SAggregatorType(target.aggregate(expression))
+  def aggregate(expression: Exchange => Any) = new SAggregateDefinition(target.aggregate(expression))
 
 }

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala (from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregatorType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregatorType.scala&r1=751363&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregatorType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAggregateDefinition.scala Sun Mar  8 05:36:12 2009
@@ -24,7 +24,7 @@
 /**
  * Scala wrapper for Camel AggregateDefinition
  */
-class SAggregatorType(val target: AggregateDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[AggregateDefinition] {
+class SAggregateDefinition(val target: AggregateDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[AggregateDefinition] {
   
   val unwrap = target
   
@@ -52,5 +52,4 @@
     target.batchSize(count)
     this
   }
-  
 }

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceDefinition.scala (from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceType.scala&r1=751363&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceDefinition.scala Sun Mar  8 05:36:12 2009
@@ -19,7 +19,7 @@
 import org.apache.camel.model.ChoiceDefinition
 import org.apache.camel.scala.dsl.builder.RouteBuilder
 
-class SChoiceType(val target: ChoiceDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[ChoiceDefinition] {
+class SChoiceDefinition(val target: ChoiceDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[ChoiceDefinition] {
   
   val unwrap = target
   

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala (from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayerType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayerType.scala&r1=751363&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayerType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SDelayDefinition.scala Sun Mar  8 05:36:12 2009
@@ -22,7 +22,7 @@
 /**
  * Scala enrichment for Camel's DelayDefinition
  */
-class SDelayerType(val target: DelayDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[DelayDefinition] {
+class SDelayDefinition(val target: DelayDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[DelayDefinition] {
  
   val unwrap = target
 

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerDefinition.scala (from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerType.scala&r1=751363&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SIdempotentConsumerDefinition.scala Sun Mar  8 05:36:12 2009
@@ -23,7 +23,7 @@
 /**
  * Scala enrichment for Camel's IdempotentConsumerDefinition
  */
-class SIdempotentConsumerType(val target: IdempotentConsumerDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[IdempotentConsumerDefinition] {
+class SIdempotentConsumerDefinition(val target: IdempotentConsumerDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[IdempotentConsumerDefinition] {
   
   val unwrap = target
   

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala (from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceType.scala&r1=751363&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoadBalanceDefinition.scala Sun Mar  8 05:36:12 2009
@@ -22,7 +22,7 @@
 /**
  * Scala enrichment for Camel's LoadBalanceDefinition
  */
-class SLoadBalanceType(val target: LoadBalanceDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[LoadBalanceDefinition] {
+class SLoadBalanceDefinition(val target: LoadBalanceDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[LoadBalanceDefinition] {
  
   val unwrap = target
   

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopDefinition.scala (from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopType.scala&r1=751363&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SLoopDefinition.scala Sun Mar  8 05:36:12 2009
@@ -22,7 +22,7 @@
 /**
  * Scala enrichment for Camel's LoopDefinition
  */
-class SLoopType(val target: LoopDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[LoopDefinition] {
+class SLoopDefinition(val target: LoopDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[LoopDefinition] {
  
   val unwrap = target
   

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala (from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastType.scala&r1=751363&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SMulticastDefinition.scala Sun Mar  8 05:36:12 2009
@@ -19,7 +19,7 @@
 import org.apache.camel.model.MulticastDefinition
 import org.apache.camel.scala.dsl.builder.RouteBuilder
 
-class SMulticastType(val target: MulticastDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[MulticastDefinition] {
+class SMulticastDefinition(val target: MulticastDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[MulticastDefinition] {
   
   val unwrap = target
   

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala (from r751363, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SExceptionType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SExceptionType.scala&r1=751363&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SExceptionType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala Sun Mar  8 05:36:12 2009
@@ -22,7 +22,7 @@
 /**
  * Scala enrichment for Camel's OnExceptionDefinition
  */
-class SExceptionType(val target: OnExceptionDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[OnExceptionDefinition] {
+class SOnExceptionDefinition(val target: OnExceptionDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[OnExceptionDefinition] {
   
   val unwrap = target
    

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorDefinition.scala (from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorType.scala&r1=751369&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SProcessorDefinition.scala Sun Mar  8 05:36:12 2009
@@ -19,7 +19,7 @@
 import org.apache.camel.model.ProcessorDefinition
 import org.apache.camel.scala.dsl.builder.RouteBuilder
 
-class SProcessorType(val target: ProcessorDefinition[P] forSome {type P})(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[ProcessorDefinition[P] forSome {type P}] {
+class SProcessorDefinition(val target: ProcessorDefinition[P] forSome {type P})(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[ProcessorDefinition[P] forSome {type P}] {
   
   val unwrap = target
 

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequenceDefinition.scala (from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequencerType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequenceDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequenceDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequencerType.scala&r1=751369&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequencerType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SResequenceDefinition.scala Sun Mar  8 05:36:12 2009
@@ -20,7 +20,7 @@
 import org.apache.camel.model.config.BatchResequencerConfig
 import org.apache.camel.scala.dsl.builder.RouteBuilder
 
-class SResequencerType(val target: ResequenceDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[ResequenceDefinition] {
+class SResequenceDefinition(val target: ResequenceDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[ResequenceDefinition] {
   
   val unwrap = target
   

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala (from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteType.scala&r1=751369&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SRouteDefinition.scala Sun Mar  8 05:36:12 2009
@@ -19,7 +19,7 @@
 import org.apache.camel.model.RouteDefinition
 import org.apache.camel.scala.dsl.builder.RouteBuilder
 
-class SRouteType(val target: RouteDefinition, val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[RouteDefinition] {
+class SRouteDefinition(val target: RouteDefinition, val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[RouteDefinition] {
  
   val unwrap = target
   

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala (from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitterType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitterType.scala&r1=751369&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitterType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SSplitDefinition.scala Sun Mar  8 05:36:12 2009
@@ -19,7 +19,7 @@
 import org.apache.camel.model.SplitDefinition
 import org.apache.camel.scala.dsl.builder.RouteBuilder
 
-class SSplitterType(val target: SplitDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[SplitDefinition] {
+class SSplitDefinition(val target: SplitDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[SplitDefinition] {
   
   val unwrap = target
 

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadDefinition.scala (from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadType.scala&r1=751369&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThreadDefinition.scala Sun Mar  8 05:36:12 2009
@@ -22,7 +22,7 @@
 /**
  * Scala enrichment for Camel's ThreadDefinition
  */
-class SThreadType(val target: ThreadDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[ThreadDefinition] {
+class SThreadDefinition(val target: ThreadDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[ThreadDefinition] {
  
   val unwrap = target
   

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala (from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottlerType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottlerType.scala&r1=751369&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottlerType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SThrottleDefinition.scala Sun Mar  8 05:36:12 2009
@@ -22,7 +22,7 @@
 /**
  * Scala enrichment for Camel's ThrottleDefinition
  */
-class SThrottlerType(val target: ThrottleDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[ThrottleDefinition] {
+class SThrottleDefinition(val target: ThrottleDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[ThrottleDefinition] {
  
   val unwrap = target
   

Copied: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala (from r751369, camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryType.scala)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala?p2=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala&p1=camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryType.scala&r1=751369&r2=751371&rev=751371&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryType.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala Sun Mar  8 05:36:12 2009
@@ -22,11 +22,11 @@
 /**
  * Scala enrichment for Camel's TryDefinition
  */
-class STryType(val target: TryDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[TryDefinition] {
+class STryDefinition(val target: TryDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition with Wrapper[TryDefinition] {
   
   val unwrap = target
   
-  override def apply(block: => Unit) : STryType = super.apply(block).asInstanceOf[STryType]
+  override def apply(block: => Unit) : STryDefinition = super.apply(block).asInstanceOf[STryDefinition]
   
   def handle[Target](exception: Class[Target]) = {
     target.handle(exception)

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=751371&r1=751370&r2=751371&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 Sun Mar  8 05:36:12 2009
@@ -38,7 +38,7 @@
 
   val stack = new Stack[DSL];
 
-  implicit def stringToRoute(target: String) : SRouteType = new SRouteType(builder.from(target), this)  
+  implicit def stringToRoute(target: String) : SRouteDefinition = new SRouteDefinition(builder.from(target), this)  
   implicit def unwrap[W](wrapper: Wrapper[W]) = wrapper.unwrap
   implicit def constantToExpression(value: Any) : (Exchange => Any) = (exchange: Exchange) => value 
 
@@ -53,9 +53,9 @@
     stack.pop()
   }
 
-  def from(uri: String) = new SRouteType(builder.from(uri), this)
+  def from(uri: String) = new SRouteDefinition(builder.from(uri), this)
   def handle[E](block: => Unit)(implicit manifest: Manifest[E]) = {
-    val exception = new SExceptionType(builder.onException(manifest.erasure))(this)
+    val exception = new SOnExceptionDefinition(builder.onException(manifest.erasure))(this)
     exception.apply(block)
   }