Author: tabish
Date: Thu Jul 5 15:33:27 2012
New Revision: 1357686
URL: http://svn.apache.org/viewvc?rev=1357686&view=rev
Log:
Fix the test as the recent fixes ensure that for a non-persistent broker
config, there is not a persistent DB store.
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java?rev=1357686&r1=1357685&r2=1357686&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
Thu Jul 5 15:33:27 2012
@@ -31,7 +31,9 @@ import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.Topic;
import javax.sql.DataSource;
+
import junit.framework.TestCase;
+
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
@@ -136,7 +138,7 @@ public class ConfigTest extends TestCase
*/
public void testJdbcConfig() throws Exception {
// System.out.print("Checking jdbc persistence adapter configuration...
- // ");
+ // ");
File journalFile = new File(JOURNAL_ROOT + "testJDBCConfig/journal");
recursiveDelete(journalFile);
Modified:
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml?rev=1357686&r1=1357685&r2=1357686&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
(original)
+++
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/config/sample-conf/jdbc-example.xml
Thu Jul 5 15:33:27 2012
@@ -6,23 +6,23 @@
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="http://www.springframework.org/schema/beans";
+<beans
+ xmlns="http://www.springframework.org/schema/beans";
xmlns:amq="http://activemq.apache.org/schema/core";
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
http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core.xsd";>
- <amq:broker brokerName="brokerJdbcConfigTest" persistent="false"
useShutdownHook="false" deleteAllMessagesOnStartup="true">
+ <amq:broker brokerName="brokerJdbcConfigTest" persistent="true"
useShutdownHook="false" deleteAllMessagesOnStartup="true">
<amq:persistenceAdapter>
<amq:jdbcPersistenceAdapter>
