diff --git a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAMessageStore.java b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAMessageStore.java
index 7357668d70..d215ff10b5 100644
--- a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAMessageStore.java
+++ b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAMessageStore.java
@@ -28,10 +28,11 @@ import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageAck;
 import org.apache.activemq.command.MessageId;
-import org.apache.activemq.memory.UsageManager;
 import org.apache.activemq.store.MessageRecoveryListener;
 import org.apache.activemq.store.MessageStore;
 import org.apache.activemq.store.jpa.model.StoredMessage;
+import org.apache.activemq.usage.MemoryUsage;
+import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.wireformat.WireFormat;
@@ -190,7 +191,7 @@ public class JPAMessageStore implements MessageStore {
         lastMessageId.set(-1);
     }
 
-    public void setUsageManager(UsageManager usageManager) {
+    public void setMemoryUsage(MemoryUsage memoeyUSage){
     }
 
     public void start() throws Exception {
@@ -198,5 +199,4 @@ public class JPAMessageStore implements MessageStore {
 
     public void stop() throws Exception {
     }
-
 }
diff --git a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java
index 844b6325e9..74ea2c36bd 100755
--- a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java
+++ b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java
@@ -32,13 +32,13 @@ import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.memory.UsageManager;
 import org.apache.activemq.openwire.OpenWireFormatFactory;
 import org.apache.activemq.store.MessageStore;
 import org.apache.activemq.store.PersistenceAdapter;
 import org.apache.activemq.store.TopicMessageStore;
 import org.apache.activemq.store.TransactionStore;
 import org.apache.activemq.store.memory.MemoryTransactionStore;
+import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.wireformat.WireFormat;
 import org.apache.commons.logging.Log;
@@ -187,7 +187,7 @@ public class JPAPersistenceAdapter implements PersistenceAdapter {
         return false;
     }
 
-    public void setUsageManager(UsageManager usageManager) {
+    public void setUsageManager(SystemUsage usageManager) {
     }
 
     public void start() throws Exception {
@@ -254,5 +254,9 @@ public class JPAPersistenceAdapter implements PersistenceAdapter {
 
     public void setDirectory(File dir) {
     }
+    
+    public long size(){
+        return 0;
+    }
 
 }
diff --git a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java
index 8335bf407f..e677d23118 100644
--- a/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java
+++ b/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java
@@ -28,10 +28,11 @@ import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageAck;
 import org.apache.activemq.command.MessageId;
-import org.apache.activemq.memory.UsageManager;
 import org.apache.activemq.store.MessageRecoveryListener;
 import org.apache.activemq.store.ReferenceStore;
 import org.apache.activemq.store.jpa.model.StoredMessageReference;
+import org.apache.activemq.usage.MemoryUsage;
+import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.wireformat.WireFormat;
 
@@ -198,7 +199,7 @@ public class JPAReferenceStore implements ReferenceStore {
         lastMessageId.set(-1);
     }
 
-    public void setUsageManager(UsageManager usageManager) {
+    public void setMemoryUsage(MemoryUsage memoeyUSage){
     }
 
     public void start() throws Exception {