Issues 1387 Lower severity for ACI log message. Issue 1388 Move AciMessages...

dugan

22.12.2007 42a3807df4f86647d1f42e2cef3f88d92f695a95

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/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;

/**

 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;

 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;
            }

 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);
        }
      }

 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);
        }
      }

 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;

 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;

 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;

 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);
              }
            }


 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;

 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.*;

 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;

 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;

 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;

 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;

 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;


 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.*;

 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;


 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.*;

 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;

 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;

 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;

 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;

 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;

 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.*;

 opendj-sdk/opends/src/server/org/opends/server/messages/AciMessages.java

File was renamed from opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/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;

 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;