You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by le...@apache.org on 2012/07/04 16:16:55 UTC
svn commit: r1357276 - in /esme/branches/akka/src/main:
resources/props/default.props scala/org/apache/esme/actor/UserActor.scala
scala/org/apache/esme/actor/XmppSender.scala
Author: lester
Date: Wed Jul 4 14:16:55 2012
New Revision: 1357276
URL: http://svn.apache.org/viewvc?rev=1357276&view=rev
Log:
Externalized XMPP service name to exchange messages with.
Modified:
esme/branches/akka/src/main/resources/props/default.props
esme/branches/akka/src/main/scala/org/apache/esme/actor/UserActor.scala
esme/branches/akka/src/main/scala/org/apache/esme/actor/XmppSender.scala
Modified: esme/branches/akka/src/main/resources/props/default.props
URL: http://svn.apache.org/viewvc/esme/branches/akka/src/main/resources/props/default.props?rev=1357276&r1=1357275&r2=1357276&view=diff
==============================================================================
--- esme/branches/akka/src/main/resources/props/default.props (original)
+++ esme/branches/akka/src/main/resources/props/default.props Wed Jul 4 14:16:55 2012
@@ -72,3 +72,5 @@ xmpp.port=5222
xmpp.user=esmeapp
;Password for user above
xmpp.password=talk_2_us
+;Service name to exchange messages with, for example jabber.org
+xmpp.serviceName=jabber.org
Modified: esme/branches/akka/src/main/scala/org/apache/esme/actor/UserActor.scala
URL: http://svn.apache.org/viewvc/esme/branches/akka/src/main/scala/org/apache/esme/actor/UserActor.scala?rev=1357276&r1=1357275&r2=1357276&view=diff
==============================================================================
--- esme/branches/akka/src/main/scala/org/apache/esme/actor/UserActor.scala (original)
+++ esme/branches/akka/src/main/scala/org/apache/esme/actor/UserActor.scala Wed Jul 4 14:16:55 2012
@@ -63,8 +63,9 @@ object UserActor {
val xmppPort = Props.get("xmpp.port") openOr ""
val xmppUsr = Props.get("xmpp.user") openOr ""
val xmppPwd = Props.get("xmpp.password") openOr ""
+ val xmppServiceName = Props.get("xmpp.serviceName") openOr ""
lazy val sys = ActorSystem("camel")
- lazy val XmppSender = sys.actorOf(AkkaProps(new XmppSender(xmppHost, xmppPort.toInt, xmppUsr, xmppPwd)))
+ lazy val XmppSender = sys.actorOf(AkkaProps(new XmppSender(xmppHost, xmppPort.toInt, xmppUsr, xmppPwd, xmppServiceName)))
}
Modified: esme/branches/akka/src/main/scala/org/apache/esme/actor/XmppSender.scala
URL: http://svn.apache.org/viewvc/esme/branches/akka/src/main/scala/org/apache/esme/actor/XmppSender.scala?rev=1357276&r1=1357275&r2=1357276&view=diff
==============================================================================
--- esme/branches/akka/src/main/scala/org/apache/esme/actor/XmppSender.scala (original)
+++ esme/branches/akka/src/main/scala/org/apache/esme/actor/XmppSender.scala Wed Jul 4 14:16:55 2012
@@ -23,7 +23,7 @@ object XmppSender {
val logger: Logger = Logger("org.apache.esme.actor")
}
-class XmppSender(esmeSrv: String, esmePort: Int, esmeUsr: String, esmePwd: String) extends Actor with Producer with Oneway {
+class XmppSender(esmeSrv: String, esmePort: Int, esmeUsr: String, esmePwd: String, xmppServiceName: String) extends Actor with Producer with Oneway {
import XmppSender._
// Ugly, but at the moment there's no other way
@@ -38,7 +38,7 @@ class XmppSender(esmeSrv: String, esmePo
(action: @unchecked) match {
case XmppTo(who, body) =>
participant = who
- new CamelMessage(body.cata(s => s, ""), Map("participant" -> ("%s" format who), "serviceName" -> "jabber.org"))
+ new CamelMessage(body.cata(s => s, ""), Map("participant" -> ("%s" format who), "serviceName" -> xmppServiceName))
}
}
case _ =>