Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

derby is not to happy about being started up multiple times in the same vm with different homes. 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@387553 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-03-21 15:47:41 +00:00
parent cff515e024
commit 72a495e1eb
3 changed files with 69 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
assembly/src/sample-conf/journal-example.xml
View File

@ -15,13 +15,7 @@
</constructor-arg>
<constructor-arg index="1">
<amq:jdbcPersistenceAdapter>
<property name="cleanupPeriod" value="60000"/>
<property name="dataSource" ref="embedded-ds"/>
<property name="wireFormat">
<bean id="myWireFormat" class="org.activeio.command.DefaultWireFormat"/>
</property>
</amq:jdbcPersistenceAdapter>
<amq:memoryPersistenceAdapter init-method="createTransactionStore"/>
</constructor-arg>
<constructor-arg index="2">
@ -46,9 +40,4 @@
</constructor-arg>
</bean>
<!-- The Datasource that will be used by the Broker -->
<bean id="embedded-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
<property name="databaseName" value="testJournalConfig/derbydb"/>
<property name="createDatabase" value="create"/>
</bean>
</beans>

150
assembly/src/test/java/org/apache/activemq/config/ConfigTest.java
View File

@ -66,6 +66,71 @@ public class ConfigTest extends TestCase {
* root directory for succeeding creation. It uses the first created directory as the root.
*/
/*
* This tests creating a journal persistence adapter using the persistence adapter factory bean
*/
public void testJournaledJDBCConfig() throws Exception {
System.out.print("Checking journaled JDBC persistence adapter configuration... ");
File journalFile = new File(JOURNAL_ROOT + "testJournaledJDBCConfig/journal");
recursiveDelete(journalFile);
File derbyFile = new File(DERBY_ROOT + "testJournaledJDBCConfig/derbydb"); // Default derby name
recursiveDelete(derbyFile);
BrokerService broker;
broker = createBroker(new FileSystemResource(CONF_ROOT + "journaledjdbc-example.xml"));
try {
assertEquals("Broker Config Error (brokerName)", "brokerJournaledJDBCConfigTest", broker.getBrokerName());
PersistenceAdapter adapter = broker.getPersistenceAdapter();
assertTrue("Should have created a journal persistence adapter", adapter instanceof JournalPersistenceAdapter);
assertTrue("Should have created a derby directory at " + derbyFile.getAbsolutePath(), derbyFile.exists());
assertTrue("Should have created a journal directory at " + journalFile.getAbsolutePath(), journalFile.exists());
// Check persistence factory configurations
System.out.print("Checking persistence adapter factory settings... ");
JournalPersistenceAdapter pa = (JournalPersistenceAdapter) broker.getPersistenceAdapter();
System.out.println("Success");
} finally {
if (broker != null) {
broker.stop();
}
}
}
/*
* This tests creating a jdbc persistence adapter using xbeans-spring
*/
public void testJdbcConfig() throws Exception {
System.out.print("Checking jdbc persistence adapter configuration... ");
BrokerService broker;
broker = createBroker(new FileSystemResource(CONF_ROOT + "jdbc-example.xml"));
try {
assertEquals("Broker Config Error (brokerName)", "brokerJdbcConfigTest", broker.getBrokerName());
PersistenceAdapter adapter = broker.getPersistenceAdapter();
assertTrue("Should have created a jdbc persistence adapter", adapter instanceof JDBCPersistenceAdapter);
assertEquals("JDBC Adapter Config Error (cleanupPeriod)", 60000,
((JDBCPersistenceAdapter)adapter).getCleanupPeriod());
assertTrue("Should have created an EmbeddedDataSource",
((JDBCPersistenceAdapter)adapter).getDataSource() instanceof EmbeddedDataSource);
assertTrue("Should have created a DefaultWireFormat",
((JDBCPersistenceAdapter)adapter).getWireFormat() instanceof DefaultWireFormat);
System.out.println("Success");
} finally {
if (broker != null) {
broker.stop();
}
}
}
/*
* This tests configuring the different broker properties using xbeans-spring
*/
@ -181,23 +246,6 @@ public class ConfigTest extends TestCase {
assertEquals("UsageManager Config Error (percentUsageMinDelta)", 20, memMgr.getPercentUsageMinDelta());
System.out.println("Success");
// Check persistence factory configurations
System.out.print("Checking persistence adapter factory settings... ");
PersistenceAdapterFactory factory = broker.getPersistenceFactory();
assertTrue("Should have a default persistence factory", factory instanceof DefaultPersistenceAdapterFactory);
assertEquals("PersistenceFactory Config Error (journalLogFileSize)", 32768,
((DefaultPersistenceAdapterFactory)factory).getJournalLogFileSize());
assertEquals("PersistenceFactory Config Error (journalLogFiles)", 4,
((DefaultPersistenceAdapterFactory)factory).getJournalLogFiles());
assertEquals("PersistenceFactory Config Error (useJournal)", true,
((DefaultPersistenceAdapterFactory)factory).isUseJournal());
assertEquals("PersistenceFactory Config Error (dataDirectory)", journalFile.getAbsolutePath(),
((DefaultPersistenceAdapterFactory)factory).getDataDirectory().getAbsolutePath());
System.out.println("Success");
// Check journal configurations
System.out.print("Checking if persistence adapter was succesfully created... ");
assertTrue("Should have created a journal persistence adapter", broker.getPersistenceAdapter() instanceof JournalPersistenceAdapter);
System.out.println("Success");
} finally {
if (broker != null) {
@ -215,9 +263,6 @@ public class ConfigTest extends TestCase {
File journalFile = new File(JOURNAL_ROOT + "testJournalConfig/journal");
recursiveDelete(journalFile);
File derbyFile = new File(DERBY_ROOT + "testJournalConfig/derbydb");
recursiveDelete(derbyFile);
BrokerService broker;
broker = createBroker(new FileSystemResource(CONF_ROOT + "journal-example.xml"));
try {
@ -226,71 +271,6 @@ public class ConfigTest extends TestCase {
PersistenceAdapter adapter = broker.getPersistenceAdapter();
assertTrue("Should have created a journal persistence adapter", adapter instanceof JournalPersistenceAdapter);
assertTrue("Should have created a derby directory at " + derbyFile.getAbsolutePath(), derbyFile.exists());
assertTrue("Should have created a journal directory at " + journalFile.getAbsolutePath(), journalFile.exists());
System.out.println("Success");
} finally {
if (broker != null) {
broker.stop();
}
}
}
/*
* This tests creating a jdbc persistence adapter using xbeans-spring
*/
public void testJdbcConfig() throws Exception {
System.out.print("Checking jdbc persistence adapter configuration... ");
File derbyFile = new File(DERBY_ROOT + "testJdbcConfig");
recursiveDelete(derbyFile);
BrokerService broker;
broker = createBroker(new FileSystemResource(CONF_ROOT + "jdbc-example.xml"));
try {
assertEquals("Broker Config Error (brokerName)", "brokerJdbcConfigTest", broker.getBrokerName());
PersistenceAdapter adapter = broker.getPersistenceAdapter();
assertTrue("Should have created a jdbc persistence adapter", adapter instanceof JDBCPersistenceAdapter);
assertEquals("JDBC Adapter Config Error (cleanupPeriod)", 60000,
((JDBCPersistenceAdapter)adapter).getCleanupPeriod());
assertTrue("Should have created an EmbeddedDataSource",
((JDBCPersistenceAdapter)adapter).getDataSource() instanceof EmbeddedDataSource);
assertTrue("Should have created a DefaultWireFormat",
((JDBCPersistenceAdapter)adapter).getWireFormat() instanceof DefaultWireFormat);
assertTrue("Should have created a derby directory at " + derbyFile.getAbsolutePath(), derbyFile.exists());
System.out.println("Success");
} finally {
if (broker != null) {
broker.stop();
}
}
}
/*
* This tests creating a journal persistence adapter using the persistence adapter factory bean
*/
public void testJournaledJDBCConfig() throws Exception {
System.out.print("Checking journaled JDBC persistence adapter configuration... ");
File journalFile = new File(JOURNAL_ROOT + "testJournaledJDBCConfig");
recursiveDelete(journalFile);
File derbyFile = new File(DERBY_ROOT + "derbydb"); // Default derby name
recursiveDelete(derbyFile);
BrokerService broker;
broker = createBroker(new FileSystemResource(CONF_ROOT + "journaledjdbc-example.xml"));
try {
assertEquals("Broker Config Error (brokerName)", "brokerJournaledJDBCConfigTest", broker.getBrokerName());
PersistenceAdapter adapter = broker.getPersistenceAdapter();
assertTrue("Should have created a journal persistence adapter", adapter instanceof JournalPersistenceAdapter);
assertTrue("Should have created a derby directory at " + derbyFile.getAbsolutePath(), derbyFile.exists());
assertTrue("Should have created a journal directory at " + journalFile.getAbsolutePath(), journalFile.exists());
System.out.println("Success");

12
assembly/src/test/resources/org/apache/activemq/config/example.xml
View File

@ -82,18 +82,10 @@
<amq:usageManager limit="200000" percentUsageMinDelta="20"/>
</amq:memoryManager>
<amq:persistenceFactory>
<bean id="myPersistenceFactory" class="org.apache.activemq.store.DefaultPersistenceAdapterFactory">
<property name="journalLogFileSize" value="32768" />
<property name="journalLogFiles" value="4" />
<property name="useJournal" value="true" />
<property name="dataDirectory" value="target/test-data" />
</bean>
</amq:persistenceFactory>
<amq:persistenceAdapter>
<amq:journaledJDBC journalLogFiles="4" journalLogFileSize="32768" dataDirectory="target/test-data" />
<amq:memoryPersistenceAdapter init-method="createTransactionStore"/>
</amq:persistenceAdapter>
</amq:broker>
<!-- testing normal Spring stuff inside the same config file -->