raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Upgrade to Camel 2.3.0

Browse source
This commit is contained in:
Martin Krasser 2010-05-30 08:22:23 +02:00
parent 2dd2118179
commit 2d2bdda330
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-camel/src/test/scala/CamelContextLifecycleTest.scala
View file

@ -13,7 +13,9 @@ class CamelContextLifecycleTest extends JUnitSuite with CamelContextLifecycle {
init(ctx)
assert(context.isStreamCaching === true)
assert(!context.asInstanceOf[TestCamelContext].isStarted)
assert(!template.asInstanceOf[DefaultProducerTemplate].isStarted)
// In Camel 2.3 CamelComtext.createProducerTemplate starts
// the template before returning it (wasn't started in 2.2)
assert(template.asInstanceOf[DefaultProducerTemplate].isStarted)
start
assert(context.asInstanceOf[TestCamelContext].isStarted)
assert(template.asInstanceOf[DefaultProducerTemplate].isStarted)

12
akka-samples/akka-sample-camel/src/main/scala/Boot.scala
View file

@ -45,21 +45,19 @@ class Boot {
// Publish subscribe example
//
// Cometd example is disabled because of unresolved sbt/ivy dependency resolution issues.
// If you want to run this example, make sure to replace all jetty-*-6.1.22.jar files
// on the classpath with corresponding jetty-*-6.1.11.jar files.
// Cometd example commented out because camel-cometd is broken in Camel 2.3
//
//val cometdUri = "cometd://localhost:8111/test/abc?resourceBase=target"
//val cometdSubscriber = new Subscriber("cometd-subscriber", cometdUri).start
//val cometdPublisher = new Publisher("cometd-publisher", cometdUri).start
//val cometdUri = "cometd://localhost:8111/test/abc?baseResource=file:target"
//val cometdSubscriber = actorOf(new Subscriber("cometd-subscriber", cometdUri)).start
//val cometdPublisher = actorOf(new Publisher("cometd-publisher", cometdUri)).start
val jmsUri = "jms:topic:test"
val jmsSubscriber1 = actorOf(new Subscriber("jms-subscriber-1", jmsUri)).start
val jmsSubscriber2 = actorOf(new Subscriber("jms-subscriber-2", jmsUri)).start
val jmsPublisher = actorOf(new Publisher("jms-publisher", jmsUri)).start
//val cometdPublisherBridge = new PublisherBridge("jetty:http://0.0.0.0:8877/camel/pub/cometd", cometdPublisher).start
//val cometdPublisherBridge = actorOf(new PublisherBridge("jetty:http://0.0.0.0:8877/camel/pub/cometd", cometdPublisher)).start
val jmsPublisherBridge = actorOf(new PublisherBridge("jetty:http://0.0.0.0:8877/camel/pub/jms", jmsPublisher)).start
actorOf[Consumer4].start // POSTing "stop" to http://0.0.0.0:8877/camel/stop stops and unpublishes this actor

9
project/build/AkkaProject.scala
View file

@ -234,7 +234,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
}
class AkkaCamelProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
val camel_core = "org.apache.camel" % "camel-core" % "2.2.0" % "compile"
val camel_core = "org.apache.camel" % "camel-core" % "2.3.0" % "compile"
}
class AkkaPersistenceCommonProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
@ -337,11 +337,10 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
}
class AkkaSampleCamelProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) {
val commons_codec = "commons-codec" % "commons-codec" % "1.3" % "compile"
val spring_jms = "org.springframework" % "spring-jms" % "3.0.1.RELEASE" % "compile"
val camel_jetty = "org.apache.camel" % "camel-jetty" % "2.2.0" % "compile"
val camel_jms = "org.apache.camel" % "camel-jms" % "2.2.0" % "compile"
val activemq_core = "org.apache.activemq" % "activemq-core" % "5.3.0" % "compile"
val camel_jetty = "org.apache.camel" % "camel-jetty" % "2.3.0" % "compile"
val camel_jms = "org.apache.camel" % "camel-jms" % "2.3.0" % "compile"
val activemq_core = "org.apache.activemq" % "activemq-core" % "5.3.2" % "compile"
}
class AkkaSampleSecurityProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) {