JAMES-2101 Use consants in EmbeddedActiveMQ
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/34e47dfb Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/34e47dfb Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/34e47dfb Branch: refs/heads/master Commit: 34e47dfb6380a966f0432adc9ecffc53163d1cf4 Parents: 030c74a Author: benwa <btell...@linagora.com> Authored: Thu Jul 27 16:48:59 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Thu Jul 27 16:48:59 2017 +0700 ---------------------------------------------------------------------- .../james/queue/activemq/EmbeddedActiveMQ.java | 22 +++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/34e47dfb/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/EmbeddedActiveMQ.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/EmbeddedActiveMQ.java b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/EmbeddedActiveMQ.java index 43320d9..ceeada6 100644 --- a/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/EmbeddedActiveMQ.java +++ b/server/queue/queue-activemq/src/main/java/org/apache/james/queue/activemq/EmbeddedActiveMQ.java @@ -40,16 +40,22 @@ import com.google.common.base.Throwables; public class EmbeddedActiveMQ { private static final Logger LOGGER = LoggerFactory.getLogger(EmbeddedActiveMQ.class); + private static final String KAHADB_STORE_LOCATION = "file://var/store/activemq/brokers/KahaDB"; + private static final String BLOB_TRANSFER_LOCATION = "file://var/store/activemq/blob-transfer"; + private static final String BROCKERS_LOCATION = "file://var/store/activemq/brokers"; + private static final String BROKER_ID = "broker"; + private static final String BROKER_NAME = "james"; + private static final String BROCKER_URI = "tcp://localhost:0"; private final ActiveMQConnectionFactory activeMQConnectionFactory; private final PersistenceAdapter persistenceAdapter; private BrokerService brokerService; @Inject - private EmbeddedActiveMQ(FileSystem fileSystem, PersistenceAdapter persistenceAdapter) { + private EmbeddedActiveMQ(FileSystem fileSystem, PersistenceAdapter persistenceAdapter) { this.persistenceAdapter = persistenceAdapter; try { - persistenceAdapter.setDirectory(fileSystem.getFile("file://var/store/activemq/brokers/KahaDB")); + persistenceAdapter.setDirectory(fileSystem.getFile(KAHADB_STORE_LOCATION)); launchEmbeddedBroker(fileSystem); } catch (Exception e) { throw Throwables.propagate(e); @@ -82,21 +88,21 @@ public class EmbeddedActiveMQ { private BlobTransferPolicy createBlobTransferPolicy(FileSystem fileSystem) { FileSystemBlobTransferPolicy blobTransferPolicy = new FileSystemBlobTransferPolicy(); - blobTransferPolicy.setDefaultUploadUrl("file://var/store/activemq/blob-transfer"); + blobTransferPolicy.setDefaultUploadUrl(BLOB_TRANSFER_LOCATION); blobTransferPolicy.setFileSystem(fileSystem); return blobTransferPolicy; } private void launchEmbeddedBroker(FileSystem fileSystem) throws Exception { brokerService = new BrokerService(); - brokerService.setBrokerName("james"); + brokerService.setBrokerName(BROKER_NAME); brokerService.setUseJmx(false); brokerService.setPersistent(true); - brokerService.setDataDirectoryFile(fileSystem.getFile("file://var/store/activemq/brokers")); + brokerService.setDataDirectoryFile(fileSystem.getFile(BROCKERS_LOCATION)); brokerService.setUseShutdownHook(false); brokerService.setSchedulerSupport(false); - brokerService.setBrokerId("broker"); - String[] uris = {"tcp://localhost:0"}; + brokerService.setBrokerId(BROKER_ID); + String[] uris = {BROCKER_URI}; brokerService.setTransportConnectorURIs(uris); ManagementContext managementContext = new ManagementContext(); managementContext.setCreateConnector(false); @@ -104,7 +110,7 @@ public class EmbeddedActiveMQ { brokerService.setPersistenceAdapter(persistenceAdapter); BrokerPlugin[] brokerPlugins = {new StatisticsBrokerPlugin()}; brokerService.setPlugins(brokerPlugins); - String[] transportConnectorsURIs = {"tcp://localhost:0"}; + String[] transportConnectorsURIs = {BROCKER_URI}; brokerService.setTransportConnectorURIs(transportConnectorsURIs); brokerService.start(); LOGGER.info("Started embedded activeMq"); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
