From 8bbba9d3256c37205f9bd5ab131554c0fa453145 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Tue, 08 Feb 2011 12:03:28 +0000
Subject: [PATCH] Add support for SVR4 packages for OpenDJ. Package name is opendj. It's a single package and has integration with SMF. Default installation is /usr/opendj. Once packages are installed, root must run configure to setup the Instance location (/var/opendj) and owner. And the owner must run setup.

---
 opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
index 28c9d45..d02bc56 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -23,6 +23,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2011 ForgeRock AS
  */
 
 package org.opends.quicksetup.installer;
@@ -1129,6 +1130,8 @@
   /**
    * Writes the set-java-home file that is used by the scripts to set the
    * java home and the java arguments.
+   * Since the set-java-home file is created and may be changed,
+   * it's created under the instancePath.
    * @param installPath the install path of the server.
    * @param javaHome the java home to be used.
    * @param arguments a Map containing as key the name of the script and as
@@ -1169,7 +1172,8 @@
     writer.close();
 
     String destinationFile;
-    String libDir = Utils.getPath(installPath,
+    String libDir = Utils.getPath(Utils
+        .getInstancePathFromInstallPath(installPath),
         Installation.LIBRARIES_PATH_RELATIVE);
     if (Utils.isWindows())
     {

--
Gitblit v1.10.0