From d42b15e420478dc45785fff6e00b863cc1f8a0f9 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Thu, 18 Sep 2008 10:14:53 +0000
Subject: [PATCH] These changes are separating the current delivery into  an "Install Layout" (the binaries) and an "Instance Layout" (the user data).

---
 opends/src/server/org/opends/server/tools/CreateRCScript.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opends/src/server/org/opends/server/tools/CreateRCScript.java b/opends/src/server/org/opends/server/tools/CreateRCScript.java
index 7221a70..5b0a11b 100644
--- a/opends/src/server/org/opends/server/tools/CreateRCScript.java
+++ b/opends/src/server/org/opends/server/tools/CreateRCScript.java
@@ -129,7 +129,7 @@
     if (serverRoot == null)
     {
       err.println(ERR_CREATERC_UNABLE_TO_DETERMINE_SERVER_ROOT.get(
-                       PROPERTY_SERVER_ROOT, ENV_VAR_INSTANCE_ROOT).toString());
+                       PROPERTY_SERVER_ROOT, ENV_VAR_INSTALL_ROOT).toString());
       return 1;
     }
 
@@ -246,8 +246,8 @@
       w.println();
 
       w.println("# Set the path to the OpenDS instance to manage");
-      w.println("INSTANCE_ROOT=\"" + serverRoot.getAbsolutePath() + "\"");
-      w.println("export INSTANCE_ROOT");
+      w.println("INSTALL_ROOT=\"" + serverRoot.getAbsolutePath() + "\"");
+      w.println("export INSTALL_ROOT");
       w.println();
 
       if (javaHomeDir != null)
@@ -269,15 +269,15 @@
       w.println("# Determine what action should be performed on the server");
       w.println("case \"${1}\" in");
       w.println("start)");
-      w.println("  " + suString + "\"${INSTANCE_ROOT}/bin/start-ds\" --quiet");
+      w.println("  " + suString + "\"${INSTALL_ROOT}/bin/start-ds\" --quiet");
       w.println("  exit ${?}");
       w.println("  ;;");
       w.println("stop)");
-      w.println("  " + suString + "\"${INSTANCE_ROOT}/bin/stop-ds\" --quiet");
+      w.println("  " + suString + "\"${INSTALL_ROOT}/bin/stop-ds\" --quiet");
       w.println("  exit ${?}");
       w.println("  ;;");
       w.println("restart)");
-      w.println("  " + suString + "\"${INSTANCE_ROOT}/bin/stop-ds\" " +
+      w.println("  " + suString + "\"${INSTALL_ROOT}/bin/stop-ds\" " +
                 "--restart --quiet");
       w.println("  exit ${?}");
       w.println("  ;;");

--
Gitblit v1.10.0