Author: rajdavies Date: Fri Dec 29 12:27:00 2006 New Revision: 491093 URL: http://svn.apache.org/viewvc?view=rev&rev=491093 Log: put back using kaha as persistent adaptor
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml?view=diff&rev=491093&r1=491092&r2=491093 ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml (original) +++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/master.xml Fri Dec 29 12:27:00 2006 @@ -22,8 +22,7 @@ <transportConnectors> <transportConnector uri="tcp://localhost:62001"/> </transportConnectors> - - + </broker> </beans> Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml?view=diff&rev=491093&r1=491092&r2=491093 ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml (original) +++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave.xml Fri Dec 29 12:27:00 2006 @@ -18,12 +18,14 @@ <beans> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - <broker brokerName="slave" persistent="false" useJmx="false" masterConnectorURI="tcp://localhost:62001" deleteAllMessagesOnStartup="true" xmlns="http://activemq.org/config/1.0"> + <broker brokerName="slave" useJmx="false" masterConnectorURI="tcp://localhost:62001" deleteAllMessagesOnStartup="true" xmlns="http://activemq.org/config/1.0"> <transportConnectors> <transportConnector uri="tcp://localhost:62002"/> </transportConnectors> - + <persistenceAdapter> + <kahaPersistenceAdapter dir = "${basedir}/target/activemq-data/slave"/> + </persistenceAdapter> </broker> Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml?view=diff&rev=491093&r1=491092&r2=491093 ============================================================================== --- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml (original) +++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/broker/ft/slave2.xml Fri Dec 29 12:27:00 2006 @@ -19,7 +19,7 @@ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <!-- START SNIPPET: example --> - <broker brokerName="slave" persistent="false" useJmx="false" deleteAllMessagesOnStartup="true" xmlns="http://activemq.org/config/1.0"> + <broker brokerName="slave" useJmx="false" deleteAllMessagesOnStartup="true" xmlns="http://activemq.org/config/1.0"> <transportConnectors> <transportConnector uri="tcp://localhost:62002"/> @@ -29,7 +29,9 @@ <masterConnector remoteURI= "tcp://localhost:62001" userName="James" password="Cheese"/> </services> - + <persistenceAdapter> + <kahaPersistenceAdapter dir = "${basedir}/target/activemq-data/slave"/> + </persistenceAdapter> </broker> <!-- END SNIPPET: example -->