summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-04-22 12:32:36 +0000
committerKeith Wall <kwall@apache.org>2014-04-22 12:32:36 +0000
commit8ac9e6174a15670ebe25c7e8f686292aa7b35b13 (patch)
treec6f85d44d390726e546bc338b35146d1d389c775 /qpid/java
parentecc7f3fc1c56cde10e9960afd1e4fbd4bcb07abf (diff)
downloadqpid-python-8ac9e6174a15670ebe25c7e8f686292aa7b35b13.tar.gz
NO-JIRA: [Java Broker] Remove now dead recovery/dependency resolution classes
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1589113 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfiguredObjectRecoverer.java27
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/RecovererProvider.java28
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/RecovererHelper.java54
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/SetAttributeTask.java74
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueType.java29
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java11
-rwxr-xr-xqpid/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java36
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DependencyListener.java30
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java78
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreContext.java73
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedDependency.java32
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedObject.java28
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java3
13 files changed, 3 insertions, 500 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfiguredObjectRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfiguredObjectRecoverer.java
deleted file mode 100644
index 21e27f363e..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfiguredObjectRecoverer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.configuration;
-
-import org.apache.qpid.server.model.ConfiguredObject;
-
-public interface ConfiguredObjectRecoverer<T extends ConfiguredObject>
-{
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/RecovererProvider.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/RecovererProvider.java
deleted file mode 100644
index 963d019ec3..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/RecovererProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.configuration;
-
-import org.apache.qpid.server.model.ConfiguredObject;
-
-public interface RecovererProvider
-{
- ConfiguredObjectRecoverer<? extends ConfiguredObject> getRecoverer(String type);
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/RecovererHelper.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/RecovererHelper.java
deleted file mode 100644
index cc0426131f..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/RecovererHelper.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.configuration.startup;
-
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
-
-public class RecovererHelper
-{
- public static Broker verifyOnlyBrokerIsParent(ConfiguredObject... parents)
- {
- return verifyOnlyParentIsOfType(Broker.class, parents);
- }
-
- @SuppressWarnings("unchecked")
- public static <T extends ConfiguredObject> T verifyOnlyParentIsOfType(Class<T> parentClass, ConfiguredObject... parents)
- {
- if (parentClass == null)
- {
- throw new IllegalArgumentException("Parent class is not specified!");
- }
- if (parents == null || parents.length == 0)
- {
- throw new IllegalArgumentException("Parent of type " + parentClass.getSimpleName() +" is not passed!");
- }
- if (parents.length != 1)
- {
- throw new IllegalArgumentException("Only one parent is expected!");
- }
- if (!parentClass.isAssignableFrom(parents[0].getClass()))
- {
- throw new IllegalArgumentException("Parent is not instance of " + parentClass.getSimpleName());
- }
- return (T)parents[0];
- }
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/SetAttributeTask.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/SetAttributeTask.java
deleted file mode 100644
index 6ad8b8187f..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/SetAttributeTask.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.configuration.updater;
-
-import java.util.concurrent.Callable;
-
-import org.apache.qpid.server.model.ConfiguredObject;
-
-public final class SetAttributeTask implements TaskExecutor.Task<Object>
-{
- private ConfiguredObject _object;
- private String _attributeName;
- private Object _expectedValue;
- private Object _desiredValue;
-
- public SetAttributeTask(ConfiguredObject object, String attributeName, Object expectedValue, Object desiredValue)
- {
- _object = object;
- _attributeName = attributeName;
- _expectedValue = expectedValue;
- _desiredValue = desiredValue;
- }
-
- public ConfiguredObject getObject()
- {
- return _object;
- }
-
- public String getAttributeName()
- {
- return _attributeName;
- }
-
- public Object getExpectedValue()
- {
- return _expectedValue;
- }
-
- public Object getDesiredValue()
- {
- return _desiredValue;
- }
-
- @Override
- public Object execute()
- {
- return _object.setAttribute(_attributeName, _expectedValue, _desiredValue);
- }
-
- @Override
- public String toString()
- {
- return "SetAttributeTask [object=" + _object + ", attributeName=" + _attributeName + ", expectedValue=" + _expectedValue
- + ", desiredValue=" + _desiredValue + "]";
- }
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueType.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueType.java
deleted file mode 100644
index 96f2a7e2e5..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.model;
-
-public enum QueueType
-{
- STANDARD,
- PRIORITY,
- LVQ,
- SORTED
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java
index 5db250a90f..85a0d632c2 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java
@@ -43,8 +43,6 @@ import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
import javax.xml.bind.DatatypeConverter;
-import org.apache.qpid.server.configuration.ConfiguredObjectRecoverer;
-import org.apache.qpid.server.configuration.RecovererProvider;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.Broker;
@@ -64,8 +62,7 @@ import org.apache.qpid.server.security.auth.sasl.scram.ScramSHA1SaslServer;
@ManagedObject( category = false, type = "SCRAM-SHA-1" )
public class ScramSHA1AuthenticationManager
extends AbstractAuthenticationManager<ScramSHA1AuthenticationManager>
- implements PasswordCredentialManagingAuthenticationProvider<ScramSHA1AuthenticationManager>,
- RecovererProvider
+ implements PasswordCredentialManagingAuthenticationProvider<ScramSHA1AuthenticationManager>
{
public static final String SCRAM_USER_TYPE = "scram";
private static final Charset ASCII = Charset.forName("ASCII");
@@ -358,12 +355,6 @@ public class ScramSHA1AuthenticationManager
}
- @Override
- public ConfiguredObjectRecoverer<? extends ConfiguredObject> getRecoverer(final String type)
- {
- return null;
- }
-
@ManagedObject( category = false, type = "scram")
static class ScramAuthUser extends AbstractConfiguredObject<ScramAuthUser> implements User<ScramAuthUser>
{
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java
deleted file mode 100755
index 81d3f7f9da..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*
-*/
-package org.apache.qpid.server.store;
-
-
-public interface ConfigurationRecoveryHandler
-{
- void beginConfigurationRecovery(DurableConfigurationStore store);
-
- void configuredObject(ConfiguredObjectRecord object);
-
- /**
- *
- * @return the model version of the configuration
- */
- String completeConfigurationRecovery();
-
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DependencyListener.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DependencyListener.java
deleted file mode 100644
index 2962e63152..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DependencyListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.store;
-
-import java.util.UUID;
-
-import org.apache.qpid.server.model.ConfiguredObject;
-
-interface DependencyListener
-{
- void dependencyResolved(String type, UUID id, ConfiguredObject o);
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java
deleted file mode 100644
index 3a69f802f0..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.store;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
-import org.apache.qpid.server.plugin.QpidServiceLoader;
-
-public class DurableConfigurationStoreCreator
-{
- private Map<String, DurableConfigurationStoreFactory> _factories = new HashMap<String, DurableConfigurationStoreFactory>();
-
- public DurableConfigurationStoreCreator()
- {
- QpidServiceLoader<DurableConfigurationStoreFactory> qpidServiceLoader = new QpidServiceLoader<DurableConfigurationStoreFactory>();
- Iterable<DurableConfigurationStoreFactory> factories = qpidServiceLoader.atLeastOneInstanceOf(DurableConfigurationStoreFactory.class);
- for (DurableConfigurationStoreFactory durableConfigurationStoreFactory : factories)
- {
- String type = durableConfigurationStoreFactory.getType();
- DurableConfigurationStoreFactory factory = _factories.put(type.toLowerCase(), durableConfigurationStoreFactory);
- if (factory != null)
- {
- throw new IllegalStateException("DurableConfigurationStoreFactory with type name '" + type
- + "' is already registered using class '" + factory.getClass().getName() + "', can not register class '"
- + durableConfigurationStoreFactory.getClass().getName() + "'");
- }
- }
- }
-
- public boolean isValidType(String storeType)
- {
- return _factories.containsKey(storeType.toLowerCase());
- }
-
-
- public DurableConfigurationStore createMessageStore(String storeType)
- {
- DurableConfigurationStoreFactory factory = _factories.get(storeType.toLowerCase());
- if (factory == null)
- {
- throw new IllegalConfigurationException("Unknown store type: " + storeType
- + ". Supported types: " + _factories.keySet());
- }
- return factory.createDurableConfigurationStore();
- }
-
- public Collection<DurableConfigurationStoreFactory> getFactories()
- {
- return Collections.unmodifiableCollection(_factories.values());
- }
-
- public Collection<String> getStoreTypes()
- {
- return Collections.unmodifiableCollection(_factories.keySet());
- }
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreContext.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreContext.java
deleted file mode 100644
index 88cc68bc71..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreContext.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.store;
-
-import org.apache.log4j.Logger;
-
-/**
- * A context that the store can use to associate with a transactional context. For example, it could store
- * some kind of txn id.
- *
- * @author Apache Software Foundation
- */
-public class StoreContext
-{
- private static final Logger _logger = Logger.getLogger(StoreContext.class);
-
- private String _name;
- private Object _payload;
-
-
- public StoreContext()
- {
- _name = "StoreContext";
- }
-
- public StoreContext(String name)
- {
- _name = name;
- }
-
- public Object getPayload()
- {
- return _payload;
- }
-
- public void setPayload(Object payload)
- {
- if(_logger.isDebugEnabled())
- {
- _logger.debug("public void setPayload(Object payload = " + payload + "): called");
- }
- _payload = payload;
- }
-
- /**
- * Prints out the transactional context as a string, mainly for debugging purposes.
- *
- * @return The transactional context as a string.
- */
- public String toString()
- {
- return "<_name = " + _name + ", _payload = " + _payload + ">";
- }
-
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedDependency.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedDependency.java
deleted file mode 100644
index 29991054fd..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedDependency.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.store;
-
-import java.util.UUID;
-
-public interface UnresolvedDependency<T>
-{
- public UUID getId();
- public String getName();
- public String getType();
-
- public void resolve(final T dependency);
-}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedObject.java
deleted file mode 100644
index 7ebebadae7..0000000000
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedObject.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.server.store;
-
-public interface UnresolvedObject<T>
-{
- public UnresolvedDependency[] getUnresolvedDependencies();
-
- T resolve();
-}
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
index 95bffa89aa..ba00c430ed 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
@@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.log4j.Logger;
import org.apache.qpid.server.message.EnqueueableMessage;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.plugin.DurableConfigurationStoreFactory;
import org.apache.qpid.server.plugin.MessageStoreFactory;
import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
import org.apache.qpid.server.store.handler.DistributedTransactionHandler;
@@ -62,7 +63,7 @@ public class SlowMessageStore implements MessageStore, DurableConfigurationStore
if (storeSettings != null && storeSettings.get(REAL_STORE) != null)
{
final String realStore = (String) storeSettings.get(REAL_STORE);
- _realDurableConfigurationStore = new DurableConfigurationStoreCreator().createMessageStore(realStore);
+ _realDurableConfigurationStore = DurableConfigurationStoreFactory.FACTORY_LOADER.get(realStore).createDurableConfigurationStore();
_realDurableConfigurationStore.openConfigurationStore(parent, storeSettings);
}
}