Index: /trunk/.project =================================================================== --- /trunk/.project (revision 83) +++ /trunk/.project (revision 84) @@ -6,4 +6,9 @@ + + org.python.pydev.PyDevBuilder + + + org.eclipse.jdt.core.javabuilder @@ -20,4 +25,5 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.python.pydev.pythonNature Index: /trunk/.pydevproject =================================================================== --- /trunk/.pydevproject (revision 84) +++ /trunk/.pydevproject (revision 84) @@ -0,0 +1,5 @@ + + +Default +python 2.7 + Index: /trunk/pom.xml =================================================================== --- /trunk/pom.xml (revision 83) +++ /trunk/pom.xml (revision 84) @@ -4,5 +4,5 @@ objectmq objectmq - 0.5.4 + 0.5.5 objectmq Middleware based on AMQP Index: /trunk/src/main/java/omq/client/listener/ResponseListener.java =================================================================== --- /trunk/src/main/java/omq/client/listener/ResponseListener.java (revision 83) +++ /trunk/src/main/java/omq/client/listener/ResponseListener.java (revision 84) @@ -120,5 +120,7 @@ String reply_queue = env.getProperty(ParameterQueue.RPC_REPLY_QUEUE); - boolean durable = Boolean.parseBoolean(env.getProperty(ParameterQueue.DURABLE_QUEUES, "false")); + boolean durable = Boolean.parseBoolean(env.getProperty(ParameterQueue.DURABLE_QUEUE, "false")); + boolean exclusive = Boolean.parseBoolean(env.getProperty(ParameterQueue.EXCLUSIVE_QUEUE, "true")); + boolean autoDelete = Boolean.parseBoolean(env.getProperty(ParameterQueue.AUTO_DELETE_QUEUE, "true")); int ttl = Integer.parseInt(env.getProperty(ParameterQueue.MESSAGE_TTL_IN_QUEUES, "-1")); @@ -128,6 +130,12 @@ } - channel.queueDeclare(reply_queue, durable, false, false, args); - logger.info("ResponseListener creating queue: " + reply_queue + ", durable: " + durable + "TTL: " + (ttl > 0 ? ttl : "not set")); + if (reply_queue == null) { + reply_queue = channel.queueDeclare().getQueue(); + env.setProperty(ParameterQueue.RPC_REPLY_QUEUE, reply_queue); + } else { + channel.queueDeclare(reply_queue, durable, exclusive, autoDelete, args); + } + logger.info("ResponseListener creating queue: " + reply_queue + ", durable: " + durable + ", exclusive: " + exclusive + ", autoDelete: " + autoDelete + + ", TTL: " + (ttl > 0 ? ttl : "not set")); // Declare a new consumer Index: /trunk/src/main/java/omq/client/proxy/Proxymq.java =================================================================== --- /trunk/src/main/java/omq/client/proxy/Proxymq.java (revision 83) +++ /trunk/src/main/java/omq/client/proxy/Proxymq.java (revision 84) @@ -92,5 +92,5 @@ // this.channel = Broker.getChannel(); env = broker.getEnvironment(); - exchange = env.getProperty(ParameterQueue.RPC_EXCHANGE); + exchange = env.getProperty(ParameterQueue.RPC_EXCHANGE, ""); multiExchange = multi + uid; replyQueueName = env.getProperty(ParameterQueue.RPC_REPLY_QUEUE); Index: /trunk/src/main/java/omq/common/util/ParameterQueue.java =================================================================== --- /trunk/src/main/java/omq/common/util/ParameterQueue.java (revision 83) +++ /trunk/src/main/java/omq/common/util/ParameterQueue.java (revision 84) @@ -9,13 +9,17 @@ public class ParameterQueue { - /** - * Set the proxy's serializer method + /* + * Connection info */ - public static String PROXY_SERIALIZER = "omq.serializer"; /** - * Set whether the messages must be compressed or not + * Set the clients username */ - public static String ENABLE_COMPRESSION = "omq.compression"; + public static String USER_NAME = "omq.username"; + + /** + * Set the clients password + */ + public static String USER_PASS = "omq.pass"; /** @@ -30,12 +34,17 @@ /** - * Set the clients username + * Set if the system will use ssl */ - public static String USER_NAME = "omq.username"; + public static String ENABLE_SSL = "omq.enable_ssl"; /** - * Set the clients password + * Set how many time we have to wait to retry the connection with the server + * when this goes down */ - public static String USER_PASS = "omq.pass"; + public static String RETRY_TIME_CONNECTION = "omq.retry_connection"; + + /* + * Queues info + */ /** @@ -51,39 +60,13 @@ /** - * Set if the queues must be durable. The queues won't be lost when rabbitmq - * crashes if DURABLE_QUEUES is set trues. - */ - public static String DURABLE_QUEUES = "omq.durable_queue"; - - /** - * The MESSAGE_TTL_IN_QUEUES controls for how long a message published to - * the queues can live before it is discarded. A message that has been in - * the queue for longer than the configured TTL is said to be dead. - * - * This property must be a non-negative 32 bit integer (0 <= n <= 2^32-1), - * describing the TTL period in milliseconds. - */ - public static String MESSAGE_TTL_IN_QUEUES = "omq.message_ttl_queue"; - - /** - * Set if the system will use ssl - */ - public static String ENABLE_SSL = "omq.enable_ssl"; - - /** - * Set how many time we have to wait to retry the connection with the server - * when this goes down - */ - public static String RETRY_TIME_CONNECTION = "omq.retry_connection"; - - /** - * Set how many threads will be created to invoke remote methods - */ - public static String NUM_THREADS = "omq.num_threads"; - - /** * Set the specific name of a multi queue in a specific object */ public static String MULTI_QUEUE_NAME = "omq.multi_queue_name"; + + /** + * Set if a queue must be durable. The queue won't be lost when RabbitMQ + * crashes if DURABLE_QUEUE is set true. + */ + public static String DURABLE_QUEUE = "omq.durable_queue"; /** @@ -99,8 +82,58 @@ /** + * Set if a queue must be durable. The queue won't be lost when RabbitMQ + * crashes if DURABLE_QUEUE is set true. + */ + public static String DURABLE_MQUEUE = "omq.durable_mqueue"; + + /** + * Set if server will delete a queue when is no longer in use + */ + public static String AUTO_DELETE_MQUEUE = "omq.auto_mdelete"; + + /** + * Set if we are declaring an exclusive queue (restricted to this + * connection) + */ + public static String EXCLUSIVE_MQUEUE = "omq.exclusive_mqueue"; + + /** + * The MESSAGE_TTL_IN_QUEUES controls for how long a message published to + * the queues can live before it is discarded. A message that has been in + * the queue for longer than the configured TTL is said to be dead. + * + * This property must be a non-negative 32 bit integer (0 <= n <= 2^32-1), + * describing the TTL period in milliseconds. + */ + public static String MESSAGE_TTL_IN_QUEUES = "omq.message_ttl_queue"; + + /* + * Message info + */ + + /** + * Set the proxy's serializer method + */ + public static String PROXY_SERIALIZER = "omq.serializer"; + + /** + * Set whether the messages must be compressed or not + */ + public static String ENABLE_COMPRESSION = "omq.compression"; + + /** * Set 1 to indicate the message will be nonpersistent and 2 to indicate it * will be persistent */ public static String DELIVERY_MODE = "omq.delivery_mode"; + + /* + * ObjectMQ info + */ + + /** + * Set how many threads will be created to invoke remote methods + */ + public static String NUM_THREADS = "omq.num_threads"; /** Index: /trunk/src/main/java/omq/server/RemoteObject.java =================================================================== --- /trunk/src/main/java/omq/server/RemoteObject.java (revision 83) +++ /trunk/src/main/java/omq/server/RemoteObject.java (revision 84) @@ -39,7 +39,7 @@ private String UID; - private String multiQueue; private Properties env; private transient Broker broker; + private transient String multiQueue; private transient RemoteWrapper remoteWrapper; private transient Map>> params; @@ -77,5 +77,4 @@ this.broker = broker; this.UID = reference; - this.multiQueue = UID + System.currentTimeMillis(); this.env = env; @@ -262,34 +261,59 @@ */ private void startQueues() throws Exception { + // Start channel + channel = broker.getNewChannel(); + + /* + * Default queue, Round Robin behaviour + */ + // Get info about which exchange and queue will use - String exchange = env.getProperty(ParameterQueue.RPC_EXCHANGE); + String exchange = env.getProperty(ParameterQueue.RPC_EXCHANGE, ""); String queue = UID; String routingKey = UID; - // Multi info - String multiExchange = multi + UID; - if (env.getProperty(ParameterQueue.MULTI_QUEUE_NAME) != null) { - multiQueue = env.getProperty(ParameterQueue.MULTI_QUEUE_NAME); - } - - boolean durable = Boolean.parseBoolean(env.getProperty(ParameterQueue.DURABLE_QUEUES, "false")); + // RemoteObject default queue + boolean durable = Boolean.parseBoolean(env.getProperty(ParameterQueue.DURABLE_QUEUE, "false")); boolean exclusive = Boolean.parseBoolean(env.getProperty(ParameterQueue.EXCLUSIVE_QUEUE, "false")); boolean autoDelete = Boolean.parseBoolean(env.getProperty(ParameterQueue.AUTO_DELETE_QUEUE, "false")); - // Start channel - channel = broker.getNewChannel(); - // Declares and bindings - logger.info("RemoteObject: " + UID + " declaring direct exchange: " + exchange + ", Queue: " + queue + ", Durable: " + durable + ", Exclusive: " + if (!exchange.equalsIgnoreCase("")) { // Default exchange case + channel.exchangeDeclare(exchange, "direct"); + } + channel.queueDeclare(queue, durable, exclusive, autoDelete, null); + if (!exchange.equalsIgnoreCase("")) { // Default exchange case + channel.queueBind(queue, exchange, routingKey); + } + logger.info("RemoteObject: " + UID + " declared direct exchange: " + exchange + ", Queue: " + queue + ", Durable: " + durable + ", Exclusive: " + exclusive + ", AutoDelete: " + autoDelete); - channel.exchangeDeclare(exchange, "direct"); - channel.queueDeclare(queue, durable, exclusive, autoDelete, null); - channel.queueBind(queue, exchange, routingKey); - - logger.info("RemoteObject: " + UID + " declaring fanout exchange: " + multiExchange + ", Queue: " + multiQueue + ", Durable: " + durable - + ", Exclusive: " + exclusive + ", AutoDelete: " + autoDelete); + + /* + * Multi queue, exclusive per each instance + */ + + // Get info about the multiQueue + String multiExchange = multi + UID; + multiQueue = env.getProperty(ParameterQueue.MULTI_QUEUE_NAME); + + // Multi queue (exclusive queue per remoteObject) + boolean multiDurable = Boolean.parseBoolean(env.getProperty(ParameterQueue.DURABLE_MQUEUE, "false")); + boolean multiExclusive = Boolean.parseBoolean(env.getProperty(ParameterQueue.EXCLUSIVE_MQUEUE, "true")); + boolean multiAutoDelete = Boolean.parseBoolean(env.getProperty(ParameterQueue.AUTO_DELETE_MQUEUE, "true")); + + // Declares and bindings channel.exchangeDeclare(multiExchange, "fanout"); - channel.queueDeclare(multiQueue, durable, exclusive, autoDelete, null); + if (multiQueue == null) { + multiQueue = channel.queueDeclare().getQueue(); + } else { + channel.queueDeclare(multiQueue, multiDurable, multiExclusive, multiAutoDelete, null); + } channel.queueBind(multiQueue, multiExchange, ""); + logger.info("RemoteObject: " + UID + " declared fanout exchange: " + multiExchange + ", Queue: " + multiQueue + ", Durable: " + multiDurable + + ", Exclusive: " + multiExclusive + ", AutoDelete: " + multiAutoDelete); + + /* + * Consumer + */ // Declare a new consumer Index: /trunk/src/test/java/omq/test/calculator/CalculatorTest.java =================================================================== --- /trunk/src/test/java/omq/test/calculator/CalculatorTest.java (revision 83) +++ /trunk/src/test/java/omq/test/calculator/CalculatorTest.java (revision 84) @@ -38,5 +38,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.PROXY_SERIALIZER, type); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); @@ -69,5 +69,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); Index: /trunk/src/test/java/omq/test/event/MessageTest.java =================================================================== --- /trunk/src/test/java/omq/test/event/MessageTest.java (revision 83) +++ /trunk/src/test/java/omq/test/event/MessageTest.java (revision 84) @@ -40,5 +40,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.PROXY_SERIALIZER, type); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); @@ -70,5 +70,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); Index: /trunk/src/test/java/omq/test/exception/ExceptionTest.java =================================================================== --- /trunk/src/test/java/omq/test/exception/ExceptionTest.java (revision 83) +++ /trunk/src/test/java/omq/test/exception/ExceptionTest.java (revision 84) @@ -37,5 +37,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.PROXY_SERIALIZER, type); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); @@ -67,5 +67,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); Index: /trunk/src/test/java/omq/test/faultTolerance/FaultToleranceTest.java =================================================================== --- /trunk/src/test/java/omq/test/faultTolerance/FaultToleranceTest.java (revision 83) +++ /trunk/src/test/java/omq/test/faultTolerance/FaultToleranceTest.java (revision 84) @@ -38,5 +38,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.PROXY_SERIALIZER, type); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); @@ -75,5 +75,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); Index: /trunk/src/test/java/omq/test/multiProcess/MultiProcessTest.java =================================================================== --- /trunk/src/test/java/omq/test/multiProcess/MultiProcessTest.java (revision 83) +++ /trunk/src/test/java/omq/test/multiProcess/MultiProcessTest.java (revision 84) @@ -36,5 +36,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.PROXY_SERIALIZER, type); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); @@ -66,5 +66,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); Index: /trunk/src/test/java/omq/test/observer/ObserverTest.java =================================================================== --- /trunk/src/test/java/omq/test/observer/ObserverTest.java (revision 83) +++ /trunk/src/test/java/omq/test/observer/ObserverTest.java (revision 84) @@ -39,5 +39,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.PROXY_SERIALIZER, type); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); @@ -69,5 +69,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); Index: /trunk/src/test/java/omq/test/persistence/PersistentTest.java =================================================================== --- /trunk/src/test/java/omq/test/persistence/PersistentTest.java (revision 83) +++ /trunk/src/test/java/omq/test/persistence/PersistentTest.java (revision 84) @@ -48,9 +48,13 @@ msgImplProps = new Properties(); msgImplProps.setProperty(ParameterQueue.RPC_EXCHANGE, "rpc_exchange"); - msgImplProps.setProperty(ParameterQueue.DURABLE_QUEUES, "true"); + msgImplProps.setProperty(ParameterQueue.DURABLE_QUEUE, "true"); msgImplProps.setProperty(ParameterQueue.EXCLUSIVE_QUEUE, "false"); msgImplProps.setProperty(ParameterQueue.AUTO_DELETE_QUEUE, "false"); msgImplProps.setProperty(ParameterQueue.MULTI_QUEUE_NAME, "multiMessageQueue"); + msgImplProps.setProperty(ParameterQueue.DURABLE_MQUEUE, "true"); + msgImplProps.setProperty(ParameterQueue.EXCLUSIVE_MQUEUE, "true"); + msgImplProps.setProperty(ParameterQueue.AUTO_DELETE_MQUEUE, "false"); msgImplProps.setProperty(ParameterQueue.DELIVERY_MODE, "1"); + msgImplProps.setProperty(ParameterQueue.RETRY_TIME_CONNECTION, "2000"); /* @@ -65,9 +69,13 @@ clientProps.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); clientProps.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - clientProps.setProperty(ParameterQueue.DURABLE_QUEUES, "true"); + clientProps.setProperty(ParameterQueue.DURABLE_QUEUE, "true"); clientProps.setProperty(ParameterQueue.PROXY_SERIALIZER, type); clientProps.setProperty(ParameterQueue.RPC_EXCHANGE, "rpc_exchange"); clientProps.setProperty(ParameterQueue.RPC_REPLY_QUEUE, "persistent_message_reply_queue"); + clientProps.setProperty(ParameterQueue.DURABLE_QUEUE, "true"); + clientProps.setProperty(ParameterQueue.EXCLUSIVE_QUEUE, "true"); + clientProps.setProperty(ParameterQueue.AUTO_DELETE_QUEUE, "false"); clientProps.setProperty(ParameterQueue.DELIVERY_MODE, "2"); + clientProps.setProperty(ParameterQueue.RETRY_TIME_CONNECTION, "2000"); // TODO msgProps -> rpc_exchange, serializer type and delivery mode } Index: /trunk/src/test/java/omq/test/python/Server.java =================================================================== --- /trunk/src/test/java/omq/test/python/Server.java (revision 83) +++ /trunk/src/test/java/omq/test/python/Server.java (revision 84) @@ -24,5 +24,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); Index: /trunk/src/test/java/omq/test/serializer/CalculatorTest.java =================================================================== --- /trunk/src/test/java/omq/test/serializer/CalculatorTest.java (revision 83) +++ /trunk/src/test/java/omq/test/serializer/CalculatorTest.java (revision 84) @@ -31,5 +31,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); @@ -55,5 +55,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); Index: /trunk/src/test/java/omq/test/stopBroker/StopBrokerTest.java =================================================================== --- /trunk/src/test/java/omq/test/stopBroker/StopBrokerTest.java (revision 83) +++ /trunk/src/test/java/omq/test/stopBroker/StopBrokerTest.java (revision 84) @@ -35,5 +35,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.PROXY_SERIALIZER, type); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); @@ -67,5 +67,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); Index: /trunk/src/test/java/omq/test/stopBroker/UnbindTest.java =================================================================== --- /trunk/src/test/java/omq/test/stopBroker/UnbindTest.java (revision 83) +++ /trunk/src/test/java/omq/test/stopBroker/UnbindTest.java (revision 84) @@ -25,5 +25,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); Index: /trunk/src/test/java/omq/test/temporal/ProvaTest.java =================================================================== --- /trunk/src/test/java/omq/test/temporal/ProvaTest.java (revision 83) +++ /trunk/src/test/java/omq/test/temporal/ProvaTest.java (revision 84) @@ -37,5 +37,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); @@ -63,5 +63,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.PROXY_SERIALIZER, type); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); Index: /trunk/src/test/java/omq/test/workspace/WorkspaceTest.java =================================================================== --- /trunk/src/test/java/omq/test/workspace/WorkspaceTest.java (revision 83) +++ /trunk/src/test/java/omq/test/workspace/WorkspaceTest.java (revision 84) @@ -46,5 +46,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.PROXY_SERIALIZER, type); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); @@ -76,5 +76,5 @@ env.setProperty(ParameterQueue.RABBIT_HOST, "127.0.0.1"); env.setProperty(ParameterQueue.RABBIT_PORT, "5672"); - env.setProperty(ParameterQueue.DURABLE_QUEUES, "false"); + env.setProperty(ParameterQueue.DURABLE_QUEUE, "false"); env.setProperty(ParameterQueue.ENABLE_COMPRESSION, "false"); Index: unk/target/classes/log4j.xml =================================================================== --- /trunk/target/classes/log4j.xml (revision 83) +++ (revision ) @@ -1,37 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: /trunk/target/maven-archiver/pom.properties =================================================================== --- /trunk/target/maven-archiver/pom.properties (revision 83) +++ /trunk/target/maven-archiver/pom.properties (revision 84) @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Jul 03 15:02:05 CEST 2013 -version=0.5.4 +#Mon Jul 08 16:29:44 CEST 2013 +version=0.5.5 groupId=objectmq artifactId=objectmq