Merge ASN1 branch to trunk

matthew_swift

05.42.2009 22094368c2865dcfb6daf8366425212b721a4657

 opends/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java

@@ -60,19 +60,7 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.schema.AuthPasswordSyntax;
import org.opends.server.schema.UserPasswordSyntax;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeBuilder;
import org.opends.server.types.AttributeType;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ByteString;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DebugLogLevel;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.ResultCode;

import org.opends.server.types.*;


/**
@@ -400,7 +388,7 @@
                    for (PasswordStorageScheme<?> s : schemes)
                    {
                      ByteString nv = s.encodeAuthPassword(value);
                      builder.add(new AttributeValue(policy
                      builder.add(AttributeValues.create(policy
                          .getPasswordAttribute(), nv));
                    }
                  }
@@ -435,7 +423,7 @@
                    for (PasswordStorageScheme<?> s : schemes)
                    {
                      ByteString nv = s.encodePasswordWithScheme(value);
                      builder.add(new AttributeValue(policy
                      builder.add(AttributeValues.create(policy
                          .getPasswordAttribute(), nv));
                    }
                  }
@@ -501,7 +489,7 @@
              for (PasswordStorageScheme<?> s : defaultAuthPasswordSchemes)
              {
                ByteString nv = s.encodeAuthPassword(value);
                builder.add(new AttributeValue(t, nv));
                builder.add(AttributeValues.create(t, nv));
              }
            }
            catch (Exception e)
@@ -559,7 +547,7 @@
              for (PasswordStorageScheme<?> s : defaultUserPasswordSchemes)
              {
                ByteString nv = s.encodePasswordWithScheme(value);
                builder.add(new AttributeValue(t, nv));
                builder.add(AttributeValues.create(t, nv));
              }
            }
            catch (Exception e)