Use configuration to initialize rabbit conection factory

diff --git a/logic/src/main/scala/gr/grnet/aquarium/messaging/amqp/rabbitmq/v091/RabbitMQConfiguration.scala b/logic/src/main/scala/gr/grnet/aquarium/messaging/amqp/rabbitmq/v091/RabbitMQConfiguration.scala
index 9b7c000..9e3e43f 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/messaging/amqp/rabbitmq/v091/RabbitMQConfiguration.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/messaging/amqp/rabbitmq/v091/RabbitMQConfiguration.scala
@@ -46,7 +46,17 @@ import gr.grnet.aquarium.util.Loggable
  * @author Christos KK Loverdos <loverdos@gmail.com>.
  */
 class RabbitMQConfiguration(val confModel: RabbitMQConfigurationModel) extends AMQPConfiguration with Loggable {
-  private[v091] val _rabbitConnectionFactory = new JackRabbitConnectionFactory
+  private[v091] val _rabbitConnectionFactory = {
+    val _cf = new JackRabbitConnectionFactory
+
+    _cf.setUsername(confModel.username)
+    _cf.setPassword(confModel.password)
+    _cf.setHost(confModel.host)
+    _cf.setPort(confModel.port)
+    _cf.setVirtualHost(confModel.virtualHost)
+
+    _cf
+  }
 
   private val _name = confModel.name
   def name = _name
@@ -61,42 +71,7 @@ class RabbitMQConfiguration(val confModel: RabbitMQConfigurationModel) extends A
 
 
 object RabbitMQConfiguration {
-
   object RCFolders {
     val rabbitmq = "rabbitmq"
-
-    val producers = "producers"
-    val consumers = "consumers"
-  }
-
-  object PropFiles {
-    val configurations = "configuration.properties"
   }
-
-  object PropKeys {
-    val configurations = "configurations"
-
-    // configuration
-    val addresses = "addresses"
-    val username = "username"
-    val password = "password"
-    val host = "host"
-    val virtualHost = "virtualHost"
-    val port = "port"
-    val connections = "connections"
-
-    // connection
-    val exchange = "exchange"
-    val exchangeType = "exchangeType"
-    val exchangeIsDurable = "exchangeIsDurable"
-    val producers = "producers"
-    val consumers = "consumers"
-
-    // producer
-    val routingKey = "routingKey"
-
-    // consumer
-    val queue = "queue"
-  }
-
 }
\ No newline at end of file

diff --git a/logic/src/main/scala/gr/grnet/aquarium/messaging/amqp/rabbitmq/v091/RabbitMQConsumer.scala b/logic/src/main/scala/gr/grnet/aquarium/messaging/amqp/rabbitmq/v091/RabbitMQConsumer.scala
index fc9b18a..d9d0398 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/messaging/amqp/rabbitmq/v091/RabbitMQConsumer.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/messaging/amqp/rabbitmq/v091/RabbitMQConsumer.scala
@@ -48,8 +48,8 @@ class RabbitMQConsumer(private[v091] val owner: RabbitMQConnection, val confMode
   def name = confModel.name
 
   override def toString = {
-      val connName = owner.name
-      val confName = owner.owner.name
-      "RabbitMQConsumer(%s/%s/%s)".format(confName, connName, name)
-    }
+    val connName = owner.name
+    val confName = owner.owner.name
+    "RabbitMQConsumer(%s/%s/%s)".format(confName, connName, name)
+  }
 }
\ No newline at end of file

diff --git a/logic/src/main/scala/gr/grnet/aquarium/messaging/amqp/rabbitmq/v091/RabbitMQProducer.scala b/logic/src/main/scala/gr/grnet/aquarium/messaging/amqp/rabbitmq/v091/RabbitMQProducer.scala
index 663c82b..5fbd46a 100644 (file)
--- a/logic/src/main/scala/gr/grnet/aquarium/messaging/amqp/rabbitmq/v091/RabbitMQProducer.scala
+++ b/logic/src/main/scala/gr/grnet/aquarium/messaging/amqp/rabbitmq/v091/RabbitMQProducer.scala
@@ -66,16 +66,14 @@ class RabbitMQProducer(private[v091] val owner: RabbitMQConnection, val confMode
   }
 
   def publish(message: String, headers: Map[String, String] = Map()) = {
-    _publish(message, headers){_ =>}{_ => ()} {_ => logger.error("publish() from producer %ss".format())}
+    _publish(message, headers){_ =>}{_ => ()} {_ => logger.error("publish() from producer %s".format())}
   }
 
   def publishWithConfirm(message: String, headers: Map[String, String] = Map()) = {
-    _publish(message, headers) { _.confirmSelect() }{ _.waitForConfirms() } {_ => logger.error("publishWithConfirm() from producer %ss".format())}
+    _publish(message, headers) { _.confirmSelect() }{ _.waitForConfirms() } {_ => logger.error("publishWithConfirm() from producer %s".format())}
   }
 
   override def toString = {
-    val connName = owner.name
-    val confName = owner.owner.name
-    "RabbitMQProducer(%s/%s/%s)".format(confName, connName, name)
+    "RabbitMQProducer(%s/%s/%s)".format(owner.owner.name, owner.name, name)
   }
 }
\ No newline at end of file