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/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
index 4c73132..8801518 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
@@ -868,13 +868,13 @@
if (!defaultServer)
{
- linesToAdd.add(UserData.SERVER_SCRIPT_NAME+": "+
- serverArguments.getStringArguments());
+ linesToAdd.add(getJavaArgPropertyForScript(UserData.SERVER_SCRIPT_NAME)
+ +": "+serverArguments.getStringArguments());
}
if (!defaultImport)
{
- linesToAdd.add(UserData.IMPORT_SCRIPT_NAME+": "+
- importArguments.getStringArguments());
+ linesToAdd.add(getJavaArgPropertyForScript(UserData.IMPORT_SCRIPT_NAME)+
+ ": "+importArguments.getStringArguments());
}
if (linesToAdd.size() == 1)
@@ -896,11 +896,29 @@
return sb.toString();
}
+ /**
+ * Returns the java argument property for a given script.
+ * @param scriptName the script name.
+ * @return the java argument property for a given script.
+ */
+ private static String getJavaArgPropertyForScript(String scriptName)
+ {
+ return scriptName+".java-args";
+ }
+
private String getJavaPropertiesFilePath(UserData userData)
{
- String configDir = Utils.getPath(Utils
- .getInstancePathFromInstallPath(userData.getServerLocation()),
- Installation.CONFIG_PATH_RELATIVE);
+ String path;
+ if (isWebStart())
+ {
+ path = userData.getServerLocation();
+ }
+ else
+ {
+ path = Utils.getInstallPathFromClasspath();
+ path = Utils.getInstancePathFromInstallPath(path);
+ }
+ String configDir = Utils.getPath(path, Installation.CONFIG_PATH_RELATIVE);
String propertiesFile = Utils.getPath(
configDir, Installation.DEFAULT_JAVA_PROPERTIES_FILE);
return propertiesFile;
--
Gitblit v1.10.0