Skip to content
Browse files

Updated the pom file to 5.2.0.1 of activemq.

Replaced the kahadb reference within the activemq persistent storage system since the
kahadb did not come into existence until 5.3.
  • Loading branch information...
1 parent 90bdd79 commit c2bfd8a60ddb12810688d6f9f68ac900375623c9 Claudio Corsi committed Sep 19, 2011
View
4 pom.xml
@@ -4,15 +4,15 @@
<groupId>org.apache.activemq</groupId>
<artifactId>broker-service-runner</artifactId>
- <version>5.2.0.0-fuse</version>
+ <version>5.2.0.1-fuse</version>
<packaging>jar</packaging>
<name>broker-service-runner</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <activemq.version>5.2.0.0-fuse</activemq.version>
+ <activemq.version>5.2.0.1-fuse</activemq.version>
</properties>
<build>
View
2 src/main/java/org/apache/activemq/brokerservice/runner/BrokerServiceProcess.java
@@ -49,7 +49,7 @@ public void execute() throws Exception {
System.out.println("STARTING BROKER USING " + brokerConfigFile + " configuration file.");
// Load and start the broker using the passed activemq configuration file.
BrokerService broker = BrokerFactory.createBroker(new URI(brokerConfigFile), true);
- broker.waitUntilStarted();
+ // broker.waitUntilStarted(); FIXME: need to find another way to determine if broker started.
if (Boolean.getBoolean("notifyIfStarted")) {
// FIXME: Provide a better mechanism to inform parent process that we've started.
View
33 src/test/java/org/apache/activemq/brokerservice/runner/BrokerServiceSpawnerTest.java
@@ -63,6 +63,7 @@ public void testHubSpokeBrokerServiceSpawner() throws IOException, InterruptedEx
AbstractBrokerServiceSpawner spawner = new HubSpokeBrokerServiceSpawner();
spawner.execute();
+ Thread.sleep(15000);
logger.info("All hub/spoke brokers have been started"); // Thread.sleep(15000);
spawner.stopBrokers();
@@ -96,15 +97,16 @@ protected String getTemplatePrefix() {
@Override
protected void populateProperties(Properties props, int id) {
props.setProperty("activemq.suffix.name", String.valueOf(id));
- props.setProperty("kahadb.dir", "activemq");
- props.setProperty("kahadb.prefix", String.valueOf(id));
+ props.setProperty("amqdb.dir", "activemq");
+ props.setProperty("amqdb.prefix", String.valueOf(id));
props.setProperty("hostname", "localhost");
props.setProperty("port.number", String.valueOf(currentPort++));
}
};
spawner.execute();
+ Thread.sleep(15000);
logger.info("All brokers have been started"); // Thread.sleep(15000);
spawner.stopBrokers();
@@ -134,15 +136,15 @@ protected void populateProperties(TYPE type, Properties props, int id) {
case MASTER:
masterPort = currentPort++;
props.setProperty("master.suffix.name", String.valueOf(id));
- props.setProperty("kahadb.dir", "master");
- props.setProperty("kahadb.prefix", String.valueOf(id));
+ props.setProperty("amqdb.dir", "master");
+ props.setProperty("amqdb.prefix", String.valueOf(id));
props.setProperty("master.hostname", "localhost");
props.setProperty("master.port.number", String.valueOf(masterPort));
break;
case SLAVE:
props.setProperty("slave.suffix.name", String.valueOf(id));
- props.setProperty("kahadb.dir", "slave");
- props.setProperty("kahadb.prefix", String.valueOf(id));
+ props.setProperty("amqdb.dir", "slave");
+ props.setProperty("amqdb.prefix", String.valueOf(id));
props.setProperty("master.hostname", "localhost");
props.setProperty("master.port.number", String.valueOf(masterPort));
props.setProperty("slave.hostname", "localhost");
@@ -171,6 +173,7 @@ protected void preCreateSpawners() {
Thread.sleep(5000);
+ Thread.sleep(15000);
spawner.stopBrokers();
}
@@ -201,15 +204,15 @@ protected void populateProperties(TYPE type, Properties props,
mainPort = currentPort++;
mainId = id;
props.setProperty("main.suffix.name", String.valueOf(id));
- props.setProperty("kahadb.dir", "main");
- props.setProperty("kahadb.prefix", mainId + "-0");
+ props.setProperty("amqdb.dir", "main");
+ props.setProperty("amqdb.prefix", mainId + "-0");
props.setProperty("hostname", "localhost");
props.setProperty("port.number", String.valueOf(mainPort));
break;
case NETWORKED:
props.setProperty("network.suffix.name", String.valueOf(id));
- props.setProperty("kahadb.dir", "network");
- props.setProperty("kahadb.prefix", mainId + "-" + id);
+ props.setProperty("amqdb.dir", "network");
+ props.setProperty("amqdb.prefix", mainId + "-" + id);
props.setProperty("hostname", "localhost");
props.setProperty("port.number", String.valueOf(currentPort++));
props.setProperty("network.hostname", "localhost");
@@ -229,6 +232,7 @@ protected void preCreateSpawners() {
};
spawner.execute();
+ Thread.sleep(15000);
logger.info("All network brokers setup has been started"); // Thread.sleep(15000);
spawner.stopBrokers();
@@ -268,8 +272,8 @@ protected void populateProperties(TYPE type,
private void populateSpokeProperties(Properties props, int id) {
spokePort = currentPort++;
props.setProperty("spoke.suffix.name", String.valueOf(hubId) + "-" + String.valueOf(id));
- props.setProperty("kahadb.dir", "spoke");
- props.setProperty("kahadb.prefix", String.valueOf(id));
+ props.setProperty("amqdb.dir", "spoke");
+ props.setProperty("amqdb.prefix", String.valueOf(id));
props.setProperty("hub.hostname", "localhost");
props.setProperty("hub.port.number", String.valueOf(hubPort));
props.setProperty("spoke.hostname", "localhost");
@@ -280,8 +284,8 @@ private void populateHubProperties(Properties props, int id) {
hubId = id;
hubPort = currentPort++;
props.setProperty("hub.suffix.name", String.valueOf(id));
- props.setProperty("kahadb.dir", "hub");
- props.setProperty("kahadb.prefix", String.valueOf(id));
+ props.setProperty("amqdb.dir", "hub");
+ props.setProperty("amqdb.prefix", String.valueOf(id));
props.setProperty("hub.hostname", "localhost");
props.setProperty("hub.port.number", String.valueOf(hubPort));
}
@@ -300,6 +304,7 @@ protected String getSpokeTemplatePrefix() {
spawner.execute();
+ Thread.sleep(15000);
logger.info("All hub/spoke brokers have been started using the extended hub/spoke version"); // Thread.sleep(15000);
spawner.stopBrokers();
View
43 src/test/resources/activemq.xml
@@ -18,29 +18,30 @@
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://www.springframework.org/schema/beans"
xmlns:amq="http://activemq.apache.org/schema/core"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd ">
- <!-- Allows us to use system properties as variables in this configuration file -->
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>@@PROPERTIESFILE@@</value>
- </property>
- </bean>
+ <!-- Allows us to use system properties as variables in this configuration file -->
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>@@PROPERTIESFILE@@</value>
+ </property>
+ </bean>
- <broker xmlns="http://activemq.apache.org/schema/core"
- brokerName="activemq-${activemq.suffix.name}">
+ <broker xmlns="http://activemq.apache.org/schema/core"
+ brokerName="activemq-${activemq.suffix.name}"
+ dataDirectory="${amqdb.dir}/${amqdb.prefix}/data">
- <managementContext>
- <managementContext connectorPath="/activemq-${activemq.suffix.name}" />
- </managementContext>
+ <managementContext>
+ <managementContext connectorPath="/activemq-${activemq.suffix.name}" />
+ </managementContext>
- <persistenceAdapter>
- <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb"/>
- </persistenceAdapter>
-
- <transportConnectors>
- <transportConnector name="openwire" uri="tcp://${hostname}:${port.number}"/>
- </transportConnectors>
- </broker>
+ <persistenceAdapter>
+ <amqPersistenceAdapter syncOnWrite="false" directory="${amqdb.dir}/${amqdb.prefix}/amqdb" maxFileLength="20 mb"/>
+ </persistenceAdapter>
+
+ <transportConnectors>
+ <transportConnector name="openwire" uri="tcp://${hostname}:${port.number}"/>
+ </transportConnectors>
+ </broker>
</beans>
-
View
133 src/test/resources/hub-activemq.xml
@@ -1,78 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- You under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.apache.org/schema/core"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
+ xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.apache.org/schema/core"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd ">
- <!-- Allows us to use system properties as variables in this configuration
- file -->
- <bean
- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>@@PROPERTIESFILE@@</value>
- </property>
- </bean>
+ <!-- Allows us to use system properties as variables in this configuration
+ file -->
+ <bean
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>@@PROPERTIESFILE@@</value>
+ </property>
+ </bean>
- <broker xmlns="http://activemq.apache.org/schema/core"
- brokerName="hub-${hub.suffix.name}">
+ <broker xmlns="http://activemq.apache.org/schema/core"
+ brokerName="hub-${hub.suffix.name}"
+ dataDirectory="${amqdb.dir}/${amqdb.prefix}/data">
- <destinationPolicy>
- <policyMap>
- <policyEntries>
- <policyEntry topic=">" producerFlowControl="true"
- memoryLimit="1mb">
- <pendingSubscriberPolicy>
- <vmCursor />
- </pendingSubscriberPolicy>
- </policyEntry>
- <policyEntry queue=">" producerFlowControl="true"
- memoryLimit="1mb">
- <!-- <pendingQueuePolicy>
- <vmQueueCursor/>
- </pendingQueuePolicy>
- -->
- </policyEntry>
- </policyEntries>
- </policyMap>
- </destinationPolicy>
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry topic=">" producerFlowControl="true"
+ memoryLimit="1mb">
+ <pendingSubscriberPolicy>
+ <vmCursor />
+ </pendingSubscriberPolicy>
+ </policyEntry>
+ <policyEntry queue=">" producerFlowControl="true"
+ memoryLimit="1mb">
+ <!-- <pendingQueuePolicy>
+ <vmQueueCursor/>
+ </pendingQueuePolicy>
+ -->
+ </policyEntry>
+ </policyEntries>
+ </policyMap>
+ </destinationPolicy>
- <managementContext>
- <managementContext connectorPath="/hub-${hub.suffix.name}" />
- </managementContext>
+ <managementContext>
+ <managementContext connectorPath="/hub-${hub.suffix.name}" />
+ </managementContext>
- <persistenceAdapter>
- <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb" />
- </persistenceAdapter>
+ <persistenceAdapter>
+ <amqPersistenceAdapter syncOnWrite="false" directory="${amqdb.dir}/${amqdb.prefix}/amqdb" maxFileLength="20 mb"/>
+ </persistenceAdapter>
- <systemUsage>
- <systemUsage>
- <memoryUsage>
- <memoryUsage limit="20 mb"/>
- </memoryUsage>
- <storeUsage>
- <storeUsage limit="1 gb"/>
- </storeUsage>
- <tempUsage>
- <tempUsage limit="100 mb"/>
- </tempUsage>
- </systemUsage>
- </systemUsage>
+ <systemUsage>
+ <systemUsage>
+ <memoryUsage>
+ <memoryUsage limit="20 mb"/>
+ </memoryUsage>
+ <storeUsage>
+ <storeUsage limit="1 gb"/>
+ </storeUsage>
+ <tempUsage>
+ <tempUsage limit="100 mb"/>
+ </tempUsage>
+ </systemUsage>
+ </systemUsage>
- <transportConnectors>
- <transportConnector name="openwire"
- uri="tcp://${hub.hostname}:${hub.port.number}" />
- </transportConnectors>
- </broker>
+ <transportConnectors>
+ <transportConnector name="openwire"
+ uri="tcp://${hub.hostname}:${hub.port.number}" />
+ </transportConnectors>
+ </broker>
</beans>
View
77 src/test/resources/main-activemq.xml
@@ -1,46 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:amq="http://activemq.apache.org/schema/core"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.apache.org/schema/core"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd ">
- <!-- Allows us to use system properties as variables in this configuration file -->
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>@@PROPERTIESFILE@@</value>
- </property>
- </bean>
+ <!-- Allows us to use system properties as variables in this configuration file -->
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>@@PROPERTIESFILE@@</value>
+ </property>
+ </bean>
- <broker xmlns="http://activemq.apache.org/schema/core"
- brokerName="main-${main.suffix.name}">
+ <broker xmlns="http://activemq.apache.org/schema/core"
+ brokerName="main-${main.suffix.name}"
+ dataDirectory="${amqdb.dir}/${amqdb.prefix}/data">
- <managementContext>
- <managementContext connectorPath="/main-${main.suffix.name}" />
- </managementContext>
+ <managementContext>
+ <managementContext connectorPath="/main-${main.suffix.name}" />
+ </managementContext>
- <persistenceAdapter>
- <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb"/>
- </persistenceAdapter>
-
- <transportConnectors>
- <transportConnector name="openwire" uri="tcp://${hostname}:${port.number}"/>
- </transportConnectors>
- </broker>
+ <persistenceAdapter>
+ <amqPersistenceAdapter syncOnWrite="false" directory="${amqdb.dir}/${amqdb.prefix}/amqdb" maxFileLength="20 mb"/>
+ </persistenceAdapter>
+
+ <transportConnectors>
+ <transportConnector name="openwire" uri="tcp://${hostname}:${port.number}"/>
+ </transportConnectors>
+ </broker>
</beans>
View
77 src/test/resources/master-activemq.xml
@@ -1,46 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:amq="http://activemq.apache.org/schema/core"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.apache.org/schema/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
- <!-- Allows us to use system properties as variables in this configuration file -->
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>@@PROPERTIESFILE@@</value>
- </property>
- </bean>
+ <!-- Allows us to use system properties as variables in this configuration file -->
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>@@PROPERTIESFILE@@</value>
+ </property>
+ </bean>
- <broker xmlns="http://activemq.apache.org/schema/core"
- brokerName="master-${master.suffix.name}"
- shutdownOnSlaveFailure="true" waitForSlave="true">
+ <broker xmlns="http://activemq.apache.org/schema/core"
+ brokerName="master-${master.suffix.name}"
+ dataDirectory="${amqdb.dir}/${amqdb.prefix}/data"
+ shutdownOnSlaveFailure="true" waitForSlave="true">
- <managementContext>
- <managementContext connectorPath="/master-${master.suffix.name}" />
- </managementContext>
+ <managementContext>
+ <managementContext connectorPath="/master-${master.suffix.name}" />
+ </managementContext>
- <persistenceAdapter>
- <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb"/>
- </persistenceAdapter>
- <transportConnectors>
- <transportConnector name="openwire" uri="tcp://${master.hostname}:${master.port.number}"/>
- </transportConnectors>
- </broker>
-</beans>
+ <persistenceAdapter>
+ <amqPersistenceAdapter syncOnWrite="false" directory="${amqdb.dir}/${amqdb.prefix}/amqdb" maxFileLength="20 mb"/>
+ </persistenceAdapter>
+ <transportConnectors>
+ <transportConnector name="openwire" uri="tcp://${master.hostname}:${master.port.number}"/>
+ </transportConnectors>
+ </broker>
+</beans>
View
87 src/test/resources/network-activemq.xml
@@ -1,52 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:amq="http://activemq.apache.org/schema/core"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.apache.org/schema/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
- <!-- Allows us to use system properties as variables in this configuration file -->
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>@@PROPERTIESFILE@@</value>
- </property>
- </bean>
+ <!-- Allows us to use system properties as variables in this configuration file -->
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>@@PROPERTIESFILE@@</value>
+ </property>
+ </bean>
- <broker xmlns="http://activemq.apache.org/schema/core"
- brokerName="network-${network.suffix.name}">
-
- <managementContext>
- <managementContext connectorPath="/network-${network.suffix.name}" />
- </managementContext>
+ <broker xmlns="http://activemq.apache.org/schema/core"
+ brokerName="network-${network.suffix.name}"
+ dataDirectory="${amqdb.dir}/${amqdb.prefix}/data">
+
+ <managementContext>
+ <managementContext connectorPath="/network-${network.suffix.name}" />
+ </managementContext>
- <networkConnectors>
- <networkConnector
- uri="static:(tcp://${network.hostname}:${network.port.number})"
- duplex="true" />
- </networkConnectors>
+ <networkConnectors>
+ <networkConnector
+ uri="static:(tcp://${network.hostname}:${network.port.number})"
+ duplex="true" />
+ </networkConnectors>
- <persistenceAdapter>
- <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb"/>
- </persistenceAdapter>
-
- <transportConnectors>
- <transportConnector name="openwire" uri="tcp://${hostname}:${port.number}"/>
- </transportConnectors>
- </broker>
+ <persistenceAdapter>
+ <amqPersistenceAdapter syncOnWrite="false" directory="${amqdb.dir}/${amqdb.prefix}/amqdb" maxFileLength="20 mb"/>
+ </persistenceAdapter>
+
+ <transportConnectors>
+ <transportConnector name="openwire" uri="tcp://${hostname}:${port.number}"/>
+ </transportConnectors>
+ </broker>
</beans>
View
81 src/test/resources/slave-activemq.xml
@@ -1,50 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.springframework.org/schema/beans"
- xmlns:amq="http://activemq.apache.org/schema/core"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:amq="http://activemq.apache.org/schema/core"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
- <!-- Allows us to use system properties as variables in this configuration file -->
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>@@PROPERTIESFILE@@</value>
- </property>
- </bean>
+ <!-- Allows us to use system properties as variables in this configuration file -->
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>@@PROPERTIESFILE@@</value>
+ </property>
+ </bean>
- <broker xmlns="http://activemq.apache.org/schema/core"
- brokerName="slave-${slave.suffix.name}"
- masterConnectorURI="tcp://${master.hostname}:${master.port.number}"
- useJmx="false"
- deleteAllMessagesOnStartup="true">
+ <broker xmlns="http://activemq.apache.org/schema/core"
+ brokerName="slave-${slave.suffix.name}"
+ dataDirectory="${amqdb.dir}/${amqdb.prefix}/data"
+ masterConnectorURI="tcp://${master.hostname}:${master.port.number}"
+ useJmx="false"
+ deleteAllMessagesOnStartup="true">
- <persistenceAdapter>
- <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb"/>
- </persistenceAdapter>
+ <persistenceAdapter>
+ <amqPersistenceAdapter syncOnWrite="false" directory="${amqdb.dir}/${amqdb.prefix}/amqdb" maxFileLength="20 mb"/>
+ </persistenceAdapter>
-<!-- <services>
+ <!-- <services>
<masterConnector remoteUri="tcp://${master.hostname}:${master.port.number}"/>
- </services>
- -->
-
- <transportConnectors>
- <transportConnector name="openwire" uri="tcp://${slave.hostname}:${slave.port.number}"/>
- </transportConnectors>
- </broker>
+ </services>
+ -->
+
+ <transportConnectors>
+ <transportConnector name="openwire" uri="tcp://${slave.hostname}:${slave.port.number}"/>
+ </transportConnectors>
+ </broker>
</beans>
View
138 src/test/resources/spoke-activemq.xml
@@ -1,80 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- You under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.apache.org/schema/core"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
+ xmlns="http://www.springframework.org/schema/beans" xmlns:amq="http://activemq.apache.org/schema/core"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd ">
- <!-- Allows us to use system properties as variables in this configuration
- file -->
- <bean
- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>@@PROPERTIESFILE@@</value>
- </property>
- </bean>
+ <!-- Allows us to use system properties as variables in this configuration
+ file -->
+ <bean
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>@@PROPERTIESFILE@@</value>
+ </property>
+ </bean>
- <broker xmlns="http://activemq.apache.org/schema/core"
- brokerName="spoke-${spoke.suffix.name}" useJmx="false">
+ <broker xmlns="http://activemq.apache.org/schema/core"
+ brokerName="spoke-${spoke.suffix.name}"
+ dataDirectory="${amqdb.dir}/${amqdb.prefix}/data"
+ useJmx="false">
- <destinationPolicy>
- <policyMap>
- <policyEntries>
- <policyEntry topic=">" producerFlowControl="true"
- memoryLimit="1mb">
- <pendingSubscriberPolicy>
- <vmCursor />
- </pendingSubscriberPolicy>
- </policyEntry>
- <policyEntry queue=">" producerFlowControl="true"
- memoryLimit="1mb">
- <!-- <pendingQueuePolicy>
- <vmQueueCursor/>
- </pendingQueuePolicy>
- -->
- </policyEntry>
- </policyEntries>
- </policyMap>
- </destinationPolicy>
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry topic=">" producerFlowControl="true"
+ memoryLimit="1mb">
+ <pendingSubscriberPolicy>
+ <vmCursor />
+ </pendingSubscriberPolicy>
+ </policyEntry>
+ <policyEntry queue=">" producerFlowControl="true"
+ memoryLimit="1mb">
+ <!-- <pendingQueuePolicy>
+ <vmQueueCursor/>
+ </pendingQueuePolicy>
+ -->
+ </policyEntry>
+ </policyEntries>
+ </policyMap>
+ </destinationPolicy>
- <networkConnectors>
- <networkConnector
- uri="static:(tcp://${hub.hostname}:${hub.port.number})"
- duplex="true" />
- </networkConnectors>
+ <networkConnectors>
+ <networkConnector
+ uri="static:(tcp://${hub.hostname}:${hub.port.number})"
+ duplex="true" />
+ </networkConnectors>
- <persistenceAdapter>
- <kahaDB directory="${kahadb.dir}/${kahadb.prefix}/kahadb" />
- </persistenceAdapter>
+ <persistenceAdapter>
+ <amqPersistenceAdapter syncOnWrite="false" directory="${amqdb.dir}/${amqdb.prefix}/amqdb" maxFileLength="20 mb"/>
+ </persistenceAdapter>
- <systemUsage>
- <systemUsage>
- <memoryUsage>
- <memoryUsage limit="20 mb" />
- </memoryUsage>
- <storeUsage>
- <storeUsage limit="1 gb" />
- </storeUsage>
- <tempUsage>
- <tempUsage limit="100 mb" />
- </tempUsage>
- </systemUsage>
- </systemUsage>
+ <systemUsage>
+ <systemUsage>
+ <memoryUsage>
+ <memoryUsage limit="20 mb" />
+ </memoryUsage>
+ <storeUsage>
+ <storeUsage limit="1 gb" />
+ </storeUsage>
+ <tempUsage>
+ <tempUsage limit="100 mb" />
+ </tempUsage>
+ </systemUsage>
+ </systemUsage>
- <transportConnectors>
- <transportConnector name="openwire"
- uri="tcp://${spoke.hostname}:${spoke.port.number}" />
- </transportConnectors>
- </broker>
+ <transportConnectors>
+ <transportConnector name="openwire"
+ uri="tcp://${spoke.hostname}:${spoke.port.number}" />
+ </transportConnectors>
+ </broker>
</beans>

0 comments on commit c2bfd8a

Please sign in to comment.
Something went wrong with that request. Please try again.