Mailing-List: contact dev-help@camel.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@camel.apache.org
Received-SPF: pass (athena.apache.org: domain of claus.ibsen@gmail.com
 designates 209.85.223.177 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <20130324033011.0768423888EA@eris.apache.org>
References: <20130324033011.0768423888EA@eris.apache.org>
From: Claus Ibsen <claus.ibsen@gmail.com>
Date: Sun, 24 Mar 2013 12:05:05 +0100
Message-ID: 
 <CAGB5yNkt==gm1b9sGu1X0qQG0rEAaLk5YhYj6k4yq-8PU4gc9g@mail.gmail.com>
Subject: Re: svn commit: r1460258 - in
 /camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala:
 RichExchange.scala dsl/SAbstractDefinition.scala
 dsl/builder/RouteBuilder.scala
To: dev@camel.apache.org
Content-Type: text/plain; charset=ISO-8859-1

Hi Willem

These recent Scala changes breaks the code. The code on trunk doesn't
compile anymore.
We should revert these commits.

As Camel 2.11 is supporting both Scala 2.10 and 2.9. So we should keep
the scala code as is. Supporting both.

>From Camel 2.12 / 3.0 onwards. We drop support for Scala 2.9, and then
we can include these Scala code changes. And only have one camel-scala
component.


On Sun, Mar 24, 2013 at 4:30 AM,  <ningjiang@apache.org> wrote:
> Author: ningjiang
> Date: Sun Mar 24 03:30:10 2013
> New Revision: 1460258
>
> URL: http://svn.apache.org/r1460258
> Log:
> Fixed some compiling warnings of camel-scala
>
> Modified:
>     camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.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/RichExchange.scala
> URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala?rev=1460258&r1=1460257&r2=1460258&view=diff
> ==============================================================================
> --- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala (original)
> +++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/RichExchange.scala Sun Mar 24 03:30:10 2013
> @@ -32,9 +32,9 @@ class RichExchange(val exchange : Exchan
>    def in(header:String) : Any = exchange.getIn.getHeader(header)
>
>    def in = exchange.getIn.getBody
> -  def in[T](implicit manifest: Manifest[T]) : T = exchange.getIn.getBody(manifest.erasure).asInstanceOf[T]
> +  def in[T](implicit manifest: Manifest[T]) : T = exchange.getIn.getBody(manifest.runtimeClass).asInstanceOf[T]
>
> -  def out : Any = exchange.getOut.getBody
> +  def out = exchange.getOut.getBody
>
>    def out(header:String) : Any = exchange.getOut.getHeader(header)
>
>
> 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=1460258&r1=1460257&r2=1460258&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 24 03:30:10 2013
> @@ -74,7 +74,7 @@ abstract class SAbstractDefinition[P <:
>
>    def filter(predicate: Exchange => Any) = SFilterDefinition(target.filter(predicateBuilder(predicate)))
>
> -  def handle[E <: Throwable](block: => Unit)(implicit manifest: Manifest[E]) = SOnExceptionDefinition[E](target.onException(manifest.erasure.asInstanceOf[Class[Throwable]])).apply(block)
> +  def handle[E <: Throwable](block: => Unit)(implicit manifest: Manifest[E]) = SOnExceptionDefinition[E](target.onException(manifest.runtimeClass.asInstanceOf[Class[Throwable]])).apply(block)
>
>    def id(id : String) = wrap(target.id(id))
>    def idempotentConsumer(expression: Exchange => Any) = SIdempotentConsumerDefinition(target.idempotentConsumer(expression, null))
>
> 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=1460258&r1=1460257&r2=1460258&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 24 03:30:10 2013
> @@ -85,7 +85,7 @@ class RouteBuilder extends Preamble with
>     */
>    def handle[E <: Throwable](block: => Unit)(implicit manifest: Manifest[E]) = {
>      stack.size match {
> -      case 0 => SOnExceptionDefinition[E](builder.onException(manifest.erasure.asInstanceOf[Class[Throwable]]))(this).apply(block)
> +      case 0 => SOnExceptionDefinition[E](builder.onException(manifest.runtimeClass.asInstanceOf[Class[Throwable]]))(this).apply(block)
>        case _ => stack.top.handle[E](block)
>      }
>    }
>
>


-- 
Claus Ibsen
-----------------
Red Hat, Inc.
FuseSource is now part of Red Hat
Email: cibsen@redhat.com
Web: http://fusesource.com
Twitter: davsclaus
Blog: http://davsclaus.com
Author of Camel in Action: http://www.manning.com/ibsen