From 7c30dbb5403772b323df3ad907d9ed15d23b5aee Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 29 Apr 2010 20:35:40 +0000
Subject: [PATCH] Last batch of changes for this week. This adds support for the IETF based Password Policy for LDAP as SubEntry. Also resolves the following issues : - 4544 : initializeBackend() should not set JE env config params directly. - 4478 : ECL in draft compat mode / search lastchangenumber can be very long - 4538 : Virtual attributes not retrieved when entry cache configured - 4547 : Search Filter Matching differ for cn=Directory Manager and plain user. - 4514 : Logs shows unexpected message with replication monitoring data missing (Partial fix) - 4534 : Replication using security does not work after server restart - 4516 : SEVERE_ERROR: servers (...) have the same ServerId In addition, they also improve reliability and performance in various areas including CollectiveAttributes, Virtual Attributes and Subentries management, Schema loading, Replication...
---
opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java b/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java
index a4aa6ff..de6c8f8 100644
--- a/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java
+++ b/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2009 Sun Microsystems, Inc.
+ * Copyright 2009-2010 Sun Microsystems, Inc.
*/
import java.io.File;
@@ -57,6 +57,7 @@
private int threadId;
private String fileName;
private boolean output;
+ private boolean ldifFormat;
private boolean logFile;
private String operation;
/**
@@ -77,6 +78,7 @@
this.threadId = id;
this.output = false;
this.logFile = false;
+ this.ldifFormat = false;
//by default all operation
this.operation = ALL;
@@ -121,6 +123,10 @@
this.operation = operation;
}
+ public void setLdifFormat(boolean ldifFormat) {
+ this.ldifFormat = ldifFormat;
+ }
+
/**
*Connect to server.
*/
@@ -129,7 +135,8 @@
connection = new LDAPConnection();
connection.connect(3, hostname, portnumber, "", "");
connection.authenticate(3, bindDN, bindPW);
- write("[Thread id: " + threadId + "] \n" + getDate() + connection);
+ if(!ldifFormat)
+ write("[Thread id: " + threadId + "] \n" + getDate() + connection);
} catch (LDAPException ex) {
System.out.println("[Thread id: " + threadId + "]Connection :" + ex.getMessage());
System.exit(0);
@@ -263,20 +270,25 @@
Enumeration attrs = attrSet.getAttributes();
if (entry.getDN().contains("break")) {
String message = "\n[Thread id: " + threadId + "] " + getDate() + " [BREAK]";
- write(message);
+ if(!ldifFormat)
+ write(message);
System.exit(0);
} else if (entry.getDN().contains("stop")) {
try {
connection.disconnect();
String message = "\n[Thread id: " + threadId + "] " + getDate() + "[STOP]";
- write(message);
+ if(!ldifFormat)
+ write(message);
System.exit(0);
} catch (LDAPException ex) {
System.out.println("[Thread id: " + threadId + "]run :" + ex.getLDAPErrorMessage());
}
}
String message = "[Thread id: " + threadId + "] " + getDate() + " [" + controlName(arr[4]) + "]";
- write("\n" + message);
+ if(!ldifFormat)
+ write("\n" + message);
+ else
+ write("\n");
String dn = "dn: " + entry.getDN();
write(dn);
while (attrs.hasMoreElements()) {
--
Gitblit v1.10.0