From bbadcb75d4629441e73ea04782ae2c5decf64fe3 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 17 Dec 2007 10:43:53 +0000
Subject: [PATCH] 2730: New - The setup command should perform some basic memory tuning Note: this issue is not fully covered by the proposed modifications but all that is missing in order to fix it is to figure out which are the default memory values that we want to propose in the setup.
---
opends/src/server/org/opends/server/util/SetupUtils.java | 144 ------------------------------------------------
1 files changed, 0 insertions(+), 144 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/SetupUtils.java b/opends/src/server/org/opends/server/util/SetupUtils.java
index 08716ff..5e19099 100644
--- a/opends/src/server/org/opends/server/util/SetupUtils.java
+++ b/opends/src/server/org/opends/server/util/SetupUtils.java
@@ -28,10 +28,8 @@
-import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -84,9 +82,6 @@
*/
public static final String LIBRARIES_PATH_RELATIVE = "lib";
- private static final String SET_JAVA_HOME_UNIX = "set-java-home";
- private static final String SET_JAVA_HOME_WINDOWS = "set-java-home.bat";
-
/**
* Creates a MakeLDIF template file using the provided information.
*
@@ -232,145 +227,6 @@
return OperatingSystem.forName(System.getProperty("os.name"));
}
-
-
- /**
- * Write a set-java-home file appropriate for the underlying platform that may
- * be used to set the OPENDS_JAVA_HOME environment variable in a form suitable
- * for the underlying operating system. If a OPENDS_JAVA_HOME environment
- * variable is currently set, then its value will be used. Otherwise, it will
- * be dynamically determined from the JVM properties.
- * <BR><BR>
- * Note that if the target file that would be written already exists, then
- * this method will exit without doing anything and leaving the existing file
- * intact.
- *
- *
- * @param serverRoot The path to the root of the Directory Server instance
- * for which the file will be written.
- *
- * @param overWrite when the set-java-home file exists whether to overwrite it
- * or not.
- * @return A handle to the {@code File} object that has been written.
- *
- * @throws IOException If a problem occurs while creating or writing to the
- * specified file.
- */
- public static File writeSetOpenDSJavaHome(String serverRoot,
- boolean overWrite) throws IOException
- {
- String javaHome = System.getenv(OPENDS_JAVA_HOME);
- if ((javaHome == null) || (javaHome.length() == 0))
- {
- javaHome = System.getProperty("java.home");
- }
-
-
- File libDirectory = new File(serverRoot, LIBRARIES_PATH_RELATIVE);
-
- File setJavaHomeFile;
- if (isWindows())
- {
- setJavaHomeFile = new File(libDirectory, SET_JAVA_HOME_WINDOWS);
- if (setJavaHomeFile.exists())
- {
- if (!overWrite)
- {
- return setJavaHomeFile;
- }
- else
- {
- File f1 = new File(javaHome);
- File f2 = new File(getOpenDSJavaHome(serverRoot));
- if (f1.equals(f2))
- {
- return setJavaHomeFile;
- }
- }
- }
- BufferedWriter writer =
- new BufferedWriter(new FileWriter(setJavaHomeFile));
- writer.write("set "+OPENDS_JAVA_HOME+"=" + javaHome);
- writer.newLine();
- writer.close();
- }
- else
- {
- setJavaHomeFile = new File(libDirectory, SET_JAVA_HOME_UNIX);
- if (setJavaHomeFile.exists())
- {
- if (!overWrite)
- {
- return setJavaHomeFile;
- }
- else
- {
- File f1 = new File(javaHome);
- File f2 = new File(getOpenDSJavaHome(serverRoot));
- if (f1.equals(f2))
- {
- return setJavaHomeFile;
- }
- }
- }
- BufferedWriter writer =
- new BufferedWriter(new FileWriter(setJavaHomeFile));
- writer.write("#!/bin/sh");
- writer.newLine();
- writer.newLine();
- writer.write(OPENDS_JAVA_HOME+"=" + javaHome);
- writer.newLine();
- writer.write("export "+OPENDS_JAVA_HOME);
- writer.newLine();
- writer.close();
- }
-
- return setJavaHomeFile;
- }
-
- /**
- * Returns the java home value as it is specified in the set-java-home file.
- * It returns <CODE>null</CODE> if the contents of the file are not valid, the
- * file could not be read or if the file does not exist.
- * @param serverRoot The path to the root of the Directory Server instance
- * in which the set-java-home file is located.
- * @return the java home value as it is specified in the set-java-home file.
- * @throws IOException If a problem occurs while reading the file.
- */
- public static String getOpenDSJavaHome(String serverRoot) throws IOException
- {
- String javaHome = null;
-
- File libDirectory = new File(serverRoot, LIBRARIES_PATH_RELATIVE);
-
- File setJavaHomeFile;
- if (isWindows())
- {
- setJavaHomeFile = new File(libDirectory, SET_JAVA_HOME_WINDOWS);
- }
- else
- {
- setJavaHomeFile = new File(libDirectory, SET_JAVA_HOME_UNIX);
- }
- if (setJavaHomeFile.exists())
- {
- BufferedReader reader =
- new BufferedReader(new FileReader(setJavaHomeFile));
- String line = reader.readLine();
- String tag = OPENDS_JAVA_HOME+"=";
- while ((line != null) && (javaHome == null))
- {
- int index = line.indexOf(tag);
- if (index != -1)
- {
- javaHome = line.substring(index + tag.length());
- }
- line = reader.readLine();
- }
- }
- return javaHome;
- }
-
/**
* Returns {@code true} if the provided port is free and we can use it,
* {@code false} otherwise.
--
Gitblit v1.10.0