Author: kwall
Date: Tue Apr 22 12:32:36 2014
New Revision: 1589113
URL: http://svn.apache.org/r1589113
Log:
NO-JIRA: [Java Broker] Remove now dead recovery/dependency resolution classes
Removed:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/ConfiguredObjectRecoverer.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/RecovererProvider.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/startup/
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/SetAttributeTask.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/QueueType.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/ConfigurationRecoveryHandler.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DependencyListener.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/DurableConfigurationStoreCreator.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/StoreContext.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedDependency.java
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/UnresolvedObject.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
Modified:
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java?rev=1589113&r1=1589112&r2=1589113&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java
(original)
+++
qpid/trunk/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManager.java
Tue Apr 22 12:32:36 2014
@@ -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.a
@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 ScramSHA1AuthenticationMana
}
- @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>
{
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java?rev=1589113&r1=1589112&r2=1589113&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SlowMessageStore.java
Tue Apr 22 12:32:36 2014
@@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentHa
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
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);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
