From a3408bf3f8c0c1916754a036e1fcdb06e4b6d063 Mon Sep 17 00:00:00 2001
From: Martin Krasser <krasserm@googlemail.com>
Date: Sat, 16 Jul 2011 11:40:24 +0200
Subject: [PATCH] Move sampleCamel-specific Ivy XML to Dependencies object

---
 project/AkkaBuild.scala | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 0e47476ac9..76a6c9646d 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -224,25 +224,12 @@ object AkkaBuild extends Build {
     settings = defaultSettings
   )
 
-  lazy val camelSampleXML =
-    <dependencies>
-      <dependency org="org.apache.camel" name="camel-jms" rev={Dependency.V.Camel}>
-        <exclude module="camel-core"/>
-      </dependency>
-      <dependency org="org.apache.camel" name="camel-spring" rev={Dependency.V.Camel}>
-        <exclude module="camel-core"/>
-      </dependency>
-      <!--<dependency org="org.apache.camel" name="camel-jetty" rev={Dependency.V.CamelPatch}>
-        <exclude module="camel-core"/>
-      </dependency>-->
-    </dependencies>
-
   lazy val camelSample = Project(
     id = "akka-sample-camel",
     base = file("akka-samples/akka-sample-camel"),
     dependencies = Seq(actor, camelTyped),
     settings = defaultSettings ++ Seq(
-      ivyXML := camelSampleXML,
+      ivyXML := Dependencies.sampleCamelXML,
       libraryDependencies ++= Dependencies.sampleCamel
     )
   )
@@ -382,6 +369,20 @@ object Dependencies {
 
   val sampleCamel = Seq(camelCore, commonsCodec, Runtime.activemq, Runtime.springJms,
     Test.junit, Test.scalatest, Test.logback)
+
+  val sampleCamelXML =
+    <dependencies>
+      <dependency org="org.apache.camel" name="camel-jms" rev={V.Camel}>
+        <exclude module="camel-core"/>
+      </dependency>
+      <dependency org="org.apache.camel" name="camel-spring" rev={V.Camel}>
+        <exclude module="camel-core"/>
+      </dependency>
+      <!-- TODO: resolve Jetty version conflict -->
+      <!--<dependency org="org.apache.camel" name="camel-jetty" rev={Dependency.V.CamelPatch}>
+        <exclude module="camel-core"/>
+      </dependency>-->
+    </dependencies>
 }
 
 object Dependency {