Author: orudyy
Date: Tue Jul 26 10:28:42 2016
New Revision: 1754103
URL: http://svn.apache.org/viewvc?rev=1754103&view=rev
Log:
QPID-7362: Remove old preference API implementation
Removed:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesProvider.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/PreferencesSupportingAuthenticationProvider.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProvider.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/PreferencesProviderCreationTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LoggedOnUserPreferencesServlet.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/UserPreferencesServlet.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addPreferencesProvider.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addPreferencesProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/preferencesprovider/
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/LegacyPreferencesProviderRestTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/LegacyPreferencesRestTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/LegacyUserPreferencesRestTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/acl/LegacyUserPreferencesRestACLTest.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/User.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
qpid/java/trunk/broker-core/src/main/resources/initial-config.json
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AuthenticationProvider.java
Tue Jul 26 10:28:42 2016
@@ -45,18 +45,6 @@ public interface AuthenticationProvider<
SubjectCreator getSubjectCreator(final boolean secure);
/**
- * Returns the preferences provider associated with this authentication
provider
- * @return PreferencesProvider
- */
- PreferencesProvider<?> getPreferencesProvider();
-
- /**
- * Sets the preferences provider
- * @param preferencesProvider
- */
- void setPreferencesProvider(PreferencesProvider<?> preferencesProvider);
-
- /**
* Gets the SASL mechanisms known to this manager.
*
* @return SASL mechanism names, space separated.
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
Tue Jul 26 10:28:42 2016
@@ -52,6 +52,7 @@ public final class BrokerModel extends M
* Make Connections children of Ports instead of VHosts
* Bring model version and Qpid version into sync
* 6.1 Remove JMX
+ * Remove PreferencesProvider
*/
public static final int MODEL_MAJOR_VERSION = 6;
public static final int MODEL_MINOR_VERSION = 1;
@@ -102,7 +103,6 @@ public final class BrokerModel extends M
addRelationship(Port.class, Connection.class);
addRelationship(AuthenticationProvider.class, User.class);
- addRelationship(AuthenticationProvider.class,
PreferencesProvider.class);
addRelationship(GroupProvider.class, Group.class);
addRelationship(Group.class, GroupMember.class);
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
Tue Jul 26 10:28:42 2016
@@ -93,8 +93,4 @@ public class UUIDGenerator
return createUUID(type, childName);
}
- public static UUID generatePreferencesProviderUUID(String
preferencesProviderName, String authenticationProviderName)
- {
- return createUUID(PreferencesProvider.class.getName(),
authenticationProviderName, preferencesProviderName);
- }
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/User.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/User.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/User.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/User.java
Tue Jul 26 10:28:42 2016
@@ -21,26 +21,15 @@
package org.apache.qpid.server.model;
-import java.util.Map;
-
@ManagedObject
public interface User<X extends User<X>> extends ConfiguredObject<X>
{
String STATE = "state";
String PASSWORD = "password";
- // Attributes
-
@ManagedAttribute( secure = true )
String getPassword();
- public void setPassword(String password);
-
- public Map<String, Object> getPreferences();
-
- public Object getPreference(String name);
-
- public Map<String, Object> setPreferences(Map<String, Object> preferences);
+ void setPassword(String password);
- public boolean deletePreferences();
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
Tue Jul 26 10:28:42 2016
@@ -22,7 +22,6 @@ package org.apache.qpid.server.security.
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -35,15 +34,12 @@ import org.apache.qpid.server.logging.me
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.IntegrityViolationException;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.PreferencesProvider;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.model.VirtualHostAlias;
@@ -58,7 +54,6 @@ public abstract class AbstractAuthentica
private final Broker<?> _broker;
private final EventLogger _eventLogger;
- private PreferencesProvider<?> _preferencesProvider;
@ManagedAttributeField
private List<String> _secureOnlyMechanisms;
@@ -79,11 +74,6 @@ public abstract class AbstractAuthentica
public void onValidate()
{
super.onValidate();
- Collection<PreferencesProvider> prefsProviders =
getChildren(PreferencesProvider.class);
- if(prefsProviders != null && prefsProviders.size() > 1)
- {
- throw new IllegalConfigurationException("Only one preference
provider can be configured for an authentication provider");
- }
if(!isDurable())
{
@@ -97,17 +87,6 @@ public abstract class AbstractAuthentica
}
@Override
- protected void onOpen()
- {
- super.onOpen();
- Collection<PreferencesProvider> prefsProviders =
getChildren(PreferencesProvider.class);
- if(prefsProviders != null && !prefsProviders.isEmpty())
- {
- _preferencesProvider = prefsProviders.iterator().next();
- }
- }
-
- @Override
public Collection<VirtualHostAlias> getVirtualHostPortBindings()
{
return null;
@@ -119,39 +98,6 @@ public abstract class AbstractAuthentica
return new SubjectCreator(this, _broker.getGroupProviders(), secure);
}
- @Override
- public PreferencesProvider<?> getPreferencesProvider()
- {
- return _preferencesProvider;
- }
-
- @Override
- public void setPreferencesProvider(final PreferencesProvider<?>
preferencesProvider)
- {
- _preferencesProvider = preferencesProvider;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public <C extends ConfiguredObject> ListenableFuture<C>
addChildAsync(Class<C> childClass, Map<String, Object> attributes,
ConfiguredObject... otherParents)
- {
- if(childClass == PreferencesProvider.class)
- {
- attributes = new HashMap<>(attributes);
- return
doAfter(getObjectFactory().createAsync(PreferencesProvider.class, attributes,
this),
- new CallableWithArgument<ListenableFuture<C>,
PreferencesProvider>()
- {
- @Override
- public ListenableFuture<C> call(final
PreferencesProvider preferencesProvider) throws Exception
- {
- _preferencesProvider = preferencesProvider;
- return
Futures.immediateFuture((C)preferencesProvider);
- }
- });
- }
- throw new IllegalArgumentException("Cannot create child of class " +
childClass.getSimpleName());
- }
-
@StateTransition( currentState = State.UNINITIALIZED, desiredState =
State.QUIESCED )
protected ListenableFuture<Void> startQuiesced()
{
@@ -204,70 +150,40 @@ public abstract class AbstractAuthentica
private ListenableFuture<Void> performDelete()
{
final SettableFuture<Void> futureResult = SettableFuture.create();
- final ListenableFuture<Void> preferenceDeleteFuture;
- if (_preferencesProvider != null)
- {
- preferenceDeleteFuture = _preferencesProvider.deleteAsync();
- }
- else
- {
- preferenceDeleteFuture = Futures.immediateFuture(null);
- }
-
- Futures.addCallback(preferenceDeleteFuture, new FutureCallback<Void>()
+ Futures.addCallback(closeAsync(), new FutureCallback<Void>()
{
-
@Override
public void onSuccess(final Void result)
{
- closeAndDelete();
+ try
+ {
+ tidyUp();
+ futureResult.set(null);
+ }
+ catch (Exception e)
+ {
+ futureResult.setException(e);
+ }
}
@Override
public void onFailure(final Throwable t)
{
- LOGGER.warn("Failed to delete preference provider : {}",
_preferencesProvider.getName(), t);
- closeAndDelete();
+ try
+ {
+ tidyUp();
+ }
+ finally
+ {
+ futureResult.setException(t);
+ }
}
- private void closeAndDelete()
+ private void tidyUp()
{
- Futures.addCallback(closeAsync(), new FutureCallback<Void>()
- {
- @Override
- public void onSuccess(final Void result)
- {
- try
- {
- tidyUp();
- futureResult.set(null);
- }
- catch (Exception e)
- {
- futureResult.setException(e);
- }
- }
-
- @Override
- public void onFailure(final Throwable t)
- {
- try
- {
- tidyUp();
- }
- finally
- {
- futureResult.setException(t);
- }
- }
-
- private void tidyUp()
- {
- deleted();
- setState(State.DELETED);
-
_eventLogger.message(AuthenticationProviderMessages.DELETE(getName()));
- }
- });
+ deleted();
+ setState(State.DELETED);
+
_eventLogger.message(AuthenticationProviderMessages.DELETE(getName()));
}
});
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ConfigModelPasswordManagingAuthenticationProvider.java
Tue Jul 26 10:28:42 2016
@@ -39,14 +39,13 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
import
org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
-import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
import org.apache.qpid.server.model.User;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
public abstract class ConfigModelPasswordManagingAuthenticationProvider<X
extends ConfigModelPasswordManagingAuthenticationProvider<X>>
extends AbstractAuthenticationManager<X>
- implements PasswordCredentialManagingAuthenticationProvider<X>,
PreferencesSupportingAuthenticationProvider
+ implements PasswordCredentialManagingAuthenticationProvider<X>
{
static final Charset ASCII = Charset.forName("ASCII");
protected Map<String, ManagedUser> _users = new ConcurrentHashMap<>();
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManager.java
Tue Jul 26 10:28:42 2016
@@ -23,10 +23,9 @@ package org.apache.qpid.server.security.
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.model.ManagedObject;
-import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
@ManagedObject( category = false, type = "External" )
-public interface ExternalAuthenticationManager<T extends
ExternalAuthenticationManager<T>> extends AuthenticationProvider<T>,
PreferencesSupportingAuthenticationProvider
+public interface ExternalAuthenticationManager<T extends
ExternalAuthenticationManager<T>> extends AuthenticationProvider<T>
{
String PROVIDER_TYPE = "External";
String ATTRIBUTE_USE_FULL_DN = "useFullDN";
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
Tue Jul 26 10:28:42 2016
@@ -36,12 +36,11 @@ import javax.security.sasl.SaslServer;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
-import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
@ManagedObject( category = false, type = "Kerberos" )
-public class KerberosAuthenticationManager extends
AbstractAuthenticationManager<KerberosAuthenticationManager> implements
PreferencesSupportingAuthenticationProvider
+public class KerberosAuthenticationManager extends
AbstractAuthenticationManager<KerberosAuthenticationManager>
{
public static final String PROVIDER_TYPE = "Kerberos";
private static final String GSSAPI_MECHANISM = "GSSAPI";
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ManagedUser.java
Tue Jul 26 10:28:42 2016
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.security.auth.manager;
-import java.util.Collection;
import java.util.Collections;
import java.util.Map;
@@ -28,11 +27,9 @@ import com.google.common.util.concurrent
import com.google.common.util.concurrent.ListenableFuture;
import org.apache.qpid.server.model.AbstractConfiguredObject;
-import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObject;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
-import org.apache.qpid.server.model.PreferencesProvider;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
import org.apache.qpid.server.model.User;
@@ -105,58 +102,6 @@ class ManagedUser extends AbstractConfig
public void setPassword(final String password)
{
setAttributes(Collections.<String, Object>singletonMap(User.PASSWORD,
password));
-
- }
-
- @Override
- public <C extends ConfiguredObject> Collection<C> getChildren(final
Class<C> clazz)
- {
- return Collections.emptySet();
- }
-
- @Override
- public Map<String, Object> getPreferences()
- {
- PreferencesProvider<?> preferencesProvider =
_authenticationManager.getPreferencesProvider();
- if (preferencesProvider == null)
- {
- return null;
- }
- return preferencesProvider.getPreferences(this.getName());
- }
-
- @Override
- public Object getPreference(String name)
- {
- Map<String, Object> preferences = getPreferences();
- if (preferences == null)
- {
- return null;
- }
- return preferences.get(name);
- }
-
- @Override
- public Map<String, Object> setPreferences(Map<String, Object> preferences)
- {
- PreferencesProvider<?> preferencesProvider =
_authenticationManager.getPreferencesProvider();
- if (preferencesProvider == null)
- {
- return null;
- }
- return preferencesProvider.setPreferences(this.getName(), preferences);
- }
-
- @Override
- public boolean deletePreferences()
- {
- PreferencesProvider preferencesProvider =
_authenticationManager.getPreferencesProvider();
- if (preferencesProvider == null)
- {
- return false;
- }
- String[] deleted =
preferencesProvider.deletePreferences(this.getName());
- return deleted.length == 1;
}
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
Tue Jul 26 10:28:42 2016
@@ -45,39 +45,31 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import
org.apache.qpid.server.configuration.store.StoreConfigurationChangeListener;
import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.NoopConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ExternalFileBasedAuthenticationManager;
import org.apache.qpid.server.model.ManagedAttributeField;
-import org.apache.qpid.server.model.PreferencesProvider;
-import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
-import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.model.User;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import
org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
-import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.util.FileHelper;
public abstract class PrincipalDatabaseAuthenticationManager<T extends
PrincipalDatabaseAuthenticationManager<T>>
extends AbstractAuthenticationManager<T>
- implements ExternalFileBasedAuthenticationManager<T>,
PreferencesSupportingAuthenticationProvider
+ implements ExternalFileBasedAuthenticationManager<T>
{
private static final Logger LOGGER =
LoggerFactory.getLogger(PrincipalDatabaseAuthenticationManager.class);
private final Map<Principal, PrincipalAdapter> _userMap = new
ConcurrentHashMap<Principal, PrincipalAdapter>();
- private final DurableConfigurationStore _durableConfigurationStore;
- private final StoreConfigurationChangeListener
_durableConfigurationStoreChangeListener;
private PrincipalDatabase _principalDatabase;
@ManagedAttributeField
@@ -86,32 +78,6 @@ public abstract class PrincipalDatabaseA
protected PrincipalDatabaseAuthenticationManager(final Map<String, Object>
attributes, final Broker broker)
{
super(attributes, broker);
- SystemConfig<?> systemConfig =
getModel().getAncestor(SystemConfig.class, this);
- _durableConfigurationStore = systemConfig.getConfigurationStore();
- _durableConfigurationStoreChangeListener = new
StoreConfigurationChangeListener(_durableConfigurationStore);
-
- addChangeListener(new NoopConfigurationChangeListener()
- {
- @Override
- public void childRemoved(ConfiguredObject<?> object,
ConfiguredObject<?> child)
- {
- if (child instanceof PreferencesProvider && child.isDurable())
- {
- _durableConfigurationStore.remove(child.asObjectRecord());
-
child.removeChangeListener(_durableConfigurationStoreChangeListener);
- }
- }
-
- @Override
- public void childAdded(ConfiguredObject<?> object,
ConfiguredObject<?> child)
- {
- if (child instanceof PreferencesProvider && child.isDurable())
- {
- _durableConfigurationStore.create(child.asObjectRecord());
-
child.addChangeListener(_durableConfigurationStoreChangeListener);
- }
- }
- });
}
@Override
@@ -152,12 +118,6 @@ public abstract class PrincipalDatabaseA
{
super.onOpen();
initialise();
- PreferencesProvider<?> preferencesProvider = getPreferencesProvider();
- if (preferencesProvider != null)
- {
- // set store listener to save any attribute changes
-
preferencesProvider.addChangeListener(_durableConfigurationStoreChangeListener);
- }
}
@Override
@@ -507,11 +467,6 @@ public abstract class PrincipalDatabaseA
{
String userName = _user.getName();
deleteUserFromDatabase(userName);
- PreferencesProvider preferencesProvider =
getPreferencesProvider();
- if (preferencesProvider != null)
- {
- preferencesProvider.deletePreferences(userName);
- }
deleted();
setState(State.DELETED);
}
@@ -521,57 +476,6 @@ public abstract class PrincipalDatabaseA
}
return Futures.immediateFuture(null);
}
-
- @Override
- public Map<String, Object> getPreferences()
- {
- PreferencesProvider preferencesProvider = getPreferencesProvider();
- if (preferencesProvider == null)
- {
- return null;
- }
- return preferencesProvider.getPreferences(this.getName());
- }
-
- @Override
- public Object getPreference(String name)
- {
- Map<String, Object> preferences = getPreferences();
- if (preferences == null)
- {
- return null;
- }
- return preferences.get(name);
- }
-
- @Override
- public Map<String, Object> setPreferences(Map<String, Object>
preferences)
- {
- PreferencesProvider preferencesProvider = getPreferencesProvider();
- if (preferencesProvider == null)
- {
- return null;
- }
- return preferencesProvider.setPreferences(this.getName(),
preferences);
- }
-
- @Override
- public boolean deletePreferences()
- {
- PreferencesProvider preferencesProvider = getPreferencesProvider();
- if (preferencesProvider == null)
- {
- return false;
- }
- String[] deleted =
preferencesProvider.deletePreferences(this.getName());
- return deleted.length == 1;
- }
-
- private PreferencesProvider getPreferencesProvider()
- {
- return
PrincipalDatabaseAuthenticationManager.this.getPreferencesProvider();
- }
-
}
private static Map<String, Object>
createPrincipalAttributes(PrincipalDatabaseAuthenticationManager manager, final
Principal user)
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
Tue Jul 26 10:28:42 2016
@@ -42,7 +42,6 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedObject;
-import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.security.auth.sasl.plain.PlainPasswordCallback;
@@ -52,8 +51,7 @@ import org.apache.qpid.server.security.a
@ManagedObject( category = false, type = "Simple", register = false )
public class SimpleAuthenticationManager extends
AbstractAuthenticationManager<SimpleAuthenticationManager>
- implements
UsernamePasswordAuthenticationProvider<SimpleAuthenticationManager>,
- PreferencesSupportingAuthenticationProvider
+ implements
UsernamePasswordAuthenticationProvider<SimpleAuthenticationManager>
{
private static final Logger _logger =
LoggerFactory.getLogger(SimpleAuthenticationManager.class);
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
Tue Jul 26 10:28:42 2016
@@ -26,7 +26,6 @@ import org.apache.qpid.server.model.Deri
import org.apache.qpid.server.model.ManagedAttribute;
import org.apache.qpid.server.model.ManagedContextDefault;
import org.apache.qpid.server.model.ManagedObject;
-import
org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
import org.apache.qpid.server.model.TrustStore;
@ManagedObject( category = false,
@@ -34,8 +33,7 @@ import org.apache.qpid.server.model.Trus
description =
SimpleLDAPAuthenticationManager.CLASS_DESCRIPTION )
public interface SimpleLDAPAuthenticationManager<X extends
SimpleLDAPAuthenticationManager<X>>
extends CachingAuthenticationProvider<X>,
- UsernamePasswordAuthenticationProvider<X>,
- PreferencesSupportingAuthenticationProvider
+ UsernamePasswordAuthenticationProvider<X>
{
String CLASS_DESCRIPTION = "Authentication provider that delegates
authentication decisions to a Directory"
+ " supporting the LDAP protocol.";
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
Tue Jul 26 10:28:42 2016
@@ -512,6 +512,20 @@ public class BrokerStoreUpgraderAndRecov
getNextUpgrader().configuredObject(record);
}
}
+ else if (record.getType().equals("AuthenticationProvider") &&
attributes.containsKey("preferencesproviders"))
+ {
+ // removing of Preferences Provider from
AuthenticationProvider attribute for JSON configuration store
+ Map<String, Object> updatedAttributes = new
LinkedHashMap<>(attributes);
+ updatedAttributes.remove("preferencesproviders");
+ record = new ConfiguredObjectRecordImpl(record.getId(),
record.getType(), updatedAttributes, record.getParents());
+ getUpdateMap().put(record.getId(), record);
+ getNextUpgrader().configuredObject(record);
+ }
+ else if (record.getType().equals("PreferencesProvider"))
+ {
+ // removing of f Preferences Provider record for non-JSON
configuration store
+ getDeleteMap().put(record.getId(), record);
+ }
else
{
getNextUpgrader().configuredObject(record);
Modified: qpid/java/trunk/broker-core/src/main/resources/initial-config.json
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/resources/initial-config.json?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/resources/initial-config.json
(original)
+++ qpid/java/trunk/broker-core/src/main/resources/initial-config.json Tue Jul
26 10:28:42 2016
@@ -24,12 +24,7 @@
"authenticationproviders" : [ {
"name" : "passwordFile",
"type" : "PlainPasswordFile",
- "path" : "${qpid.home_dir}${file.separator}etc${file.separator}passwd",
- "preferencesproviders" : [{
- "name": "fileSystemPreferences",
- "type": "FileSystemPreferences",
- "path" : "${qpid.work_dir}${file.separator}user.preferences.json"
- }]
+ "path" : "${qpid.home_dir}${file.separator}etc${file.separator}passwd"
} ],
"brokerloggers" : [ {
"name" : "logfile",
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
Tue Jul 26 10:28:42 2016
@@ -593,6 +593,66 @@ public class BrokerStoreUpgraderAndRecov
assertTrue("Port was not removed", ports.isEmpty());
}
+ public void testUpgradeRemovePreferencesProviderNonJsonLikeStore()
+ {
+ _brokerRecord.getAttributes().put("modelVersion", "6.0");
+
+ Map<String, Object> authenticationProvider = new HashMap<>();
+ authenticationProvider.put("name", "anonymous");
+ authenticationProvider.put("type", "Anonymous");
+
+ ConfiguredObjectRecord authenticationProviderRecord = new
ConfiguredObjectRecordImpl(
+ UUID.randomUUID(),
+ "AuthenticationProvider",
+ authenticationProvider,
+ Collections.singletonMap("Broker", _brokerRecord.getId()));
+
+ ConfiguredObjectRecord preferencesProviderRecord = new
ConfiguredObjectRecordImpl(
+ UUID.randomUUID(),
+ "PreferencesProvider",
+ Collections.<String, Object>emptyMap(),
+ Collections.singletonMap("AuthenticationProvider",
authenticationProviderRecord.getId()));
+
+ DurableConfigurationStore dcs = new
DurableConfigurationStoreStub(_brokerRecord,
+
authenticationProviderRecord,
+
preferencesProviderRecord);
+
+ BrokerStoreUpgraderAndRecoverer recoverer = new
BrokerStoreUpgraderAndRecoverer(_systemConfig);
+ List<ConfiguredObjectRecord> records = recoverer.upgrade(dcs);
+
+ List<ConfiguredObjectRecord> preferencesProviders =
findRecordByType("PreferencesProvider", records);
+ assertTrue("PreferencesProvider was not removed",
preferencesProviders.isEmpty());
+
+ List<ConfiguredObjectRecord> authenticationProviders =
findRecordByType("AuthenticationProvider", records);
+ assertEquals("AuthenticationProvider was removed", 1,
authenticationProviders.size());
+ }
+
+ public void testUpgradeRemovePreferencesProviderJsonLikeStore()
+ {
+ _brokerRecord.getAttributes().put("modelVersion", "6.0");
+
+ Map<String, Object> authenticationProvider = new HashMap<>();
+ authenticationProvider.put("name", "anonymous");
+ authenticationProvider.put("type", "Anonymous");
+ authenticationProvider.put("preferencesproviders",
Collections.emptyMap());
+
+ ConfiguredObjectRecord authenticationProviderRecord = new
ConfiguredObjectRecordImpl(
+ UUID.randomUUID(),
+ "AuthenticationProvider",
+ authenticationProvider,
+ Collections.singletonMap("Broker", _brokerRecord.getId()));
+
+ DurableConfigurationStore dcs = new
DurableConfigurationStoreStub(_brokerRecord, authenticationProviderRecord);
+
+ BrokerStoreUpgraderAndRecoverer recoverer = new
BrokerStoreUpgraderAndRecoverer(_systemConfig);
+ List<ConfiguredObjectRecord> records = recoverer.upgrade(dcs);
+
+ List<ConfiguredObjectRecord> authenticationProviders =
findRecordByType("AuthenticationProvider", records);
+ assertEquals("AuthenticationProviders was removed", 1,
authenticationProviders.size());
+ assertFalse("PreferencesProvider was not removed",
+
authenticationProviders.get(0).getAttributes().containsKey("preferencesproviders"));
+ }
+
private void upgradeBrokerRecordAndAssertUpgradeResults()
{
DurableConfigurationStore dcs = new
DurableConfigurationStoreStub(_brokerRecord);
Modified:
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java
(original)
+++
qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyAccessControlAdapter.java
Tue Jul 26 10:28:42 2016
@@ -197,7 +197,6 @@ class LegacyAccessControlAdapter
private boolean isBrokerType(Class<? extends ConfiguredObject> category)
{
return Broker.class.isAssignableFrom(category) ||
- PreferencesProvider.class.isAssignableFrom(category) ||
BrokerLogInclusionRule.class.isAssignableFrom(category) ||
VirtualHostAlias.class.isAssignableFrom(category) ||
( !VirtualHostNode.class.isAssignableFrom(category) &&
getModel().getChildTypes(Broker.class).contains(category));
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Tue Jul 26 10:28:42 2016
@@ -83,7 +83,6 @@ import org.apache.qpid.server.management
import org.apache.qpid.server.management.plugin.servlet.rest.ApiDocsServlet;
import
org.apache.qpid.server.management.plugin.servlet.rest.BrokerQueryServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.JsonValueServlet;
-import
org.apache.qpid.server.management.plugin.servlet.rest.LoggedOnUserPreferencesServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.LogoutServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.MetaDataServlet;
import
org.apache.qpid.server.management.plugin.servlet.rest.QueueReportServlet;
@@ -91,7 +90,6 @@ import org.apache.qpid.server.management
import org.apache.qpid.server.management.plugin.servlet.rest.SaslServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.StructureServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.TimeZoneServlet;
-import
org.apache.qpid.server.management.plugin.servlet.rest.UserPreferencesServlet;
import
org.apache.qpid.server.management.plugin.servlet.rest.VirtualHostQueryServlet;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
@@ -350,8 +348,6 @@ public class HttpManagement extends Abst
root.addServlet(apiDocsServlet, path + "/");
}
- root.addServlet(new ServletHolder(new UserPreferencesServlet()),
"/service/userpreferences/*");
- root.addServlet(new ServletHolder(new
LoggedOnUserPreferencesServlet()), "/service/preferences");
root.addServlet(new ServletHolder(new StructureServlet()),
"/service/structure");
root.addServlet(new ServletHolder(new QueueReportServlet()),
"/service/queuereport/*");
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html
Tue Jul 26 10:28:42 2016
@@ -60,8 +60,6 @@
</fieldset>
</div>
</form>
-
- <div id="addPreferencesProvider.form"></div>
</div>
<div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
<button data-dojo-type="dijit/form/Button"
id="addAuthenticationProvider.addButton" data-dojo-props="label: 'Save'"
type="submit"></button>
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
Tue Jul 26 10:28:42 2016
@@ -32,7 +32,6 @@ define(["dojo/parser",
"dojo/dom-style",
"dojox/html/entities",
"dojo/dom",
- "qpid/management/PreferencesProvider",
"qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager",
"dojo/text!showAuthProvider.html",
"dojo/domReady!"],
@@ -50,7 +49,6 @@ define(["dojo/parser",
domStyle,
entities,
dom,
- PreferencesProvider,
PrincipalDatabaseAuthenticationManager,
template)
{
@@ -114,27 +112,6 @@ define(["dojo/parser",
authProviderUpdater.managingUsersUI.update(authProviderUpdater.authProviderData);
}
- var supportsPreferencesProvider =
that.management.metadata.implementsManagedInterface(
- "AuthenticationProvider",
- authProviderUpdater.authProviderData.type,
- "PreferencesSupportingAuthenticationProvider");
- if (!supportsPreferencesProvider)
- {
- var preferencesPanel = query(".preferencesPanel",
contentPane.containerNode);
- if (preferencesPanel && preferencesPanel[0])
- {
- var preferencesProviderPanel =
registry.byNode(preferencesPanel[0]);
- domStyle.set(preferencesProviderPanel.domNode,
"display", "none");
- }
- }
- else
- {
- var preferencesProviderData =
authProviderUpdater.authProviderData.preferencesproviders
- ?
authProviderUpdater.authProviderData.preferencesproviders[0]
- : null;
-
authProviderUpdater.updatePreferencesProvider(preferencesProviderData);
- }
-
updater.add(that.authProviderUpdater);
});
});
@@ -176,42 +153,9 @@ define(["dojo/parser",
this.type = query(".type", node)[0];
this.state = query(".state", node)[0];
this.tabObject = authenticationProvider;
- this.preferencesProviderType = dom.byId("preferencesProviderType");
- this.preferencesProviderName = dom.byId("preferencesProviderName");
- this.preferencesProviderState =
dom.byId("preferencesProviderState");
- this.editPreferencesProviderButton =
query(".editPreferencesProviderButton", node)[0];
- this.deletePreferencesProviderButton =
query(".deletePreferencesProviderButton", node)[0];
- this.preferencesProviderAttributes =
dom.byId("preferencesProviderAttributes")
- this.preferencesNode = query(".preferencesProviderDetails",
node)[0];
this.authenticationProviderDetailsContainer =
query(".authenticationProviderDetails", node)[0];
}
- AuthProviderUpdater.prototype.updatePreferencesProvider = function
(preferencesProviderData)
- {
- if (preferencesProviderData)
- {
- if (!this.preferencesProvider)
- {
- var preferencesProvider = new
PreferencesProvider(preferencesProviderData.name, this.authProviderData);
- preferencesProvider.init(this.preferencesNode, this);
- this.preferencesProvider = preferencesProvider;
- }
- this.preferencesProvider.update(preferencesProviderData);
- }
- else
- {
- if (this.preferencesProvider)
- {
- this.preferencesProvider.update(null);
- }
- }
- };
-
- AuthProviderUpdater.prototype.onPreferencesProviderDeleted = function
()
- {
- this.preferencesProvider = null;
- }
-
AuthProviderUpdater.prototype.updateHeader = function ()
{
this.tabObject.name = this.authProviderData["name"]
@@ -289,19 +233,7 @@ define(["dojo/parser",
}
}
}
- var preferencesProviderData = data.preferencesproviders ?
data.preferencesproviders[0] : null;
- try
- {
- this.updatePreferencesProvider(preferencesProviderData);
- }
- catch (e)
- {
- if (console)
- {
- console.error(e);
- }
- }
- }
+ };
return AuthenticationProvider;
});
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
Tue Jul 26 10:28:42 2016
@@ -32,7 +32,6 @@ define(["dojo/dom",
"dojo/dom-style",
"qpid/common/util",
"dojo/text!addAuthenticationProvider.html",
- "qpid/management/preferencesprovider/PreferencesProviderForm",
/* dojox/ validate resources */
"dojox/validate/us",
"dojox/validate/web",
@@ -81,10 +80,6 @@ define(["dojo/dom",
var that = this;
this.authenticationProviderName =
registry.byId("addAuthenticationProvider.name");
this.authenticationProviderName.set("regExpGen",
util.nameOrContextVarRegexp);
- this.authenticationProviderName.on("change", function
(newValue)
- {
-
that.preferencesProviderForm.setPreferencesProviderName(newValue);
- });
this.dialog = registry.byId("addAuthenticationProvider");
this.addButton =
registry.byId("addAuthenticationProvider.addButton");
@@ -106,8 +101,6 @@ define(["dojo/dom",
that._authenticationProviderTypeChanged(type);
});
- this.preferencesProviderForm = new
qpid.preferencesprovider.PreferencesProviderForm({disabled: true});
-
this.preferencesProviderForm.placeAt(dom.byId("addPreferencesProvider.form"));
this.context =
registry.byId("addAuthenticationProvider.context");
},
show: function (management, modelObj, effectiveData)
@@ -115,7 +108,6 @@ define(["dojo/dom",
this.management = management;
this.modelObj = modelObj;
this.authenticationProviderForm.reset();
- this.preferencesProviderForm.setMetadata(management.metadata);
this.supportedAuthenticationProviderTypes =
management.metadata.getTypesForCategory("AuthenticationProvider");
@@ -136,15 +128,6 @@ define(["dojo/dom",
that.authenticationProviderType.set("disabled", true);
that.authenticationProviderName.set("disabled", true);
- if (actualData.preferencesproviders &&
actualData.preferencesproviders[0])
- {
-
that.preferencesProviderForm.setData(actualData.preferencesproviders[0]);
- }
- else
- {
- that.preferencesProviderForm.reset();
-
that.preferencesProviderForm.setPreferencesProviderName(actualData.name);
- }
that.authenticationProviderName.set("value",
actualData.name);
that.context.setData(actualData.context,
effectiveData.context, data.inheritedActual.context);
that._show();
@@ -153,7 +136,6 @@ define(["dojo/dom",
}
else
{
- this.preferencesProviderForm.reset();
this.authenticationProviderType.set("disabled", false);
this.authenticationProviderName.set("disabled", false);
this.initialData = {};
@@ -187,7 +169,7 @@ define(["dojo/dom",
},
_submit: function ()
{
- if (this.authenticationProviderForm.validate() &&
this.preferencesProviderForm.validate())
+ if (this.authenticationProviderForm.validate())
{
var authenticationProviderData =
util.getFormWidgetValues(this.authenticationProviderForm,
this.initialData);
@@ -205,54 +187,18 @@ define(["dojo/dom",
var hideDialog = function (x)
{
that.dialog.hide();
- }
-
- var savePreferences = function (x)
- {
- that.preferencesProviderForm.submit(function
(preferencesProviderData)
- {
- if (that.preferencesProviderForm.data)
- {
- // update request
- var name =
that.preferencesProviderForm.getPreferencesProviderName();
-
- var modelObj = {
- name: name,
- type: "preferencesprovider",
- parent: that.modelObj
- };
- that.management.update(modelObj,
preferencesProviderData)
- .then(hideDialog);
- }
- else
- {
- var authProviderModelObj = that.modelObj;
- if (authProviderModelObj.type !=
"authenticationprovider")
- {
- authProviderModelObj = {
- name: authenticationProviderData.name,
- type: "authenticationprovider",
- parent: that.modelObj
- };
- }
- that.management.create("preferencesprovider",
- authProviderModelObj,
- preferencesProviderData)
- .then(hideDialog);
- }
- }, hideDialog);
- }
+ };
if (this.initialData && this.initialData.id)
{
// update request
this.management.update(that.modelObj,
authenticationProviderData)
- .then(savePreferences);
+ .then(hideDialog);
}
else
{
this.management.create("authenticationprovider",
that.modelObj, authenticationProviderData)
- .then(savePreferences);
+ .then(hideDialog);
}
}
else
@@ -275,15 +221,6 @@ define(["dojo/dom",
item.destroyRecursive();
});
construct.empty(typeFieldsContainer);
- var supportsPreferencesProvider = false;
- if (type && this.management)
- {
- supportsPreferencesProvider =
this.management.metadata.implementsManagedInterface(
- "AuthenticationProvider",
- type,
- "PreferencesSupportingAuthenticationProvider");
- }
- this.preferencesProviderForm.set("disabled", !type ||
!supportsPreferencesProvider);
if (type)
{
var that = this;
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/controller.js
Tue Jul 26 10:28:42 2016
@@ -38,7 +38,6 @@ define(["dojo/dom",
"qpid/management/AccessControlProvider",
"qpid/management/Port",
"qpid/management/Plugin",
- "qpid/management/PreferencesProvider",
"qpid/management/VirtualHostNode",
"qpid/management/Logger",
"qpid/management/QueryTab",
@@ -67,7 +66,6 @@ define(["dojo/dom",
AccessControlProvider,
Port,
Plugin,
- PreferencesProvider,
VirtualHostNode,
Logger,
QueryTab,
@@ -91,7 +89,6 @@ define(["dojo/dom",
accesscontrolprovider: AccessControlProvider,
port: Port,
plugin: Plugin,
- preferencesprovider: PreferencesProvider,
virtualhostnode: VirtualHostNode,
brokerlogger: Logger,
virtualhostlogger: Logger,
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
Tue Jul 26 10:28:42 2016
@@ -40,6 +40,4 @@
</div>
</div>
<br/>
- <div class="preferencesProviderDetails"></div>
- <br/>
</div>
Modified:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Initial-Configuration.xml
Tue Jul 26 10:28:42 2016
@@ -282,16 +282,11 @@ $ ./qpid-server -prop "qpid.amqp_port=10
<programlisting>
{
"name": "\${broker.name}",
- "modelVersion": "6.0",
+ "modelVersion": "6.1",
"authenticationproviders" : [ {
"name" : "passwordFile",
"type" : "PlainPasswordFile",
- "path" : "\${qpid.home_dir}\${file.separator}etc\${file.separator}passwd",
- "preferencesproviders" : [{
- "name": "fileSystemPreferences",
- "type": "FileSystemPreferences",
- "path" : "\${qpid.work_dir}\${file.separator}user.preferences.json"
- }]
+ "path" : "\${qpid.home_dir}\${file.separator}etc\${file.separator}passwd"
} ],
"brokerloggers" : [ {
"name" : "logfile",
Modified:
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1754103&r1=1754102&r2=1754103&view=diff
==============================================================================
---
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
(original)
+++
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
Tue Jul 26 10:28:42 2016
@@ -397,15 +397,6 @@ public class TestBrokerConfiguration
_saved = saved;
}
- public void addPreferencesProviderConfiguration(String
authenticationProvider, Map<String, Object> attributes)
- {
- ConfiguredObjectRecord authProviderRecord =
findObject(AuthenticationProvider.class, authenticationProvider);
- ConfiguredObjectRecord pp = new
ConfiguredObjectRecordImpl(UUIDGenerator.generateRandomUUID(),
-
PreferencesProvider.class.getSimpleName(), attributes,
Collections.singletonMap(AuthenticationProvider.class.getSimpleName(),authProviderRecord.getId()));
-
- _store.create(pp);
- }
-
public Map<String,Object> getObjectAttributes(final Class<? extends
ConfiguredObject> category, final String name)
{
return findObject(category, name).getAttributes();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
