From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.

---
 opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java b/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
index a9b2370..1c8b92f 100644
--- a/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opends/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -160,13 +160,13 @@
       }
     }
 
-    Set<DN> cfgBaseDNs = configuration.getUniqueAttributeBaseDN();
+    Set<DN> cfgBaseDNs = configuration.getBaseDN();
     if ((cfgBaseDNs == null) || cfgBaseDNs.isEmpty())
     {
       cfgBaseDNs = DirectoryServer.getPublicNamingContexts().keySet();
     }
 
-    for (AttributeType t : configuration.getUniqueAttributeType())
+    for (AttributeType t : configuration.getType())
     {
       for (DN baseDN : cfgBaseDNs)
       {
@@ -213,7 +213,7 @@
       return PreOperationPluginResult.SUCCESS;
     }
 
-    for (AttributeType t : config.getUniqueAttributeType())
+    for (AttributeType t : config.getType())
     {
       List<Attribute> attrList = entry.getAttribute(t);
       if (attrList != null)
@@ -282,7 +282,7 @@
     {
       Attribute a = m.getAttribute();
       AttributeType t = a.getAttributeType();
-      if (! config.getUniqueAttributeType().contains(t))
+      if (! config.getType().contains(t))
       {
         // This modification isn't for a unique attribute.
         continue;
@@ -412,7 +412,7 @@
     for (int i=0; i < newRDN.getNumValues(); i++)
     {
       AttributeType t = newRDN.getAttributeType(i);
-      if (! config.getUniqueAttributeType().contains(t))
+      if (! config.getType().contains(t))
       {
         // We aren't interested in this attribute type.
         continue;
@@ -472,7 +472,7 @@
       return;
     }
 
-    for (AttributeType t : config.getUniqueAttributeType())
+    for (AttributeType t : config.getType())
     {
       List<Attribute> attrList = entry.getAttribute(t);
       if (attrList != null)
@@ -543,7 +543,7 @@
     {
       Attribute a = m.getAttribute();
       AttributeType t = a.getAttributeType();
-      if (! config.getUniqueAttributeType().contains(t))
+      if (! config.getType().contains(t))
       {
         // This modification isn't for a unique attribute.
         continue;
@@ -681,7 +681,7 @@
     for (int i=0; i < newRDN.getNumValues(); i++)
     {
       AttributeType t = newRDN.getAttributeType(i);
-      if (! config.getUniqueAttributeType().contains(t))
+      if (! config.getType().contains(t))
       {
         // We aren't interested in this attribute type.
         continue;
@@ -738,7 +738,7 @@
    */
   private Set<DN> getBaseDNs(UniqueAttributePluginCfg config, DN entryDN)
   {
-    Set<DN> baseDNs = config.getUniqueAttributeBaseDN();
+    Set<DN> baseDNs = config.getBaseDN();
     if ((baseDNs == null) || baseDNs.isEmpty())
     {
       baseDNs = DirectoryServer.getPublicNamingContexts().keySet();
@@ -782,7 +782,7 @@
           throws DirectoryException
   {
     SearchFilter filter;
-    Set<AttributeType> attrTypes = config.getUniqueAttributeType();
+    Set<AttributeType> attrTypes = config.getType();
     if (attrTypes.size() == 1)
     {
       filter = SearchFilter.createEqualityFilter(attrTypes.iterator().next(),
@@ -881,13 +881,13 @@
       }
     }
 
-    Set<DN> cfgBaseDNs = configuration.getUniqueAttributeBaseDN();
+    Set<DN> cfgBaseDNs = configuration.getBaseDN();
     if ((cfgBaseDNs == null) || cfgBaseDNs.isEmpty())
     {
       cfgBaseDNs = DirectoryServer.getPublicNamingContexts().keySet();
     }
 
-    for (AttributeType t : configuration.getUniqueAttributeType())
+    for (AttributeType t : configuration.getType())
     {
       for (DN baseDN : cfgBaseDNs)
       {

--
Gitblit v1.10.0