From bf5340aac9628566b2ef6b06da088fb3ba4a4ed2 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 04 May 2007 10:52:14 +0000
Subject: [PATCH] Commit a few changes required to make "build all" work with weaving enabled. In particular:
---
opendj-sdk/opends/build.xml | 4 ++--
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java | 4 ++--
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java | 4 ----
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index 032a421..eac15bc 100644
--- a/opendj-sdk/opends/build.xml
+++ b/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>
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
index 96f38f9..e0a9cb7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
+++ b/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);
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
index 5dda8dd..7604ffc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
@@ -139,7 +139,7 @@
ServerSocket socket = TestCaseUtils.bindFreePort();
replServerPort = socket.getLocalPort();
socket.close();
-
+
// replication server
String replServerLdif =
"dn: cn=Replication Server, " + synchroPluginStringDN + "\n"
@@ -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");
--
Gitblit v1.10.0