From 42a3807df4f86647d1f42e2cef3f88d92f695a95 Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Thu, 22 Mar 2007 12:12:35 +0000
Subject: [PATCH] Issues 1387 Lower severity for ACI log message. Issue 1388 Move AciMessages to messages package.

---
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DayOfWeek.java             |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java            |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpMaskNetworkCriteria.java |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciBody.java               |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java                |    2 
 opendj-sdk/opends/src/server/org/opends/server/messages/MessageHandler.java                        |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilterList.java    |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java               |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Permission.java            |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java     |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java              |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DNS.java                   |    8 ++--
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java            |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java               |    4 +-
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java    |    6 +-
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java                   |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TimeOfDay.java             |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java            |   18 ++++----
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/BindRule.java              |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java       |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetFilter.java          |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java            |    4 +-
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Target.java                |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpCriteria.java            |    2 
 opendj-sdk/opends/src/server/org/opends/server/messages/AciMessages.java                           |    2 
 opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/RoleDN.java                |    2 
 27 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java
index e29445b..8a27eb5 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Aci.java
@@ -30,7 +30,7 @@
 import org.opends.server.types.ByteString;
 import org.opends.server.types.DN;
 import static org.opends.server.messages.MessageHandler.*;
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import java.util.regex.Pattern;
 
 /**
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciBody.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciBody.java
index 7052314..db2b2b1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciBody.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciBody.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import java.util.ArrayList;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
index b5729db..f46529d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -28,7 +28,7 @@
 package org.opends.server.authorization.dseecompat;
 
 import org.opends.server.api.AccessControlHandler;
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import org.opends.server.core.*;
 import static org.opends.server.loggers.Error.logError;
@@ -139,13 +139,13 @@
                 msgID  = MSGID_ACI_ADD_LIST_GLOBAL_ACIS;
                 String message = getMessage(msgID, Integer.toString(aciCount));
                 logError(ErrorLogCategory.ACCESS_CONTROL,
-                        ErrorLogSeverity.NOTICE,
+                        ErrorLogSeverity.INFORMATIONAL,
                         message, msgID);
             }  else {
                 msgID  = MSGID_ACI_ADD_LIST_NO_GLOBAL_ACIS;
                 String message = getMessage(msgID);
                 logError(ErrorLogCategory.ACCESS_CONTROL,
-                        ErrorLogSeverity.NOTICE, message, msgID);
+                        ErrorLogSeverity.INFORMATIONAL, message, msgID);
 
             }
         }  catch (ConfigException e) {
@@ -182,14 +182,14 @@
                 int    msgID  = MSGID_ACI_ADD_LIST_NO_ACIS;
                 String message = getMessage(msgID, String.valueOf(configDN));
                 logError(ErrorLogCategory.ACCESS_CONTROL,
-                        ErrorLogSeverity.NOTICE, message, msgID);
+                        ErrorLogSeverity.INFORMATIONAL, message, msgID);
             } else {
                 int validAcis = aciList.addAci(op.getSearchEntries());
                 int    msgID  = MSGID_ACI_ADD_LIST_ACIS;
                 String message = getMessage(msgID, Integer.toString(validAcis),
                         String.valueOf(configDN));
                 logError(ErrorLogCategory.ACCESS_CONTROL,
-                        ErrorLogSeverity.NOTICE,
+                        ErrorLogSeverity.INFORMATIONAL,
                         message, msgID);
             }
         } catch (DirectoryException e) {
@@ -231,7 +231,7 @@
                                 String.valueOf(container.getResourceDN()),
                                 String.valueOf(container.getClientDN()));
                 logError(ErrorLogCategory.ACCESS_CONTROL,
-                         ErrorLogSeverity.SEVERE_WARNING,
+                         ErrorLogSeverity.INFORMATIONAL,
                          message, msgID);
                 return false;
               }
@@ -319,7 +319,7 @@
                                    String.valueOf(dn),
                                    ex.getMessage());
                            logError(ErrorLogCategory.ACCESS_CONTROL,
-                                   ErrorLogSeverity.SEVERE_WARNING,
+                                   ErrorLogSeverity.INFORMATIONAL,
                                    message, msgID);
                            return false;
                        }
@@ -622,7 +622,7 @@
                                       String.valueOf(entry.getDN()),
                                       String.valueOf(clientDN));
           logError(ErrorLogCategory.ACCESS_CONTROL,
-                   ErrorLogSeverity.SEVERE_WARNING,
+                   ErrorLogSeverity.INFORMATIONAL,
                    message, msgID);
           return false;
         }
@@ -641,7 +641,7 @@
                                           String.valueOf(entry.getDN()),
                                           ex.getMessage());
               logError(ErrorLogCategory.ACCESS_CONTROL,
-                       ErrorLogSeverity.SEVERE_WARNING,
+                       ErrorLogSeverity.INFORMATIONAL,
                        message, msgID);
               return false;
             }
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java
index bedad92..399ca85e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciList.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.loggers.Error.logError;
 import static org.opends.server.messages.MessageHandler.getMessage;
 
@@ -226,7 +226,7 @@
           String message = getMessage(msgID,
                                       ex.getMessage());
           logError(ErrorLogCategory.ACCESS_CONTROL,
-                   ErrorLogSeverity.SEVERE_WARNING,
+                   ErrorLogSeverity.INFORMATIONAL,
                    message, msgID);
         }
       }
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
index 11b0a5e..5c3e268 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
@@ -40,7 +40,7 @@
 import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
 import static org.opends.server.loggers.Error.logError;
 import org.opends.server.types.*;
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -207,7 +207,7 @@
           int    msgID  = MSGID_ACI_ADD_LIST_NO_ACIS;
           String message = getMessage(msgID, String.valueOf(baseDN));
           logError(ErrorLogCategory.ACCESS_CONTROL,
-                   ErrorLogSeverity.NOTICE, message, msgID);
+                   ErrorLogSeverity.INFORMATIONAL, message, msgID);
         } else {
           int validAcis = aciList.addAci(
                internalSearch.getSearchEntries());
@@ -215,7 +215,7 @@
           String message = getMessage(msgID, Integer.toString(validAcis),
                                       String.valueOf(baseDN));
           logError(ErrorLogCategory.ACCESS_CONTROL,
-                   ErrorLogSeverity.NOTICE,
+                   ErrorLogSeverity.INFORMATIONAL,
                    message, msgID);
         }
       }
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
index e9e5c27..0fd4984 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciTargets.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import org.opends.server.types.AttributeType;
@@ -541,7 +541,7 @@
                 (targets.getTarget().isPattern()))  {
             ret=targets.getTarget().matchesPattern(entryDN);
             EnumTargetOperator op=targets.getTarget().getOperator();
-            if(ret && op == EnumTargetOperator.NOT_EQUALITY)
+            if(op == EnumTargetOperator.NOT_EQUALITY)
                 ret=!ret;
         }
         return ret;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java
index b7d6984..de14c19 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import org.opends.server.core.DirectoryServer;
 import static org.opends.server.loggers.Error.logError;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/BindRule.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/BindRule.java
index 011e3e1..e021286 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/BindRule.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/BindRule.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import java.util.regex.Pattern;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DNS.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DNS.java
index a2856ff..fa3e478 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DNS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DNS.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import static org.opends.server.loggers.Error.*;
 import static org.opends.server.loggers.debug.DebugLogger.*;
@@ -140,7 +140,7 @@
                       String message = getMessage(msgID, expr, hn,
                                                   canonicalName);
                       logError(ErrorLogCategory.ACCESS_CONTROL,
-                               ErrorLogSeverity.SEVERE_WARNING, message, msgID);
+                               ErrorLogSeverity.INFORMATIONAL, message, msgID);
                     }
                     else
                     {
@@ -150,7 +150,7 @@
                                                   hn, addr.getHostAddress(),
                                                   addr.getCanonicalHostName());
                       logError(ErrorLogCategory.ACCESS_CONTROL,
-                               ErrorLogSeverity.SEVERE_WARNING, message, msgID);
+                               ErrorLogSeverity.INFORMATIONAL, message, msgID);
                     }
                   }
                 }
@@ -166,7 +166,7 @@
                 String message = getMessage(msgID, hn, expr,
                                             stackTraceToSingleLineString(e));
                 logError(ErrorLogCategory.ACCESS_CONTROL,
-                         ErrorLogSeverity.SEVERE_WARNING, message, msgID);
+                         ErrorLogSeverity.INFORMATIONAL, message, msgID);
               }
             }
 
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DayOfWeek.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DayOfWeek.java
index 1e5cdf6..7e3d2aa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DayOfWeek.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/DayOfWeek.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java
index b188b17..1107f83 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/GroupDN.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import org.opends.server.types.*;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java
index a2b2c73..a0c4348 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpBitsNetworkCriteria.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import java.net.Inet6Address;
 import java.net.InetAddress;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpCriteria.java
index 19199b0..88c5ea3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpCriteria.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpCriteria.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import java.net.Inet6Address;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpMaskNetworkCriteria.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpMaskNetworkCriteria.java
index e50bdd4..4c4c5d0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpMaskNetworkCriteria.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/IpMaskNetworkCriteria.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
index eb151ea..cb8dae0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/ParentInheritance.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import java.util.StringTokenizer;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Permission.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Permission.java
index f258fca..6cf9313 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Permission.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Permission.java
@@ -28,7 +28,7 @@
 package org.opends.server.authorization.dseecompat;
 
 import static org.opends.server.messages.MessageHandler.getMessage;
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import java.util.regex.Pattern;
 
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/RoleDN.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/RoleDN.java
index 26a53f9..41d08ee 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/RoleDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/RoleDN.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import org.opends.server.types.*;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilterList.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
index 80bacba..6a7d5e4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
@@ -31,7 +31,7 @@
 import org.opends.server.types.SearchFilter;
 import org.opends.server.types.DirectoryException;
 import org.opends.server.core.DirectoryServer;
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java
index 6265e65..6f4aab6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargAttrFilters.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import org.opends.server.types.*;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Target.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Target.java
index a7f0300..6efe719 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Target.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/Target.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import java.util.ArrayList;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java
index bd17665..57bfe49 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.authorization.dseecompat.Aci.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import java.util.HashSet;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetFilter.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetFilter.java
index 80734df..bfba484 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetFilter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TargetFilter.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import org.opends.server.types.DirectoryException;
 import org.opends.server.types.Entry;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TimeOfDay.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TimeOfDay.java
index 7863fc9..cc91b57 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TimeOfDay.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/TimeOfDay.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import org.opends.server.util.TimeThread;
 import java.util.regex.Pattern;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
index f1462cf..ea6b303 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserAttr.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java
index 0f88075..c39a1d6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/UserDN.java
@@ -27,7 +27,7 @@
 
 package org.opends.server.authorization.dseecompat;
 
-import static org.opends.server.authorization.dseecompat.AciMessages.*;
+import static org.opends.server.messages.AciMessages.*;
 import static org.opends.server.messages.MessageHandler.getMessage;
 
 import java.util.*;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java b/opendj-sdk/opends/src/server/org/opends/server/messages/AciMessages.java
similarity index 99%
rename from opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java
rename to opendj-sdk/opends/src/server/org/opends/server/messages/AciMessages.java
index b026612..c42e57a 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciMessages.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/AciMessages.java
@@ -25,7 +25,7 @@
  *      Portions Copyright 2007 Sun Microsystems, Inc.
  */
 
-package org.opends.server.authorization.dseecompat;
+package org.opends.server.messages;
 
 import static org.opends.server.messages.MessageHandler.*;
 import static org.opends.server.config.ConfigConstants.ATTR_AUTHZ_GLOBAL_ACI;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/messages/MessageHandler.java b/opendj-sdk/opends/src/server/org/opends/server/messages/MessageHandler.java
index beae01c..df6bede 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/messages/MessageHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/messages/MessageHandler.java
@@ -28,7 +28,7 @@
 
 
 
-import org.opends.server.authorization.dseecompat.AciMessages;
+import org.opends.server.messages.AciMessages;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.IllegalFormatException;

--
Gitblit v1.10.0