You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2012/07/12 12:17:42 UTC
svn commit: r1360614 - in /activemq/trunk/activemq-core/src/test:
java/org/apache/activemq/xbean/ resources/org/apache/activemq/xbean/
Author: gtully
Date: Thu Jul 12 10:17:41 2012
New Revision: 1360614
URL: http://svn.apache.org/viewvc?rev=1360614&view=rev
Log:
add test to validate jdbc xml config with explicit adapter
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java
- copied, changed from r1360125, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java
activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml (with props)
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java
Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java (from r1360125, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java?p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java&r1=1360125&r2=1360614&rev=1360614&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceAdapterXBeanConfigTest.java Thu Jul 12 10:17:41 2012
@@ -17,9 +17,7 @@
package org.apache.activemq.xbean;
import java.net.URI;
-
import junit.framework.TestCase;
-
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.PersistenceAdapter;
@@ -28,11 +26,11 @@ import org.apache.activemq.store.jdbc.JD
/**
*
*/
-public class JDBCPersistenceXBeanConfigTest extends TestCase {
+public class JDBCPersistenceAdapterXBeanConfigTest extends TestCase {
protected BrokerService brokerService;
- public void testManagmentContextConfiguredCorrectly() throws Exception {
+ public void testConfiguredCorrectly() throws Exception {
PersistenceAdapter persistenceAdapter = brokerService.getPersistenceAdapter();
assertNotNull(persistenceAdapter);
@@ -55,7 +53,7 @@ public class JDBCPersistenceXBeanConfigT
}
protected BrokerService createBroker() throws Exception {
- String uri = "org/apache/activemq/xbean/jdbc-persistence-test.xml";
+ String uri = "org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml";
return BrokerFactory.createBroker(new URI("xbean:" + uri));
}
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java?rev=1360614&r1=1360613&r2=1360614&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/xbean/JDBCPersistenceXBeanConfigTest.java Thu Jul 12 10:17:41 2012
@@ -32,7 +32,7 @@ public class JDBCPersistenceXBeanConfigT
protected BrokerService brokerService;
- public void testManagmentContextConfiguredCorrectly() throws Exception {
+ public void testConfiguredCorrectly() throws Exception {
PersistenceAdapter persistenceAdapter = brokerService.getPersistenceAdapter();
assertNotNull(persistenceAdapter);
Added: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml?rev=1360614&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml (added)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml Thu Jul 12 10:17:41 2012
@@ -0,0 +1,44 @@
+<?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.
+-->
+
+<!-- this file can only be parsed using the xbean-spring library -->
+<!-- START SNIPPET: xbean -->
+<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">
+
+ <broker useJmx="false" xmlns="http://activemq.apache.org/schema/core">
+
+ <persistenceAdapter>
+ <jdbcPersistenceAdapter>
+ <statements>
+ <statements tablePrefix="BROKER1."/>
+ </statements>
+ <adapter>
+ <defaultJDBCAdapter />
+ </adapter>
+ </jdbcPersistenceAdapter>
+ </persistenceAdapter>
+
+ </broker>
+
+</beans>
+<!-- END SNIPPET: xbean -->
Propchange: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/xbean/jdbc-persistence-adapter-test.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml