Author: macbean
Date: Thu Jun 26 11:31:39 2014
New Revision: 1605742
URL: http://svn.apache.org/r1605742
Log:
QPID-5821: Remove unused settings interface incorrectly committed
Removed:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/SizeMonitorSettings.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java?rev=1605742&r1=1605741&r2=1605742&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
Thu Jun 26 11:31:39 2014
@@ -46,7 +46,7 @@ import org.apache.qpid.server.store.Conf
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.MessageStoreProvider;
-import org.apache.qpid.server.store.SizeMonitorSettings;
+import org.apache.qpid.server.store.SizeMonitoringSettings;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.berkeleydb.entry.HierarchyKey;
import org.apache.qpid.server.store.berkeleydb.tuple.ConfiguredObjectBinding;
@@ -507,7 +507,7 @@ public class BDBConfigurationStore imple
{
_parent = parent;
- final SizeMonitorSettings sizeMonitorSettings =
(SizeMonitorSettings) parent;
+ final SizeMonitoringSettings sizeMonitorSettings =
(SizeMonitoringSettings) parent;
_persistentSizeHighThreshold =
sizeMonitorSettings.getStoreOverfullSize();
_persistentSizeLowThreshold =
sizeMonitorSettings.getStoreUnderfullSize();
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java?rev=1605742&r1=1605741&r2=1605742&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
Thu Jun 26 11:31:39 2014
@@ -27,7 +27,7 @@ import com.sleepycat.je.DatabaseExceptio
import org.apache.log4j.Logger;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.store.SizeMonitorSettings;
+import org.apache.qpid.server.store.SizeMonitoringSettings;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.util.FileUtils;
@@ -67,7 +67,7 @@ public class BDBMessageStore extends Abs
{
_parent = parent;
- final SizeMonitorSettings sizeMonitorSettings =
(SizeMonitorSettings) parent;
+ final SizeMonitoringSettings sizeMonitorSettings =
(SizeMonitoringSettings) parent;
_persistentSizeHighThreshold =
sizeMonitorSettings.getStoreOverfullSize();
_persistentSizeLowThreshold =
sizeMonitorSettings.getStoreUnderfullSize();
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java?rev=1605742&r1=1605741&r2=1605742&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java
Thu Jun 26 11:31:39 2014
@@ -24,10 +24,10 @@ import org.apache.qpid.server.exchange.E
import org.apache.qpid.server.model.DerivedAttribute;
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.store.SizeMonitorSettings;
+import org.apache.qpid.server.store.SizeMonitoringSettings;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
-public interface BDBHAVirtualHost<X extends BDBHAVirtualHost<X>> extends
VirtualHostImpl<X, AMQQueue<?>, ExchangeImpl<?>>, SizeMonitorSettings
+public interface BDBHAVirtualHost<X extends BDBHAVirtualHost<X>> extends
VirtualHostImpl<X, AMQQueue<?>, ExchangeImpl<?>>, SizeMonitoringSettings
{
String REMOTE_TRANSACTION_SYNCHRONIZATION_POLICY =
"remoteTransactionSynchronizationPolicy";
String LOCAL_TRANSACTION_SYNCHRONIZATION_POLICY =
"localTransactionSynchronizationPolicy";
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java?rev=1605742&r1=1605741&r2=1605742&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
Thu Jun 26 11:31:39 2014
@@ -23,9 +23,10 @@ package org.apache.qpid.server.virtualho
import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.store.SizeMonitoringSettings;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
-public interface BDBVirtualHost<X extends BDBVirtualHost<X>> extends
VirtualHostImpl<X, AMQQueue<?>, ExchangeImpl<?>>,
org.apache.qpid.server.store.FileBasedSettings,
org.apache.qpid.server.store.SizeMonitorSettings
+public interface BDBVirtualHost<X extends BDBVirtualHost<X>> extends
VirtualHostImpl<X, AMQQueue<?>, ExchangeImpl<?>>,
org.apache.qpid.server.store.FileBasedSettings, SizeMonitoringSettings
{
String STORE_PATH = "storePath";
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java?rev=1605742&r1=1605741&r2=1605742&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/ProvidedStoreVirtualHost.java
Thu Jun 26 11:31:39 2014
@@ -22,8 +22,9 @@ package org.apache.qpid.server.virtualho
import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.store.SizeMonitoringSettings;
-public interface ProvidedStoreVirtualHost<X extends
ProvidedStoreVirtualHost<X>> extends
VirtualHostImpl<X,AMQQueue<?>,ExchangeImpl<?>>,
org.apache.qpid.server.store.SizeMonitorSettings
+public interface ProvidedStoreVirtualHost<X extends
ProvidedStoreVirtualHost<X>> extends
VirtualHostImpl<X,AMQQueue<?>,ExchangeImpl<?>>, SizeMonitoringSettings
{
@ManagedAttribute(mandatory = true, defaultValue = "0")
Long getStoreUnderfullSize();
Modified:
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java?rev=1605742&r1=1605741&r2=1605742&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/AbstractDerbyMessageStore.java
Thu Jun 26 11:31:39 2014
@@ -55,7 +55,7 @@ public abstract class AbstractDerbyMessa
doOpen(parent);
- final SizeMonitorSettings sizeMonitorSettings =
(SizeMonitorSettings) parent;
+ final SizeMonitoringSettings sizeMonitorSettings =
(SizeMonitoringSettings) parent;
_persistentSizeHighThreshold =
sizeMonitorSettings.getStoreOverfullSize();
_persistentSizeLowThreshold =
sizeMonitorSettings.getStoreUnderfullSize();
Modified:
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java?rev=1605742&r1=1605741&r2=1605742&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/virtualhost/derby/DerbyVirtualHost.java
Thu Jun 26 11:31:39 2014
@@ -22,9 +22,10 @@ package org.apache.qpid.server.virtualho
import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.queue.AMQQueue;
+import org.apache.qpid.server.store.SizeMonitoringSettings;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
-public interface DerbyVirtualHost<X extends DerbyVirtualHost<X>> extends
VirtualHostImpl<X,AMQQueue<?>,ExchangeImpl<?>>,
org.apache.qpid.server.store.FileBasedSettings,
org.apache.qpid.server.store.SizeMonitorSettings
+public interface DerbyVirtualHost<X extends DerbyVirtualHost<X>> extends
VirtualHostImpl<X,AMQQueue<?>,ExchangeImpl<?>>,
org.apache.qpid.server.store.FileBasedSettings, SizeMonitoringSettings
{
String STORE_PATH = "storePath";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
