From 1cbead747c938b98fb309d8b7d616b4fe318d53e Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 19 May 2011 17:20:24 +0000
Subject: [PATCH] Fix OPENDJ-161 - Rebranding Windows service integration to OpenDJ

---
 opends/src/server/org/opends/server/tools/ConfigureWindowsService.java |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/opends/src/server/org/opends/server/tools/ConfigureWindowsService.java b/opends/src/server/org/opends/server/tools/ConfigureWindowsService.java
index bb467db..424f248 100644
--- a/opends/src/server/org/opends/server/tools/ConfigureWindowsService.java
+++ b/opends/src/server/org/opends/server/tools/ConfigureWindowsService.java
@@ -23,6 +23,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2011 ForgeRock AS 
  */
 
 package org.opends.server.tools;
@@ -54,8 +55,8 @@
 /**
   * This class is used to configure the Windows service for this instance on
   * this machine.
-  * This tool allows to enable and disable OpenDS to run as a Windows service
-  * and allows to know if OpenDS is running as a Windows service or not.
+  * This tool allows to enable and disable OpenDJ to run as a Windows service
+  * and allows to know if OpenDJ is running as a Windows service or not.
   *
   * Some comments about Vista:
   * In Vista, when we launch the subcommands that require administrator
@@ -168,8 +169,8 @@
 
   /**
    * Configures the Windows service for this instance on this machine.
-   * This tool allows to enable and disable OpenDS to run as a Windows service
-   * and allows to know if OpenDS is running as a Windows service or not.
+   * This tool allows to enable and disable OpenDJ to run as a Windows service
+   * and allows to know if OpenDJ is running as a Windows service or not.
    *
    * @param  args  The command-line arguments provided to this program.
    */
@@ -182,8 +183,8 @@
 
   /**
    * Configures the Windows service for this instance on this machine.
-   * This tool allows to enable and disable OpenDS to run as a Windows service
-   * and allows to know if OpenDS is running as a Windows service or not.
+   * This tool allows to enable and disable OpenDJ to run as a Windows service
+   * and allows to know if OpenDJ is running as a Windows service or not.
    *
    * @param  args  The command-line arguments provided to this program.
    * @param outStream the stream used to write the standard output.
@@ -341,9 +342,9 @@
   }
 
   /**
-   * Returns the service name associated with OpenDS or null if no service name
+   * Returns the service name associated with OpenDJ or null if no service name
    * could be found.
-   * @return the service name associated with OpenDS or null if no service name
+   * @return the service name associated with OpenDJ or null if no service name
    * could be found.
    */
   static String getServiceName()
@@ -391,7 +392,7 @@
   }
 
   /**
-   * Enables OpenDS to run as a windows service.
+   * Enables OpenDJ to run as a windows service.
    * @param out the stream used to write the standard output.
    * @param err the stream used to write the error output.
    * @return <CODE>SERVICE_ENABLE_SUCCESS</CODE>,
@@ -414,7 +415,7 @@
   }
 
   /**
-   * Enables OpenDS to run as a windows service.
+   * Enables OpenDJ to run as a windows service.
    * @param out the stream used to write the standard output.
    * @param err the stream used to write the error output.
    * @param serviceName the name of the service as it will appear in the
@@ -532,7 +533,7 @@
   }
 
   /**
-   * Disables OpenDS to run as a windows service.
+   * Disables OpenDJ to run as a windows service.
    * @param out the stream used to write the standard output.
    * @param err the stream used to write the error output.
    * @return <CODE>SERVICE_DISABLE_SUCCESS</CODE>,
@@ -690,7 +691,7 @@
   }
 
   /**
-    * Checks if OpenDS is enabled as a windows service and if it is
+    * Checks if OpenDJ is enabled as a windows service and if it is
     * write the serviceName in the output stream (if it is not null).
     * @param out the stream used to write the standard output.
     * @param err the stream used to write the error output.
@@ -832,7 +833,7 @@
   private static String getBinaryFullPath()
   {
     return SetupUtils.getScriptPath(
-        getServerRoot()+"\\lib\\opends_service.exe");
+        getServerRoot()+"\\lib\\opendj_service.exe");
   }
 
   /**

--
Gitblit v1.10.0