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

neil_a_wilson
04.52.2007 bf5340aac9628566b2ef6b06da088fb3ba4a4ed2
Commit a few changes required to make "build all" work with weaving enabled.
In particular:

- Reduce the number of debug messages that will be generated by changing the
default level from "info" to "warning"

- Reduce the number of error log messages that will be generated by removing an
erroneous logError call from ReplicationDomain.log()

- Change the default timeout in the replication
UpdateOperationTest.lostHeartbeatFailover() method from 10 seconds to 30
seconds.
3 files modified
10 ■■■■■ changed files
opendj-sdk/opends/build.xml 4 ●●●● patch | view | raw | blame | history
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java 4 ●●●● patch | view | raw | blame | history
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java 2 ●●● patch | view | raw | blame | history
opendj-sdk/opends/build.xml
@@ -1205,7 +1205,7 @@
    <echo message="      definition is the same as the org.opends.server.debug.target.x" />
    <echo message="      property when starting OpenDS. " />
    <echo message="      Default debug target:"/>
    <echo message="      org.opends.server:level=verbose,category=caught|data|database_access|message|protocol" />
    <echo message="      org.opends.server:level=warning,category=caught|data|database_access|message|protocol" />
    <echo message=""/>
    <echo message="  -Dtest.packages=org.opends.server.api"/>
    <echo message="      for example runs only the tests in the api package"/>
@@ -1273,7 +1273,7 @@
    <!-- This sets org.opends.test.debug.target if and only if its's not
         alreadly set. -->
    <condition property="org.opends.test.debug.target"
               value="org.opends.server:level=info,category=caught|data|database_access|message|protocol">
               value="org.opends.server:level=warning,category=caught|data|database_access|message|protocol">
      <not>
        <isset property="org.opends.test.debug.target" />
      </not>
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
@@ -1919,10 +1919,6 @@
    if (debugEnabled())
    {
      debugInfo("DebugInfo" + message);
      int    msgID   = MSGID_UNKNOWN_TYPE;
      logError(ErrorLogCategory.SYNCHRONIZATION,
          ErrorLogSeverity.NOTICE,
          "ReplicationDomain/ " + message, msgID);
    }
  }
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
@@ -349,7 +349,7 @@
    Entry resultEntry;
    // Check that the entry has been created in the directory server.
    resultEntry = getEntry(personWithUUIDEntry.getDN(), 10000, true);
    resultEntry = getEntry(personWithUUIDEntry.getDN(), 30000, true);
    assertNotNull(resultEntry,
        "The ADD replication message was not replayed");