Author: ningjiang
Date: Sat Sep 29 03:43:34 2012
New Revision: 1391740
URL: http://svn.apache.org/viewvc?rev=1391740&view=rev
Log:
CAMEL-5664 Provides the replace wrap methods to avoid using the deprecated
camel-core APIs
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala?rev=1391740&r1=1391739&r2=1391740&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala
(original)
+++
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichMessage.scala
Sat Sep 29 03:43:34 2012
@@ -81,7 +81,8 @@ class RichMessage(val message: Message)
def getAttachmentNames = message.getAttachmentNames
def getAttachment(id: String) = message.getAttachment(id)
-
+
+ @Deprecated
def createExchangeId = message.createExchangeId
def copyFrom(message: Message) = message.copyFrom(message)
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=1391740&r1=1391739&r2=1391740&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
Sat Sep 29 03:43:34 2012
@@ -78,7 +78,9 @@ abstract class SAbstractDefinition[P <:
def id(id : String) = wrap(target.id(id))
def idempotentConsumer(expression: Exchange => Any) =
SIdempotentConsumerDefinition(target.idempotentConsumer(expression, null))
+ @Deprecated
def inOnly = wrap(target.inOnly)
+ @Deprecated
def inOut = wrap(target.inOut)
def loadbalance = SLoadBalanceDefinition(target.loadBalance)
@@ -116,13 +118,19 @@ abstract class SAbstractDefinition[P <:
def resequence(expression: Exchange => Any) =
SResequenceDefinition(target.resequence(expression))
def rollback = wrap(target.rollback)
def routeId(routeId: String) = wrap(target.routeId(routeId))
+ @Deprecated
def routingSlip(header: String) = wrap(target.routingSlip(header))
+ @Deprecated
def routingSlip(header: String, separator: String) =
wrap(target.routingSlip(header, separator))
+
+ def routingSlip(expression: Exchange => Any, separator: String) =
wrap(target.routingSlip(expression, separator))
def routingSlip(expression: Exchange => Any) =
wrap(target.routingSlip(expression))
+
def setBody(expression: Exchange => Any) = wrap(target.setBody(expression))
def setFaultBody(expression: Exchange => Any) =
wrap(target.setFaultBody(expression))
def setHeader(name: String, expression: Exchange => Any) =
wrap(target.setHeader(name, expression))
+ def setExchangePattern(mep: ExchangePattern) =
wrap(target.setExchangePattern(mep))
def sort[T](expression: (Exchange) => Any, comparator: Comparator[T] = null)
= wrap(target.sort(expression, comparator))
def split(expression: Exchange => Any) =
SSplitDefinition(target.split(expression))
def stop = wrap(target.stop)
