Author: rajdavies
Date: Tue Mar 6 02:51:19 2007
New Revision: 515065
URL: http://svn.apache.org/viewvc?view=rev&rev=515065
Log:
AMQPersistenceAdapter is now used instead of the QuickPersistenceAdapter
Modified:
activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java
activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java
activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java
activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/quickjpabroker.xml
Modified:
activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java?view=diff&rev=515065&r1=515064&r2=515065
==============================================================================
---
activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java
(original)
+++
activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java
Tue Mar 6 02:51:19 2007
@@ -17,6 +17,7 @@
*/
package org.apache.activemq.store.jpa;
+import java.io.File;
import java.io.IOException;
import java.util.HashSet;
import java.util.List;
@@ -243,5 +244,14 @@
public void setWireFormat(WireFormat wireFormat) {
this.wireFormat = wireFormat;
}
+
+ public void checkpoint(boolean sync) throws IOException{
+ }
+
+ public void setBrokerName(String brokerName){
+ }
+
+ public void setDirectory(File dir){
+ }
}
Modified:
activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java?view=diff&rev=515065&r1=515064&r2=515065
==============================================================================
---
activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java
(original)
+++
activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java
Tue Mar 6 02:51:19 2007
@@ -18,13 +18,11 @@
package org.apache.activemq.broker.store;
import java.util.Properties;
-
import junit.framework.Test;
-
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.RecoveryBrokerTest;
+import org.apache.activemq.store.amq.AMQPersistenceAdapter;
import org.apache.activemq.store.jpa.JPAReferenceStoreAdapter;
-import org.apache.activemq.store.quick.QuickPersistenceAdapter;
/**
* Used to verify that recovery works correctly against
@@ -36,7 +34,7 @@
protected BrokerService createBroker() throws Exception {
BrokerService service = new BrokerService();
service.setDeleteAllMessagesOnStartup(true);
- QuickPersistenceAdapter pa = new QuickPersistenceAdapter();
+ AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
JPAReferenceStoreAdapter rfa = new JPAReferenceStoreAdapter();
Properties props = new Properties();
@@ -53,7 +51,7 @@
protected BrokerService createRestartedBroker() throws Exception {
BrokerService service = new BrokerService();
- QuickPersistenceAdapter pa = new QuickPersistenceAdapter();
+ AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
JPAReferenceStoreAdapter rfa = new JPAReferenceStoreAdapter();
Properties props = new Properties();
Modified:
activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java?view=diff&rev=515065&r1=515064&r2=515065
==============================================================================
---
activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java
(original)
+++
activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java
Tue Mar 6 02:51:19 2007
@@ -18,13 +18,11 @@
package org.apache.activemq.broker.store;
import java.util.Properties;
-
import junit.framework.Test;
-
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.XARecoveryBrokerTest;
+import org.apache.activemq.store.amq.AMQPersistenceAdapter;
import org.apache.activemq.store.jpa.JPAReferenceStoreAdapter;
-import org.apache.activemq.store.quick.QuickPersistenceAdapter;
/**
* Used to verify that recovery works correctly against
@@ -44,7 +42,7 @@
protected BrokerService createBroker() throws Exception {
BrokerService service = new BrokerService();
service.setDeleteAllMessagesOnStartup(true);
- QuickPersistenceAdapter pa = new QuickPersistenceAdapter();
+ AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
JPAReferenceStoreAdapter rfa = new JPAReferenceStoreAdapter();
Properties props = new Properties();
@@ -61,7 +59,7 @@
protected BrokerService createRestartedBroker() throws Exception {
BrokerService service = new BrokerService();
- QuickPersistenceAdapter pa = new QuickPersistenceAdapter();
+ AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
JPAReferenceStoreAdapter rfa = new JPAReferenceStoreAdapter();
Properties props = new Properties();
Modified:
activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/quickjpabroker.xml
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/quickjpabroker.xml?view=diff&rev=515065&r1=515064&r2=515065
==============================================================================
---
activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/quickjpabroker.xml
(original)
+++
activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/quickjpabroker.xml
Tue Mar 6 02:51:19 2007
@@ -29,7 +29,7 @@
</transportConnectors>
<persistenceAdapter>
- <quickPersistenceAdapter
directory="${basedir}/target/activemq-data/quick-broker.db"
referenceStoreAdapter="#jpa"/>
+ <amqPersistenceAdapter referenceStoreAdapter="#jpa"/>
</persistenceAdapter>
</broker>
