mirror of https://github.com/apache/activemq.git
Fix the test as the recent fixes ensure that for a non-persistent broker config, there is not a persistent DB store.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1357677 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
654320a359
commit
801e26ac38
|
@ -6,9 +6,9 @@
|
||||||
The ASF licenses this file to You under the Apache License, Version 2.0
|
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 not use this file except in compliance with
|
||||||
the License. You may obtain a copy of the License at
|
the License. You may obtain a copy of the License at
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
Unless required by applicable law or agreed to in writing, software
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
@ -21,30 +21,28 @@
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
|
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
|
||||||
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
|
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
|
||||||
|
|
||||||
<!-- normal ActiveMQ XML config which is less verbose & can be validated -->
|
<!-- normal ActiveMQ XML config which is less verbose & can be validated -->
|
||||||
<amq:broker brokerName="brokerConfigTest" populateJMSXUserID="false"
|
<amq:broker brokerName="brokerConfigTest" populateJMSXUserID="false"
|
||||||
useLoggingForShutdownErrors="true" useJmx="true"
|
useLoggingForShutdownErrors="true" useJmx="true"
|
||||||
persistent="false" vmConnectorURI="vm://javacoola"
|
persistent="true" vmConnectorURI="vm://javacoola"
|
||||||
useShutdownHook="false" deleteAllMessagesOnStartup="true">
|
useShutdownHook="false" deleteAllMessagesOnStartup="true">
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<amq:persistenceAdapter>
|
<amq:persistenceAdapter>
|
||||||
<amq:levelDB directory = "target/activemq-data"/>
|
<amq:levelDB directory = "target/activemq-data"/>
|
||||||
</amq:persistenceAdapter>
|
</amq:persistenceAdapter>
|
||||||
|
|
||||||
<amq:systemUsage>
|
<amq:systemUsage>
|
||||||
<amq:systemUsage>
|
<amq:systemUsage>
|
||||||
<amq:memoryUsage>
|
<amq:memoryUsage>
|
||||||
<amq:memoryUsage limit="10 mb" percentUsageMinDelta="20"/>
|
<amq:memoryUsage limit="10 mb" percentUsageMinDelta="20"/>
|
||||||
</amq:memoryUsage>
|
</amq:memoryUsage>
|
||||||
<amq:storeUsage>
|
<amq:storeUsage>
|
||||||
<amq:storeUsage limit="1 gb" name="foo"/>
|
<amq:storeUsage limit="1 gb" name="foo"/>
|
||||||
</amq:storeUsage>
|
</amq:storeUsage>
|
||||||
<amq:tempUsage>
|
<amq:tempUsage>
|
||||||
<amq:tempUsage limit="100 mb"/>
|
<amq:tempUsage limit="100 mb"/>
|
||||||
</amq:tempUsage>
|
</amq:tempUsage>
|
||||||
</amq:systemUsage>
|
</amq:systemUsage>
|
||||||
</amq:systemUsage>
|
</amq:systemUsage>
|
||||||
|
|
||||||
|
@ -52,7 +50,6 @@
|
||||||
<amq:transportConnector uri="tcp://localhost:61635"/>
|
<amq:transportConnector uri="tcp://localhost:61635"/>
|
||||||
</amq:transportConnectors>
|
</amq:transportConnectors>
|
||||||
|
|
||||||
|
|
||||||
</amq:broker>
|
</amq:broker>
|
||||||
|
|
||||||
</beans>
|
</beans>
|
||||||
|
|
Loading…
Reference in New Issue