Author: ningjiang
Date: Mon Mar 25 08:23:58 2013
New Revision: 1460543
URL: http://svn.apache.org/r1460543
Log:
CAMEL-6182 Fixed the build and test error of camel-scala29
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/converter/ScalaCollections.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/converter/ConverterSpec.scala
camel/trunk/components/camel-scala29/pom.xml
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=1460543&r1=1460542&r2=1460543&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
Mon Mar 25 08:23:58 2013
@@ -32,7 +32,7 @@ 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.runtimeClass).asInstanceOf[T]
+ def in[T](implicit manifest: Manifest[T]) : T =
exchange.getIn.getBody(manifest.erasure).asInstanceOf[T]
def out = exchange.getOut.getBody
Modified:
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaCollections.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaCollections.scala?rev=1460543&r1=1460542&r2=1460543&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaCollections.scala
(original)
+++
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/converter/ScalaCollections.scala
Mon Mar 25 08:23:58 2013
@@ -75,8 +75,7 @@ class ScalaImmutableCollections {
@Converter
class ScalaMutableCollections {
- import collection.mutable.{Buffer, Map, Seq, Set}
- import collection.concurrent.{Map => ConcurrentMap}
+ import collection.mutable.{ConcurrentMap, Buffer, Map, Seq, Set}
import java.util.{Dictionary => JDictionary, List => JList, Map => JMap, Set
=> JSet}
import java.util.concurrent.{ConcurrentMap => JConcurrentMap}
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=1460543&r1=1460542&r2=1460543&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
Mon Mar 25 08:23:58 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.runtimeClass.asInstanceOf[Class[Throwable]])).apply(block)
+ def handle[E <: Throwable](block: => Unit)(implicit manifest: Manifest[E]) =
SOnExceptionDefinition[E](target.onException(manifest.erasure.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=1460543&r1=1460542&r2=1460543&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
Mon Mar 25 08:23:58 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.runtimeClass.asInstanceOf[Class[Throwable]]))(this).apply(block)
+ case 0 =>
SOnExceptionDefinition[E](builder.onException(manifest.erasure.asInstanceOf[Class[Throwable]]))(this).apply(block)
case _ => stack.top.handle[E](block)
}
}
Modified:
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ConverterSpec.scala
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ConverterSpec.scala?rev=1460543&r1=1460542&r2=1460543&view=diff
==============================================================================
---
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ConverterSpec.scala
(original)
+++
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ConverterSpec.scala
Mon Mar 25 08:23:58 2013
@@ -90,8 +90,7 @@ class ConverterSpec extends FunSpec with
}
describe("mutable collections converter") {
- import collection.mutable.{Buffer, Map, Seq, Set}
- import collection.concurrent.{Map => ConcurrentMap}
+ import collection.mutable.{ConcurrentMap, Buffer, Map, Seq, Set}
import java.util.{Dictionary => JDictionary, Hashtable => JHashtable,
Collections, List => JList, Map => JMap, Set => JSet}
import java.util.concurrent.{ConcurrentHashMap => JConcurrentHashMap}
@@ -162,5 +161,5 @@ class ConverterSpec extends FunSpec with
}
}
- private def to[T](x: AnyRef)(implicit m: Manifest[T]): Option[T] = Option(
context.getTypeConverter.mandatoryConvertTo(m.runtimeClass, x).asInstanceOf[T] )
+ private def to[T](x: AnyRef)(implicit m: Manifest[T]): Option[T] = Option(
context.getTypeConverter.mandatoryConvertTo(m.erasure, x).asInstanceOf[T] )
}
Modified: camel/trunk/components/camel-scala29/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala29/pom.xml?rev=1460543&r1=1460542&r2=1460543&view=diff
==============================================================================
--- camel/trunk/components/camel-scala29/pom.xml (original)
+++ camel/trunk/components/camel-scala29/pom.xml Mon Mar 25 08:23:58 2013
@@ -52,6 +52,12 @@
<!-- test dependencies -->
<dependency>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest_${scala29-version}</artifactId>
+ <version>1.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
<type>test-jar</type>
