You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ge...@apache.org on 2010/06/22 22:19:59 UTC
svn commit: r957013 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/model/
components/camel-scala/src/main/scala/org/apache/camel/scala/
components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/
components/camel-scala/src/main/scal...
Author: gertv
Date: Tue Jun 22 20:19:58 2010
New Revision: 957013
URL: http://svn.apache.org/viewvc?rev=957013&view=rev
Log:
CAMEL-2167: Upgrade to Scala 2.8.0.RC6
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
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/ScalaExpression.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaPredicate.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaProcessor.scala
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/SChoiceDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SPipelineDefinitionDefinition.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/builder/RouteBuilder.scala
camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BlockBeanTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetExchangePatternTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SimpleBeanTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverableRouteBuilder.scala
camel/trunk/parent/pom.xml
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OnCompletionDefinition.java Tue Jun 22 20:19:58 2010
@@ -43,7 +43,7 @@ import org.apache.camel.util.concurrent.
*/
@XmlRootElement(name = "onCompletion")
@XmlAccessorType(XmlAccessType.FIELD)
-public class OnCompletionDefinition extends ProcessorDefinition<ProcessorDefinition> implements ExecutorServiceAwareDefinition<OnCompletionDefinition> {
+public class OnCompletionDefinition extends ProcessorDefinition<OnCompletionDefinition> implements ExecutorServiceAwareDefinition<OnCompletionDefinition> {
@XmlAttribute(required = false)
private Boolean onCompleteOnly = Boolean.FALSE;
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/Preamble.scala Tue Jun 22 20:19:58 2010
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala;
+package org.apache.camel
+package scala
/**
* Trait containing common implicit conversion definitions
*/
trait Preamble {
- implicit def exchangeWrapper(exchange: Exchange[T] forSome {type T}) = new RichExchange(exchange)
+ implicit def exchangeWrapper(exchange: Exchange) = new RichExchange(exchange)
implicit def enrichInt(int: Int) = new RichInt(int)
}
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=957013&r1=957012&r2=957013&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 Tue Jun 22 20:19:58 2010
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala
+package org.apache.camel
+package scala
import reflect.Manifest
import org.apache.camel.spi.{UnitOfWork, Synchronization}
@@ -26,12 +27,11 @@ import java.lang.{Exception, String, Cla
*/
class RichExchange(val exchange : Exchange) extends Exchange {
- def in : Any = exchange.getIn().getBody()
-
def in_=(message: Any) = exchange.getIn().setBody(message)
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 out : Any = exchange.getOut().getBody()
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaExpression.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaExpression.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaExpression.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaExpression.scala Tue Jun 22 20:19:58 2010
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
/**
* Scala implementation for an Apache Camel Expression
*/
-class ScalaExpression(val expression: Exchange => Any) extends Expression[Exchange] {
+class ScalaExpression(val expression: Exchange => Any) extends Expression {
def evaluate(exchange: Exchange) = expression(exchange).asInstanceOf[Object]
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaPredicate.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaPredicate.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaPredicate.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaPredicate.scala Tue Jun 22 20:19:58 2010
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
import org.apache.camel.Predicate
import org.apache.camel.util.ObjectHelper.evaluateValuePredicate
-class ScalaPredicate(function: Exchange => Any) extends Predicate[Exchange]{
+class ScalaPredicate(function: Exchange => Any) extends Predicate {
override def matches(exchange: Exchange) = {
evaluateValuePredicate(function(exchange))
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaProcessor.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaProcessor.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaProcessor.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/ScalaProcessor.scala Tue Jun 22 20:19:58 2010
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
/**
* Scala implementation for an Apache Camel Processor
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=957013&r1=957012&r2=957013&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 Tue Jun 22 20:19:58 2010
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl
+package org.apache.camel
+package scala
+package dsl
import org.apache.camel.model.DataFormatDefinition
import reflect.Manifest;
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=957013&r1=957012&r2=957013&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 Tue Jun 22 20:19:58 2010
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala
+package dsl
import org.apache.camel.model.DataFormatDefinition
import org.apache.camel.builder.PredicateBuilder.toPredicate
@@ -42,8 +44,8 @@ abstract class SAbstractDefinition[P <:
uris.length match {
case 1 => target.to(uris(0))
case _ => {
- val multicast = target.multicast
- uris.foreach(multicast.to(_))
+ val multi = multicast
+ uris.foreach(multi.to(_))
}
}
this
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceDefinition.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SChoiceDefinition.scala Tue Jun 22 20:19:58 2010
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
import org.apache.camel.model.ChoiceDefinition
import org.apache.camel.scala.dsl.builder.RouteBuilder
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnCompletionDefinition.scala Tue Jun 22 20:19:58 2010
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl
+package org.apache.camel
+package scala.dsl
import model.{WhenDefinition,OnCompletionDefinition}
import org.apache.camel.scala.dsl.builder.RouteBuilder;
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SOnExceptionDefinition.scala Tue Jun 22 20:19:58 2010
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
import org.apache.camel.model.OnExceptionDefinition
import org.apache.camel.scala.dsl.builder.RouteBuilder
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SPipelineDefinitionDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SPipelineDefinitionDefinition.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SPipelineDefinitionDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SPipelineDefinitionDefinition.scala Tue Jun 22 20:19:58 2010
@@ -24,7 +24,15 @@ import org.apache.camel.model.PipelineDe
*/
case class SPipelineDefinition(override val target: PipelineDefinition)(implicit val builder: RouteBuilder) extends SAbstractDefinition[PipelineDefinition] {
- override def to(uris: String*) = wrap(uris.foreach(target.to(_)))
+ override def to(uris: String*) : SPipelineDefinition = {
+ uris.length match {
+ case 1 => target.to(uris(0))
+ case _ => {
+ for (uri <- uris) this.to(uri)
+ }
+ }
+ this
+ }
override def apply(block: => Unit) = wrap(super.apply(block))
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=957013&r1=957012&r2=957013&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 Tue Jun 22 20:19:58 2010
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl.builder;
+package org.apache.camel
+package scala
+package dsl.builder
import org.apache.camel.model.{ChoiceDefinition, ProcessorDefinition}
import org.apache.camel.model.DataFormatDefinition
Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/languages/Languages.scala Tue Jun 22 20:19:58 2010
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl.languages
+package org.apache.camel
+package scala.dsl.languages
import org.apache.camel.builder.Builder
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala Tue Jun 22 20:19:58 2010
@@ -18,7 +18,7 @@ package org.apache.camel.scala.dsl;
import org.w3c.dom.Document
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
/**
* Test case for message aggregator
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala Tue Jun 22 20:19:58 2010
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
class BasicRouteBuilderTest extends ScalaTestSupport {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BlockBeanTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BlockBeanTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BlockBeanTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BlockBeanTest.scala Tue Jun 22 20:19:58 2010
@@ -16,7 +16,7 @@
*/
package org.apache.camel.scala.dsl;
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
import org.apache.camel.scala.test.CartoonService
/**
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala Tue Jun 22 20:19:58 2010
@@ -16,7 +16,7 @@
*/
package org.apache.camel.scala.dsl;
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
class ContentBasedRouterTest extends ScalaTestSupport {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala Tue Jun 22 20:19:58 2010
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl;
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
class ContentEnricherTest extends ScalaTestSupport {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala Tue Jun 22 20:19:58 2010
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala
+package dsl;
import org.w3c.dom.Document
-import scala.dsl.builder.RouteBuilder
-import scala.test.Adult
+import builder.RouteBuilder
+import test.Adult
/**
* Test case for working with data formats
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala Tue Jun 22 20:19:58 2010
@@ -16,8 +16,7 @@
*/
package org.apache.camel.scala.dsl;
-import org.w3c.dom.Document
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
/**
* Test case for message delayer
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala Tue Jun 22 20:19:58 2010
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
-import org.w3c.dom.Document
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
/**
* Test case for message enricher
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala Tue Jun 22 20:19:58 2010
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl;
-import org.w3c.dom.Document
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
import junit.framework.Assert._
/**
@@ -41,7 +41,7 @@ class ExceptionHandlerTest extends Scala
val builder =
new RouteBuilder {
val failingProcessor = (exchange: Exchange) => {
- exchange.in match {
+ exchange.in[AnyRef] match {
case text: String => //graciously do nothing
case symbol: Symbol => throw new UnsupportedOperationException("We don't know how to deal with this symbolically correct")
case _ => throw new RuntimeException("Strings are good, the rest is bad")
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala Tue Jun 22 20:19:58 2010
@@ -16,7 +16,7 @@
*/
package org.apache.camel.scala.dsl;
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
class FilterRouteBuilderTest extends ScalaTestSupport {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala Tue Jun 22 20:19:58 2010
@@ -17,8 +17,6 @@
package org.apache.camel.scala.dsl;
import builder.RouteBuilder
-import org.w3c.dom.Document
-import scala.dsl.builder.RouteBuilder
/**
* Test case for message load balancer
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopTest.scala Tue Jun 22 20:19:58 2010
@@ -16,7 +16,7 @@
*/
package org.apache.camel.scala.dsl;
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
/**
* Test for looping from the Scala DSL
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala Tue Jun 22 20:19:58 2010
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
import builder.{RouteBuilderSupport, RouteBuilder}
import org.apache.camel.processor.MulticastParallelTest
@@ -56,7 +57,7 @@ class SMulticastParallelTest extends Mul
if (oldExchange == null) {
newExchange
} else {
- oldExchange.in = oldExchange.in[String] + newExchange.in[String]
+ oldExchange.in= oldExchange.in[String] + newExchange.in[String]
oldExchange
}
}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala Tue Jun 22 20:19:58 2010
@@ -16,7 +16,7 @@
*/
package org.apache.camel.scala.dsl;
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
class PipelineAndMulticastTest extends ScalaTestSupport {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala Tue Jun 22 20:19:58 2010
@@ -16,7 +16,7 @@
*/
package org.apache.camel.scala.dsl;
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
class PipelineRouteBuilderTest extends ScalaTestSupport {
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala Tue Jun 22 20:19:58 2010
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala
+package dsl
-import scala.dsl.builder.RouteBuilder
-import scala.test.{Adult, Toddler, Envelope}
+import builder.RouteBuilder
+import test.{Adult, Toddler, Envelope}
class RecipientListRouteTest extends ScalaTestSupport {
@@ -47,7 +48,7 @@ class RecipientListRouteTest extends Sca
//END SNIPPET: simple
//START SNIPPET: pattern
- "direct:b" recipients(_.in match {
+ "direct:b" recipients(_.getIn().getBody() match {
case Toddler(_) => "mock:playgarden"
case _ => "mock:work"
})
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala Tue Jun 22 20:19:58 2010
@@ -17,7 +17,7 @@
package org.apache.camel.scala.dsl;
import org.w3c.dom.Document
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
/**
* Test case for message resequencer
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RichTestUri.scala Tue Jun 22 20:19:58 2010
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
import org.apache.camel.component.mock.MockEndpoint
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala Tue Jun 22 20:19:58 2010
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
import org.w3c.dom.Document
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
import junit.framework.Assert._
/**
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnCompleteOnlyTest.scala Tue Jun 22 20:19:58 2010
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
import org.apache.camel.processor.OnCompletionGlobalTest.MyProcessor
import org.apache.camel.scala.dsl.builder.{RouteBuilderSupport, RouteBuilder}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionOnFailureOnlyTest.scala Tue Jun 22 20:19:58 2010
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
import org.apache.camel.processor.OnCompletionGlobalTest.MyProcessor
import org.apache.camel.scala.dsl.builder.{RouteBuilderSupport, RouteBuilder}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SOnCompletionWhenTest.scala Tue Jun 22 20:19:58 2010
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
import org.apache.camel.processor.OnCompletionGlobalTest.MyProcessor
import org.apache.camel.scala.dsl.builder.{RouteBuilderSupport, RouteBuilder}
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.scala Tue Jun 22 20:19:58 2010
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala
+package dsl
import org.apache.camel.ContextTestSupport
import org.apache.camel.component.mock.MockEndpoint
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala Tue Jun 22 20:19:58 2010
@@ -16,7 +16,7 @@
*/
package org.apache.camel.scala.dsl;
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
import org.apache.camel.scala.test.{Cat, Kitten}
/**
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetExchangePatternTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetExchangePatternTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetExchangePatternTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetExchangePatternTest.scala Tue Jun 22 20:19:58 2010
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
import junit.framework.Assert.assertEquals
import org.apache.camel.ExchangePattern._
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala Tue Jun 22 20:19:58 2010
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel.scala
+package dsl;
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
import org.apache.camel.scala.test.{Cat, Kitten}
/**
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SimpleBeanTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SimpleBeanTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SimpleBeanTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SimpleBeanTest.scala Tue Jun 22 20:19:58 2010
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
import org.apache.camel.scala.test.CartoonService
/**
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala Tue Jun 22 20:19:58 2010
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
import org.w3c.dom.Document
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
/**
* Test case for Splitter
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala Tue Jun 22 20:19:58 2010
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
import org.w3c.dom.Document
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
/**
* Test case for message throttler
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala Tue Jun 22 20:19:58 2010
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl;
import org.w3c.dom.Document
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
import junit.framework.Assert._
/**
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala Tue Jun 22 20:19:58 2010
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl;
+package org.apache.camel
+package scala.dsl
import org.apache.camel.scala.test.Adult
import org.w3c.dom.Document
-import scala.dsl.builder.RouteBuilder
+import builder.RouteBuilder
/**
* Test case for wiretap
Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverableRouteBuilder.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverableRouteBuilder.scala?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverableRouteBuilder.scala (original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverableRouteBuilder.scala Tue Jun 22 20:19:58 2010
@@ -14,7 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.scala.dsl.builder.scan
+package org.apache.camel.scala.dsl.builder
+package scan
/**
* RouteBuilder to be discovered by the DiscoverRouteBuilderTest
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=957013&r1=957012&r2=957013&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Jun 22 20:19:58 2010
@@ -103,7 +103,7 @@
<quartz-version>1.8.2</quartz-version>
<restlet-version>1.1.9</restlet-version>
<saxon-version>9.1.0.8</saxon-version>
- <scala-version>2.7.7</scala-version>
+ <scala-version>2.8.0.RC6</scala-version>
<scala-plugin-version>2.9.1</scala-plugin-version>
<slf4j-version>1.5.10</slf4j-version>
<smack-version>3.1.0</smack-version>