Author: aco
Date: Tue Jul 4 17:40:28 2006
New Revision: 419127
URL: http://svn.apache.org/viewvc?rev=419127&view=rev
Log:
Disable advisory support in performance broker configurations except in the
default configuration.
Modified:
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/jdbc.xml
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/journaledMem.xml
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/kaha.xml
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/memory.xml
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/quickJdbc.xml
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/quickMem.xml
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/rapid.xml
Modified:
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/jdbc.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/jdbc.xml?rev=419127&r1=419126&r2=419127&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/jdbc.xml
(original)
+++
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/jdbc.xml
Tue Jul 4 17:40:28 2006
@@ -1,7 +1,7 @@
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0";>
- <broker useJmx="false" brokerName="jdbcBroker" start="false"
persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true">
+ <broker useJmx="false" brokerName="jdbcBroker" start="false"
persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true"
advisorySupport="false">
<persistenceAdapter>
<jdbcPersistenceAdapter dataSource="#derby-ds"/>
</persistenceAdapter>
Modified:
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/journaledMem.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/journaledMem.xml?rev=419127&r1=419126&r2=419127&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/journaledMem.xml
(original)
+++
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/journaledMem.xml
Tue Jul 4 17:40:28 2006
@@ -2,7 +2,7 @@
<beans xmlns:amq="http://activemq.org/config/1.0";>
- <amq:broker brokerName="journaledMemBroker" start="false"
persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">
+ <amq:broker brokerName="journaledMemBroker" start="false"
persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true"
advisorySupport="false">
<amq:transportConnectors>
<amq:transportConnector uri="tcp://localhost:61616"/>
Modified:
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/kaha.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/kaha.xml?rev=419127&r1=419126&r2=419127&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/kaha.xml
(original)
+++
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/kaha.xml
Tue Jul 4 17:40:28 2006
@@ -1,7 +1,7 @@
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0";>
- <broker useJmx="false" brokerName="kahaBroker" start="false"
persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true">
+ <broker useJmx="false" brokerName="kahaBroker" start="false"
persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true"
advisorySupport="false">
<persistenceAdapter>
<kahaPersistentAdaptor dir="target/kaha-data"/>
</persistenceAdapter>
Modified:
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/memory.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/memory.xml?rev=419127&r1=419126&r2=419127&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/memory.xml
(original)
+++
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/memory.xml
Tue Jul 4 17:40:28 2006
@@ -1,7 +1,7 @@
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0";>
- <broker useJmx="false" brokerName="memoryBroker" start="false"
persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">
+ <broker useJmx="false" brokerName="memoryBroker" start="false"
persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true"
advisorySupport="false">
<persistenceAdapter>
<memoryPersistenceAdapter/>
</persistenceAdapter>
Modified:
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/quickJdbc.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/quickJdbc.xml?rev=419127&r1=419126&r2=419127&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/quickJdbc.xml
(original)
+++
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/quickJdbc.xml
Tue Jul 4 17:40:28 2006
@@ -1,7 +1,7 @@
<!-- START SNIPPET: xbean -->
<beans xmlns="http://activemq.org/config/1.0";>
- <broker useJmx="false" brokerName="quickJdbcBroker" start="false"
persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true">
+ <broker useJmx="false" brokerName="quickJdbcBroker" start="false"
persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true"
advisorySupport="false">
<persistenceAdapter>
<journaledJDBC journalLogFiles="4" journalLogFileSize="32768"
useJournal="true" useQuickJournal="true" dataSource="#derby-ds"
dataDirectory="target/quickJdbc-data"/>
</persistenceAdapter>
Modified:
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/quickMem.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/quickMem.xml?rev=419127&r1=419126&r2=419127&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/quickMem.xml
(original)
+++
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/quickMem.xml
Tue Jul 4 17:40:28 2006
@@ -2,7 +2,7 @@
<beans xmlns:amq="http://activemq.org/config/1.0";>
- <amq:broker brokerName="quickMemBroker" start="false" persistent="false"
useShutdownHook="false" deleteAllMessagesOnStartup="true">
+ <amq:broker brokerName="quickMemBroker" start="false" persistent="false"
useShutdownHook="false" deleteAllMessagesOnStartup="true"
advisorySupport="false">
<amq:transportConnectors>
<amq:transportConnector uri="tcp://localhost:61616"/>
Modified:
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/rapid.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/rapid.xml?rev=419127&r1=419126&r2=419127&view=diff
==============================================================================
---
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/rapid.xml
(original)
+++
incubator/activemq/trunk/activemq-perftest/src/main/resources/broker-conf/rapid.xml
Tue Jul 4 17:40:28 2006
@@ -2,7 +2,7 @@
<beans xmlns:amq="http://activemq.org/config/1.0";>
- <amq:broker brokerName="rapidBroker" start="false" persistent="true"
useShutdownHook="false" deleteAllMessagesOnStartup="true">
+ <amq:broker brokerName="rapidBroker" start="false" persistent="true"
useShutdownHook="false" deleteAllMessagesOnStartup="true"
advisorySupport="false">
<amq:transportConnectors>
<amq:transportConnector uri="tcp://localhost:61616"/>
