From f73b655466092169abac34833fb628fce1fcdebe Mon Sep 17 00:00:00 2001
From: jcduff <jcduff@localhost>
Date: Thu, 23 Oct 2008 14:04:24 +0000
Subject: [PATCH] The commit will bring the following features : - An updated version of the underlying database. BDB JE 3.3 is now used. - Attribute API refactoring providing a better abstraction and offering improved performances. - A new GUI called the Control-Panel to replace the Status-Panel: the specifications for this GUI are available on OpenDS Wiki and contains a link to a mockup. See <https://www.opends.org/wiki/page/ControlPanelUISpecification>. - Some changes in the replication protocol to implement "Assured Replication Mode". The specifications are on OpenDS Wiki at <https://www.opends.org/wiki/page/AssuredMode> and section 7 described some of the replication changes required to support this. Assured Replication is not finished, but the main replication protocol changes to support it are done. As explained by Gilles on an email on the Dev mailing list (http://markmail.org/message/46rgo3meq3vriy4a), with these changes the newer versions of OpenDS may not be able to replicate with OpenDS 1.0 instances. - Support for Service Tags on the platforms where the functionality is available and enabled. Specifications are published at <https://www.opends.org/wiki/page/OpenDSServiceTagEnabled>. For more information on Service Tags see <http://wikis.sun.com/display/ServiceTag/Sun+Service+Tag+FAQ>. - The Admin Connector service. In order to provide agentry of the OpenDS server at any time, a new service has been added, dedicated to the administration, configuration and monitoring of the server. An overview of the Admin Connector service and it's use is available on the OpenDS wiki <https://www.opends.org/wiki/page/ManagingAdministrationTrafficToTheServer> - Updates to the various command line tools to support the Admin Connector service. - Some internal re-architecting of the server to put the foundation of future developments such as virtual directory services. The new NetworkGroups and WorkFlow internal services which have been specified in <https://www.opends.org/wiki/page/BasicOperationRoutingThroughNetworkGroup> are now implemented. - Many bug fixes...
---
opends/src/server/org/opends/server/core/PasswordPolicy.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/PasswordPolicy.java b/opends/src/server/org/opends/server/core/PasswordPolicy.java
index fcd2365..86b48ef 100644
--- a/opends/src/server/org/opends/server/core/PasswordPolicy.java
+++ b/opends/src/server/org/opends/server/core/PasswordPolicy.java
@@ -142,7 +142,7 @@
DEFAULT_PWPOLICY_SKIP_ADMIN_VALIDATION;
// The set of account status notification handlers for this password policy.
- private ConcurrentHashMap<DN, AccountStatusNotificationHandler>
+ private ConcurrentHashMap<DN, AccountStatusNotificationHandler<?>>
notificationHandlers;
// The set of password validators that will be used with this
@@ -151,10 +151,10 @@
// The set of default password storage schemes for this password
// policy.
- private CopyOnWriteArrayList<PasswordStorageScheme> defaultStorageSchemes =
- new CopyOnWriteArrayList<PasswordStorageScheme>();
+ private CopyOnWriteArrayList<PasswordStorageScheme<?>> defaultStorageSchemes =
+ new CopyOnWriteArrayList<PasswordStorageScheme<?>>();
{
- PasswordStorageScheme defaultScheme =
+ PasswordStorageScheme<?> defaultScheme =
DirectoryServer.getPasswordStorageScheme(DEFAULT_PASSWORD_STORAGE_SCHEME);
if (defaultScheme != null) defaultStorageSchemes.add(defaultScheme);
}
@@ -168,7 +168,7 @@
private DN passwordGeneratorDN = null;
// The password generator for use with this password policy.
- private PasswordGenerator passwordGenerator = null;
+ private PasswordGenerator<?> passwordGenerator = null;
// The number of grace logins that a user may have.
private int graceLoginCount = DEFAULT_PWPOLICY_GRACE_LOGIN_COUNT;
@@ -294,11 +294,11 @@
configuration.getDefaultPasswordStorageSchemeDNs();
try
{
- LinkedList<PasswordStorageScheme> schemes =
- new LinkedList<PasswordStorageScheme>();
+ LinkedList<PasswordStorageScheme<?>> schemes =
+ new LinkedList<PasswordStorageScheme<?>>();
for (DN configEntryDN : storageSchemeDNs)
{
- PasswordStorageScheme scheme =
+ PasswordStorageScheme<?> scheme =
DirectoryServer.getPasswordStorageScheme(configEntryDN);
if (this.authPasswordSyntax &&
@@ -314,7 +314,7 @@
}
this.defaultStorageSchemes =
- new CopyOnWriteArrayList<PasswordStorageScheme>(schemes);
+ new CopyOnWriteArrayList<PasswordStorageScheme<?>>(schemes);
}
catch (ConfigException ce)
{
@@ -342,7 +342,7 @@
new LinkedHashSet<String>();
for (DN schemeDN : deprecatedStorageSchemeDNs)
{
- PasswordStorageScheme scheme =
+ PasswordStorageScheme<?> scheme =
DirectoryServer.getPasswordStorageScheme(schemeDN);
if (this.authPasswordSyntax)
{
@@ -398,11 +398,11 @@
// Get the status notification handlers.
SortedSet<DN> statusNotificationHandlers =
configuration.getAccountStatusNotificationHandlerDNs();
- ConcurrentHashMap<DN,AccountStatusNotificationHandler> handlers =
- new ConcurrentHashMap<DN,AccountStatusNotificationHandler>();
+ ConcurrentHashMap<DN,AccountStatusNotificationHandler<?>> handlers =
+ new ConcurrentHashMap<DN,AccountStatusNotificationHandler<?>>();
for (DN handlerDN : statusNotificationHandlers)
{
- AccountStatusNotificationHandler handler =
+ AccountStatusNotificationHandler<?> handler =
DirectoryServer.getAccountStatusNotificationHandler(handlerDN);
handlers.put(handlerDN, handler);
}
@@ -746,7 +746,8 @@
* @return The default set of password storage schemes that will be used for
* this password policy.
*/
- public CopyOnWriteArrayList<PasswordStorageScheme> getDefaultStorageSchemes()
+ public CopyOnWriteArrayList<PasswordStorageScheme<?>>
+ getDefaultStorageSchemes()
{
return defaultStorageSchemes;
}
@@ -765,14 +766,14 @@
*/
public boolean isDefaultStorageScheme(String name)
{
- CopyOnWriteArrayList<PasswordStorageScheme> defaultSchemes =
+ CopyOnWriteArrayList<PasswordStorageScheme<?>> defaultSchemes =
getDefaultStorageSchemes();
if (defaultSchemes == null)
{
return false;
}
- for (PasswordStorageScheme s : defaultSchemes)
+ for (PasswordStorageScheme<?> s : defaultSchemes)
{
if (authPasswordSyntax)
{
@@ -867,7 +868,7 @@
* @return The set of account status notification handlers that should be
* used with this password policy.
*/
- public ConcurrentHashMap<DN,AccountStatusNotificationHandler>
+ public ConcurrentHashMap<DN,AccountStatusNotificationHandler<?>>
getAccountStatusNotificationHandlers()
{
return notificationHandlers;
@@ -969,7 +970,7 @@
* @return The password generator that will be used with this password
* policy, or <CODE>null</CODE> if there is none.
*/
- public PasswordGenerator getPasswordGenerator()
+ public PasswordGenerator<?> getPasswordGenerator()
{
return passwordGenerator;
}
@@ -1395,7 +1396,7 @@
}
else
{
- Iterator<PasswordStorageScheme> iterator =
+ Iterator<PasswordStorageScheme<?>> iterator =
defaultStorageSchemes.iterator();
buffer.append(iterator.next().getStorageSchemeName());
buffer.append(EOL);
--
Gitblit v1.10.0