From 5b937a38b37b3d207f5ffc713b91a43f7a93e73e Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Thu, 15 Mar 2007 14:21:09 +0000
Subject: [PATCH] 1. fixed uninstaller bug - detecting the install type was broken 2. added start-nodetach target to allow easier debug of potential STAF issues at startup (like missing LD_LIBRARY_PATH, CLASSPATH, PATH, CODEPAGE, etc...)
---
opendj-sdk/opends/tests/functional-tests/staf-installer.xml | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer.xml b/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
index 7b48781..61cd3c9 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
@@ -538,7 +538,7 @@
</target>
<target name="uninstall-do-tar"
description="Uninstall the staf"
- if="staf.install.is.tar">
+ unless="staf.install.is.jar">
<echo message="Uninstalling staf, please wait..." />
<exec executable="${staf.install.dir}/STAFUninst"/>
<sleep seconds="5" />
@@ -549,10 +549,6 @@
<condition property="staf.install.is.jar">
<available file="${staf.install.dir}/_uninst/uninstall.jar"/>
</condition>
- <condition property="staf.install.is.tar">
- <available file="${staf.install.dir}/STAFUninst"/>
- <!-- TODO - check on windows if there is a .exe extension -->
- </condition>
<antcall target="uninstall-do-jar"/>
<antcall target="uninstall-do-tar"/>
</target>
@@ -577,12 +573,15 @@
if="staf.installed"
unless="staf.running" >
<echo message="Starting staf daemon ... on ${os.myname}" />
+ <condition property="staf.spawn">
+ <not>
+ <isset property="staf.spawn"/>
+ </not>
+ </condition>
<exec
dir="${staf.bin.dir}"
executable="${staf.daemon}"
- ><!--
- spawn="true">
- -->
+ spawn="${staf.spawn}">
<arg value="${staf.config}"/>
<env key="${path.var}" path="${java.home}${file.separator}bin${path.separator}${staf.install.dir}${file.separator}bin${path.separator}${path.current}"/>
<env key="LD_LIBRARY_PATH" path="${staf.install.dir}/lib"/>
@@ -598,7 +597,11 @@
<target name="start" depends="status-do">
<antcall target="start-do"/>
<antcall target="start-dont"/>
- </target>
+ </target>
+ <target name="start-nodetach">
+ <property name="staf.spawn" value="false"/>
+ <antcall target="start"/>
+ </target>
<!-- Start section - bottom -->
<!-- Stop section - top -->
--
Gitblit v1.10.0