mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

dugan
25.02.2008 1d033114fc62ac1687d146e64ebe472f31442b01
Remove confusing startup information messages.
2 files modified
94 ■■■■■ changed files
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java 88 ●●●● patch | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java 6 ●●●● patch | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciHandler.java
@@ -233,27 +233,23 @@
     * the global ACIs from the configuration entry.
     */
    private void processGlobalAcis(
        DseeCompatAccessControlHandlerCfg configuration)
    throws InitializationException {
        SortedSet<Aci> globalAcis = configuration.getGlobalACI();
        try {
            if (globalAcis != null)   {
                aciList.addAci(DN.nullDN(),globalAcis);
                Message message = INFO_ACI_ADD_LIST_GLOBAL_ACIS.get(
                    Integer.toString(globalAcis.size()));
                logError(message);
            }  else {
                Message message = INFO_ACI_ADD_LIST_NO_GLOBAL_ACIS.get();
                logError(message);
            }
        }  catch (Exception e) {
            if (debugEnabled())
                TRACER.debugCaught(DebugLogLevel.ERROR, e);
            Message message = INFO_ACI_HANDLER_FAIL_PROCESS_GLOBAL_ACI.
                get(String.valueOf(configuration.dn()));
            throw new InitializationException(message, e);
            DseeCompatAccessControlHandlerCfg configuration)
            throws InitializationException {
      SortedSet<Aci> globalAcis = configuration.getGlobalACI();
      try {
        if (globalAcis != null)   {
          aciList.addAci(DN.nullDN(),globalAcis);
          Message message = INFO_ACI_ADD_LIST_GLOBAL_ACIS.get(
                  Integer.toString(globalAcis.size()));
          logError(message);
        }
      }  catch (Exception e) {
        if (debugEnabled())
          TRACER.debugCaught(DebugLogLevel.ERROR, e);
        Message message = INFO_ACI_HANDLER_FAIL_PROCESS_GLOBAL_ACI.
                get(String.valueOf(configuration.dn()));
        throw new InitializationException(message, e);
      }
    }
    /**
@@ -266,35 +262,31 @@
     * the ACIs in the naming context.
     */
    private void processConfigAcis() throws InitializationException {
        try
        {
            DN configDN=DN.decode("cn=config");
            LinkedHashSet<String> attrs = new LinkedHashSet<String>(1);
            attrs.add("aci");
            LinkedList<Message>failedACIMsgs=new LinkedList<Message>();
            InternalClientConnection conn =
                    InternalClientConnection.getRootConnection();
            InternalSearchOperation op = conn.processSearch(configDN,
                    SearchScope.WHOLE_SUBTREE,
                    DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                    SearchFilter.createFilterFromString("aci=*"), attrs);
            if(op.getSearchEntries().isEmpty()) {
                Message message =
                    INFO_ACI_ADD_LIST_NO_ACIS.get(String.valueOf(configDN));
                logError(message);
            } else {
                int validAcis =
                           aciList.addAci(op.getSearchEntries(), failedACIMsgs);
                if(!failedACIMsgs.isEmpty())
                    aciListenerMgr.logMsgsSetLockDownMode(failedACIMsgs);
                Message message = INFO_ACI_ADD_LIST_ACIS.get(
                    Integer.toString(validAcis), String.valueOf(configDN));
                logError(message);
            }
        } catch (DirectoryException e) {
            Message message = INFO_ACI_HANDLER_FAIL_PROCESS_ACI.get();
            throw new InitializationException(message, e);
      try
      {
        DN configDN=DN.decode("cn=config");
        LinkedHashSet<String> attrs = new LinkedHashSet<String>(1);
        attrs.add("aci");
        LinkedList<Message>failedACIMsgs=new LinkedList<Message>();
        InternalClientConnection conn =
                InternalClientConnection.getRootConnection();
        InternalSearchOperation op = conn.processSearch(configDN,
                SearchScope.WHOLE_SUBTREE,
                DereferencePolicy.NEVER_DEREF_ALIASES, 0, 0, false,
                SearchFilter.createFilterFromString("aci=*"), attrs);
        if(!op.getSearchEntries().isEmpty()) {
          int validAcis =
                  aciList.addAci(op.getSearchEntries(), failedACIMsgs);
          if(!failedACIMsgs.isEmpty())
            aciListenerMgr.logMsgsSetLockDownMode(failedACIMsgs);
          Message message = INFO_ACI_ADD_LIST_ACIS.get(
                  Integer.toString(validAcis), String.valueOf(configDN));
          logError(message);
        }
      } catch (DirectoryException e) {
        Message message = INFO_ACI_HANDLER_FAIL_PROCESS_ACI.get();
        throw new InitializationException(message, e);
      }
    }
opendj-sdk/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
@@ -271,11 +271,7 @@
            }
            continue;
        }
        if(internalSearch.getSearchEntries().isEmpty()) {
          Message message =
              INFO_ACI_ADD_LIST_NO_ACIS.get(String.valueOf(baseDN));
          logError(message);
        } else {
        if(!internalSearch.getSearchEntries().isEmpty()) {
          int validAcis = aciList.addAci(
               internalSearch.getSearchEntries(), failedACIMsgs);
          if(!failedACIMsgs.isEmpty())