Commit 8a9ade72 authored by afreyssin's avatar afreyssin
Browse files

Overrides acquisitionClassName and other specified informations in properties (JORAM-222).

parent 38003be8
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2012 ScalAgent Distributed Technologies
* Copyright (C) 2012 - 2015 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -155,10 +155,8 @@ public class AMQPAcquisitionQueue {
Properties props) throws ConnectException, AdminException {
if (props == null)
props = new Properties();
if (!props.containsKey("acquisition.className"))
props.setProperty("acquisition.className", AMQPAcquisition);
if (!props.containsKey("amqp.QueueName"))
props.setProperty("amqp.QueueName", dest);
props.setProperty("acquisition.className", AMQPAcquisition);
props.setProperty("amqp.QueueName", dest);
Queue queue = Queue.create(serverId, name, Queue.ACQUISITION_QUEUE, props);
return queue;
}
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2012 ScalAgent Distributed Technologies
* Copyright (C) 2012 - 2015 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -146,10 +146,8 @@ public class AMQPAcquisitionTopic {
Properties props) throws ConnectException, AdminException {
if (props == null)
props = new Properties();
if (!props.containsKey("acquisition.className"))
props.setProperty("acquisition.className", AMQPAcquisition);
if (!props.containsKey("amqp.QueueName"))
props.setProperty("amqp.QueueName", dest);
props.setProperty("acquisition.className", AMQPAcquisition);
props.setProperty("amqp.QueueName", dest);
Topic topic = Topic.create(serverId, name, Topic.ACQUISITION_TOPIC, props);
return topic;
}
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2012 ScalAgent Distributed Technologies
* Copyright (C) 2012 - 2015 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -150,10 +150,8 @@ public class AMQPDistributionQueue {
Properties props) throws ConnectException, AdminException {
if (props == null)
props = new Properties();
if (!props.containsKey("distribution.className"))
props.setProperty("distribution.className", AMQPDistribution);
if (!props.containsKey("amqp.QueueName"))
props.setProperty("amqp.QueueName", dest);
props.setProperty("distribution.className", AMQPDistribution);
props.setProperty("amqp.QueueName", dest);
Queue queue = Queue.create(serverId, name, Queue.DISTRIBUTION_QUEUE, props);
return queue;
}
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2012 ScalAgent Distributed Technologies
* Copyright (C) 2012 - 2015 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -150,10 +150,8 @@ public class AMQPDistributionTopic {
Properties props) throws ConnectException, AdminException {
if (props == null)
props = new Properties();
if (!props.containsKey("distribution.className"))
props.setProperty("distribution.className", AMQPDistribution);
if (!props.containsKey("amqp.QueueName"))
props.setProperty("amqp.QueueName", dest);
props.setProperty("distribution.className", AMQPDistribution);
props.setProperty("amqp.QueueName", dest);
Topic topic = Topic.create(serverId, name, Topic.DISTRIBUTION_TOPIC, props);
return topic;
}
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2012 ScalAgent Distributed Technologies
* Copyright (C) 2012 - 2015 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -140,10 +140,8 @@ public class CollectorQueue {
Properties props) throws ConnectException, AdminException {
if (props == null)
props = new Properties();
if (!props.containsKey("acquisition.className"))
props.setProperty("acquisition.className", URLAcquisition);
if (!props.containsKey("collector.url"))
props.setProperty("collector.url", url);
props.setProperty("acquisition.className", URLAcquisition);
props.setProperty("collector.url", url);
Queue queue = Queue.create(serverId, name, Queue.ACQUISITION_QUEUE, props);
return queue;
}
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2012 ScalAgent Distributed Technologies
* Copyright (C) 2012 - 2015 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -140,10 +140,8 @@ public class CollectorTopic {
Properties props) throws ConnectException, AdminException {
if (props == null)
props = new Properties();
if (!props.containsKey("acquisition.className"))
props.setProperty("acquisition.className", URLAcquisition);
if (!props.containsKey("collector.url"))
props.setProperty("collector.url", url);
props.setProperty("acquisition.className", URLAcquisition);
props.setProperty("collector.url", url);
Topic topic = Topic.create(serverId, name, Topic.ACQUISITION_TOPIC, props);
return topic;
}
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2012 ScalAgent Distributed Technologies
* Copyright (C) 2012 - 2015 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -136,8 +136,7 @@ public class MailAcquisitionQueue {
Properties props) throws ConnectException, AdminException {
if (props == null)
props = new Properties();
if (!props.containsKey("acquisition.className"))
props.setProperty("acquisition.className", MailAcquisition);
props.setProperty("acquisition.className", MailAcquisition);
Queue queue = Queue.create(serverId, name, Queue.ACQUISITION_QUEUE, props);
return queue;
}
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2012 ScalAgent Distributed Technologies
* Copyright (C) 2012 - 2015 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -136,8 +136,7 @@ public class MailAcquisitionTopic {
Properties props) throws ConnectException, AdminException {
if (props == null)
props = new Properties();
if (!props.containsKey("acquisition.className"))
props.setProperty("acquisition.className", MailAcquisition);
props.setProperty("acquisition.className", MailAcquisition);
Topic topic = Topic.create(serverId, name, Topic.ACQUISITION_TOPIC, props);
return topic;
}
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2012 ScalAgent Distributed Technologies
* Copyright (C) 2012 - 2015 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -139,8 +139,7 @@ public class MailDistributionQueue {
Properties props) throws ConnectException, AdminException {
if (props == null)
props = new Properties();
if (!props.containsKey("distribution.className"))
props.setProperty("distribution.className", MailDistribution);
props.setProperty("distribution.className", MailDistribution);
Queue queue = Queue.create(serverId, name, Queue.DISTRIBUTION_QUEUE, props);
return queue;
}
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2012 ScalAgent Distributed Technologies
* Copyright (C) 2012 - 2015 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -139,8 +139,7 @@ public class MailDistributionTopic {
Properties props) throws ConnectException, AdminException {
if (props == null)
props = new Properties();
if (!props.containsKey("distribution.className"))
props.setProperty("distribution.className", MailDistribution);
props.setProperty("distribution.className", MailDistribution);
Topic topic = Topic.create(serverId, name, Topic.DISTRIBUTION_QUEUE, props);
return topic;
}
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2012 ScalAgent Distributed Technologies
* Copyright (C) 2012 - 2015 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -146,8 +146,7 @@ public class MonitoringQueue {
Properties props) throws ConnectException, AdminException {
if (props == null)
props = new Properties();
if (!props.containsKey("acquisition.className"))
props.setProperty("acquisition.className", JMXAcquisition);
props.setProperty("acquisition.className", JMXAcquisition);
Queue queue = Queue.create(serverId, name, Queue.ACQUISITION_QUEUE, props);
return queue;
}
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2012 ScalAgent Distributed Technologies
* Copyright (C) 2012 - 2015 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -146,8 +146,7 @@ public class MonitoringTopic {
Properties props) throws ConnectException, AdminException {
if (props == null)
props = new Properties();
if (!props.containsKey("acquisition.className"))
props.setProperty("acquisition.className", JMXAcquisition);
props.setProperty("acquisition.className", JMXAcquisition);
Topic topic = Topic.create(serverId, name, Topic.ACQUISITION_TOPIC, props);
return topic;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment