From 94cfaf90167c67c6f10c70516b3ab3ee8da53bd3 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Fri, 02 Mar 2007 01:41:23 +0000
Subject: [PATCH] fixed issues in the installer for solaris sparc. (LD_LIBRARY_PATH. fixed eol-style issue on installer files. added javadoc target to generate functional tests documentation. added email capability in the run-daily target. config.py.stubs is back to referencing python variables.
---
opendj-sdk/opends/tests/functional-tests/staf-installer.xml | 67 ++++++-
opendj-sdk/opends/tests/functional-tests/staf-installer/SunOS-x86.properties | 2
opendj-sdk/opends/tests/functional-tests/staf-installer/windows-x86-32.properties | 4
opendj-sdk/opends/tests/functional-tests/staf-installer/replay.sh | 20 +-
opendj-sdk/opends/tests/functional-tests/staf-installer/replay.bat | 22 +-
opendj-sdk/opends/tests/functional-tests/build.sh | 101 +++++-----
opendj-sdk/opends/tests/functional-tests/build.bat | 103 +++++-----
opendj-sdk/opends/tests/functional-tests/staf-installer/Linux.properties | 2
opendj-sdk/opends/tests/functional-tests/staf-installer/windows-x86-64.properties | 2
opendj-sdk/opends/tests/functional-tests/staf-installer/SunOS-sparc.properties | 2
opendj-sdk/opends/tests/functional-tests/staf-installer/functional-tests.cfg | 44 ++--
opendj-sdk/opends/tests/functional-tests/staf-installer/windows.properties | 4
opendj-sdk/opends/tests/functional-tests/staf-installer/staf-installer.properties | 111 ++++++------
opendj-sdk/opends/tests/functional-tests/staf-installer/config.py.stubs | 22 +-
14 files changed, 276 insertions(+), 230 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/build.bat b/opendj-sdk/opends/tests/functional-tests/build.bat
index c320cc5..9b5cf77 100644
--- a/opendj-sdk/opends/tests/functional-tests/build.bat
+++ b/opendj-sdk/opends/tests/functional-tests/build.bat
@@ -1,51 +1,52 @@
-@echo off
-
-rem CDDL HEADER START
-rem
-rem The contents of this file are subject to the terms of the
-rem Common Development and Distribution License, Version 1.0 only
-rem (the "License"). You may not use this file except in compliance
-rem with the License.
-rem
-rem You can obtain a copy of the license at
-rem trunk/opends/resource/legal-notices/OpenDS.LICENSE
-rem or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-rem See the License for the specific language governing permissions
-rem and limitations under the License.
-rem
-rem When distributing Covered Code, include this CDDL HEADER in each
-rem file and include the License file at
-rem trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-rem add the following below this CDDL HEADER, with the fields enclosed
-rem information:
-rem Portions Copyright [yyyy] [name of copyright owner]
-rem
-rem CDDL HEADER END
-rem
-rem
-rem Portions Copyright 2007 Sun Microsystems, Inc.
-
-setlocal
-
-rem These are the variables we need to run the functional tests
-set FT_HOME=%~dP0
-set ANT_HOME=%FT_HOME%\..\..\ext\ant
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-goto runAnt
-
-:noJavaHome
-echo Error: JAVA_HOME environment variable is not set.
-echo Please set it to a valid Java 5 Development Kit installation.
-goto end
-
-:runAnt
-rem echo a quick summary of what this script did
-echo using the following variables:
-echo ANT_HOME=%ANT_HOME%
-echo JAVA_HOME=%JAVA_HOME%
-if not "%*" == "" echo your parameters=%*
-echo Now running ant ...
-"%ANT_HOME%\bin\ant" -f staf-installer.xml %*
-
-:end
+@echo off
+
+rem CDDL HEADER START
+rem
+rem The contents of this file are subject to the terms of the
+rem Common Development and Distribution License, Version 1.0 only
+rem (the "License"). You may not use this file except in compliance
+rem with the License.
+rem
+rem You can obtain a copy of the license at
+rem trunk/opends/resource/legal-notices/OpenDS.LICENSE
+rem or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+rem See the License for the specific language governing permissions
+rem and limitations under the License.
+rem
+rem When distributing Covered Code, include this CDDL HEADER in each
+rem file and include the License file at
+rem trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+rem add the following below this CDDL HEADER, with the fields enclosed
+rem information:
+rem Portions Copyright [yyyy] [name of copyright owner]
+rem
+rem CDDL HEADER END
+rem
+rem
+rem Portions Copyright 2007 Sun Microsystems, Inc.
+
+setlocal
+
+rem These are the variables we need to run the functional tests
+set FT_HOME=%~dP0
+set ANT_HOME=%FT_HOME%\..\..\ext\ant
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+goto runAnt
+
+:noJavaHome
+echo Error: JAVA_HOME environment variable is not set.
+echo Please set it to a valid Java 5 Development Kit installation.
+goto end
+
+:runAnt
+rem echo a quick summary of what this script did
+echo using the following variables:
+echo ANT_HOME=%ANT_HOME%
+echo JAVA_HOME=%JAVA_HOME%
+if not "%*" == "" echo your parameters=%*
+echo Now running ant ...
+OPENDS_LIB=%FT_HOME%\..\..\lib
+"%ANT_HOME%\bin\ant" -lib "%OPENDS_LIB%\mail.jar;%OPENDS_LIB%\activation.jar"-f staf-installer.xml %*
+
+:end
diff --git a/opendj-sdk/opends/tests/functional-tests/build.sh b/opendj-sdk/opends/tests/functional-tests/build.sh
index 05cd287..b5c5156 100644
--- a/opendj-sdk/opends/tests/functional-tests/build.sh
+++ b/opendj-sdk/opends/tests/functional-tests/build.sh
@@ -1,50 +1,51 @@
-#!/bin/sh
-
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Portions Copyright 2006 Sun Microsystems, Inc.
-
-
-# Change to the location of this build script.
-cd `dirname $0`
-
-
-# See if JAVA_HOME is set. If not, then see if there is a java executable in
-# the path and try to figure it out.
-if test -z "${JAVA_HOME}"
-then
- JAVA_HOME=`java -cp ../../resource FindJavaHome`
- if test -z "${JAVA_HOME}"
- then
- echo "Please set JAVA_HOME to the root of a Java 5.0 installation."
- exit 1
- else
- export JAVA_HOME
- fi
-fi
-
-ANT_HOME=`cd ../..;pwd`/ext/ant
-export ANT_HOME
-# Execute the ant script and pass it any additional command-line arguments.
-$ANT_HOME/bin/ant -f staf-installer.xml ${*}
+#!/bin/sh
+
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE
+# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at
+# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+# add the following below this CDDL HEADER, with the fields enclosed
+# information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Portions Copyright 2006 Sun Microsystems, Inc.
+
+
+# Change to the location of this build script.
+cd `dirname $0`
+
+
+# See if JAVA_HOME is set. If not, then see if there is a java executable in
+# the path and try to figure it out.
+if test -z "${JAVA_HOME}"
+then
+ JAVA_HOME=`java -cp ../../resource FindJavaHome`
+ if test -z "${JAVA_HOME}"
+ then
+ echo "Please set JAVA_HOME to the root of a Java 5.0 installation."
+ exit 1
+ else
+ export JAVA_HOME
+ fi
+fi
+
+OPENDS_LIB=`cd ../../lib;pwd`
+ANT_HOME=`cd ../..;pwd`/ext/ant
+export ANT_HOME
+# Execute the ant script and pass it any additional command-line arguments.
+$ANT_HOME/bin/ant -lib $OPENDS_LIB/mail.jar:$OPENDS_LIB/activation.jar -f staf-installer.xml ${*}
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer.xml b/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
index 4b85ffc..b3f676f 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
@@ -31,9 +31,10 @@
This allows tests that need a running instance of staf to easily
get one and hides all the complexity under the hood
</description>
+ <dirname file="${basedir}/.." property="project.home"/>
<!-- installer wide settings - top -->
- <property file="../../PRODUCT"/>
+ <property file="${project.home}//PRODUCT"/>
<property name="product.name"
value="${SHORT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}" />
<!-- this is the file where the default values are defined -->
@@ -254,11 +255,20 @@
<!-- Gui section - top -->
<target name="gui"
+ depends="status-do"
description="brings up the stax gui" >
- <java classname="com.ibm.staf.service.stax.STAXMonitor"
- classpath="${staf.install.dir}/services/stax/STAXMon.jar${path.separator}${staf.install.dir}/bin/JSTAF.jar"
- fork="true"
- spawn="true"/>
+
+ <exec
+ dir="${staf.install.dir}"
+ executable="${java.home}/bin/java"
+ spawn="true">
+ <env key="LD_LIBRARY_PATH" value="${staf.lib.dir}"/>
+ <env key="STAFCONVDIR" value="${staf.install.dir}/codepage"/>
+ <env key="STAFCODEPAGE" value="LATIN_1"/>
+ <arg value="-classpath"/>
+ <arg value="${staf.install.dir}/services/stax/STAXMon.jar${path.separator}${staf.lib.dir}/JSTAF.jar"/>
+ <arg value="com.ibm.staf.service.stax.STAXMonitor"/>
+ </exec>
</target>
<!-- Gui section - bottom -->
@@ -277,11 +287,6 @@
<target name="run-tests-prepare"
depends="status-do,get-pkg"
if="staf.running">
- <condition property="staf.lib.dir"
- value="${staf.install.dir}${file.separator}bin"
- else="${staf.install.dir}${file.separator}lib">
- <os family="windows"/>
- </condition>
<!-- python config - top -->
<!-- 1. get a timestamp for step 3 -->
<tstamp>
@@ -342,6 +347,7 @@
>
<arg line="LOCAL STAX ${tests.request}"/>
<env key="CLASSPATH" path="${staf.lib.dir}/JSTAF.jar${path.separator}${e.CLASSPATH}"/>
+ <env key="LD_LIBRARY_PATH" value="${staf.lib.dir}"/>
<env key="STAFCONVDIR" value="${staf.install.dir}/codepage"/>
<env key="STAFCODEPAGE" value="LATIN_1"/>
</exec>
@@ -366,6 +372,14 @@
<include name="r*"/>
</fileset>
</copy>
+ <mail from="arnaud@sun.com"
+ tolist="arnaud@sun.com"
+ subject="FT - ${daily.date} - ${os.name} - ${os.arch}"
+ files="${staf.tmp.dir}/results.html"
+ mailhost="pecos.central.sun.com"
+ messagefile="${staf.tmp.dir}/results.html"
+ messagemimetype="text/html">
+ </mail>
</target>
<target name="daily">
@@ -439,7 +453,7 @@
<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"/>
- <env key="CLASSPATH" path="${staf.install.dir}/bin/JSTAF.jar${path.separator}${e.CLASSPATH}"/>
+ <env key="CLASSPATH" path="${staf.lib.dir}/JSTAF.jar${path.separator}${e.CLASSPATH}"/>
<env key="STAFCONVDIR" value="${staf.install.dir}/codepage"/>
<env key="STAFCODEPAGE" value="LATIN_1"/>
<env key="STAF_INSTANCE_NAME" value="STAF"/>
@@ -529,6 +543,11 @@
<available file="${staf.install.dir}"
type="dir"
property="staf.installed" />
+ <condition property="staf.lib.dir"
+ value="${staf.install.dir}${file.separator}bin"
+ else="${staf.install.dir}${file.separator}lib">
+ <os family="windows"/>
+ </condition>
<condition property="staf.running">
<socket port="${staf.port}" server="${host.name}"/>
@@ -604,4 +623,30 @@
<antcall target="uninstall"/>
</target>
<!-- Macros section - bottom -->
+ <target name="javadoc" depends="status-do" if="staf.installed">
+ <delete dir="${staf.home}/doc"/>
+ <mkdir dir="${staf.home}/doc"/>
+ <java jar="${staf.install.dir}/services/stax/STAXDoc.jar" fork="true">
+ <arg value="-d"/>
+ <arg value="${staf.home}/doc"/>
+ <arg value="testcases"/>
+ <arg value="testcases/aci"/>
+ <arg value="testcases/backends"/>
+ <arg value="testcases/core"/>
+ <arg value="testcases/schema"/>
+ <arg value="testcases/security"/>
+ <arg value="testcases/security/account_activation"/>
+ <arg value="testcases/security/auth_pwd_syntax"/>
+ <arg value="testcases/security/bind_no_pwd"/>
+ <arg value="testcases/security/jks"/>
+ <arg value="testcases/security/pkcs12"/>
+ <arg value="testcases/security/pwd_policy"/>
+ <arg value="testcases/security/pwd_policy_root"/>
+ <arg value="testcases/security/pwd_storage"/>
+ <arg value="testcases/security/pwd_validator"/>
+ <arg value="testcases/security/sasl"/>
+ <arg value="testcases/security/startTLS"/>
+ <arg value="shared/functions"/>
+ </java>
+ </target>
</project>
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer/Linux.properties b/opendj-sdk/opends/tests/functional-tests/staf-installer/Linux.properties
index 6791046..8b507ee 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer/Linux.properties
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer/Linux.properties
@@ -1 +1 @@
-bits.staf.archive=STAF320-setup-linux.jar
+bits.staf.archive=STAF320-setup-linux.jar
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer/SunOS-sparc.properties b/opendj-sdk/opends/tests/functional-tests/staf-installer/SunOS-sparc.properties
index 690bf5c..dc53c69 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer/SunOS-sparc.properties
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer/SunOS-sparc.properties
@@ -1 +1 @@
-bits.staf.archive=STAF320-setup-solaris-sparc.jar
+bits.staf.archive=STAF320-setup-solaris-sparc.jar
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer/SunOS-x86.properties b/opendj-sdk/opends/tests/functional-tests/staf-installer/SunOS-x86.properties
index a21f6a5..c9e4b6c 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer/SunOS-x86.properties
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer/SunOS-x86.properties
@@ -1 +1 @@
-bits.staf.archive=STAF3201-setup-solaris-x86.jar
+bits.staf.archive=STAF3201-setup-solaris-x86.jar
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer/config.py.stubs b/opendj-sdk/opends/tests/functional-tests/staf-installer/config.py.stubs
index 1c03f20..430b5a1 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer/config.py.stubs
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer/config.py.stubs
@@ -1,31 +1,31 @@
TEST_OS_STRING = '${os.name}'
-TEST_HW_STRING = '${os.arch}(${sun.arch.data.model} bits)'
-TEST_JVM_STRING = '${java.version}'
+TEST_HW_STRING = '${os.arch}'
+TEST_JVM_STRING = '${java.version}(${sun.arch.data.model} bits)'
STAF_LOCAL_HOSTNAME = 'localhost'
STAF_REMOTE_HOSTNAME = 'localhost'
STAF_JAVA_HOME = '${java.home}'
STAF_HOME_DIR = '${staf.install.dir}'
TMPDIR = '${staf.tmp.dir}'
-PSWDFILE = '${staf.tmp.dir}/password'
+PSWDFILE = '%s/password' % TMPDIR
OPENDSDIR = '${project.home}'
OPENDSNAME = '${product.name}'
ZIPNAME = '${product.name}.zip'
ZIPPATH = '${product.package.dir}'
-TESTS_DIR = '${basedir}'
-TESTS_ROOT = '${basedir}/tests'
-TESTS_SHARED_DIR = '${basedir}/shared'
-TESTS_FUNCTIONS_DIR = '${basedir}/shared/functions'
-TESTS_DATA_DIR = '${basedir}/shared/data'
-TMP_DATA_DIR = '${tests.run.dir}/${tests.run.time}/data'
+TESTS_ROOT = '%s/tests' % OPENDSDIR
+TESTS_DIR = '%s/functional-tests' % TESTS_ROOT
+TESTS_SHARED_DIR = '%s/shared' % TESTS_DIR
+TESTS_FUNCTIONS_DIR = '%s/functions' % TESTS_SHARED_DIR
+TESTS_DATA_DIR = '%s/data' % TESTS_SHARED_DIR
+TMP_DATA_DIR = '%s/functional-tests' % TMPDIR
DIRECTORY_INSTANCE_DN = 'cn=Directory Manager'
DIRECTORY_INSTANCE_PSWD = 'password'
-DIRECTORY_INSTANCE_DIR = '${staf.tmp.dir}'
+DIRECTORY_INSTANCE_DIR = '%s' % TMPDIR
DIRECTORY_INSTANCE_HOST = 'localhost'
DIRECTORY_INSTANCE_PORT = '1389'
DIRECTORY_INSTANCE_SSL_PORT = '1636'
DIRECTORY_INSTANCE_SFX = 'dc=com'
DIRECTORY_INSTANCE_BE = 'userRoot'
-STAGED_DATA_DIR = '${tests.run.dir}/${tests.run.time}/data/shared/data'
+STAGED_DATA_DIR = '%s/shared/data' % TMP_DATA_DIR
JAVA_HOME = '${java.home}'
SEND_MAIL_AFTER_TEST_RUN = '${staf.email.send}'
SEND_MAIL_TO = '${staf.email.to}'
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer/functional-tests.cfg b/opendj-sdk/opends/tests/functional-tests/staf-installer/functional-tests.cfg
index 7e4d01a..b945a34 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer/functional-tests.cfg
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer/functional-tests.cfg
@@ -1,22 +1,22 @@
-# Turn on tracing of internal errors and deprecated options
-trace enable tracepoints "error deprecated"
-
-# Enable TCP/IP connections
-interface tcp library STAFTCP option port=${staf.port}
-
-# Set default local trust
-trust machine local://local level 5
-
-# Default Service Loader Service
-serviceloader library STAFDSLS
-SERVICE STAX LIBRARY JSTAF EXECUTE {STAF/Config/STAFRoot}/services/stax/STAX.jar \
- OPTION JVMName=JVMSTAX \
- OPTION JVM=${java.home}${file.separator}bin${file.separator}java${binary.extension} \
- OPTION J2=-Xmx384m
-SERVICE EVENT LIBRARY JSTAF EXECUTE {STAF/Config/STAFRoot}/services/stax/STAFEvent.jar \
- OPTION JVMName=JVMSTAXEVENT \
- OPTION JVM=${java.home}${file.separator}bin${file.separator}java${binary.extension}
-SET MAXQUEUESIZE 10000
-trust level 5 machine tcp://localhost
-trust level 5 user anonymous
-service log library STAFLog parms "Directory {STAF/Config/STAFRoot}/../logs ResolveMessage"
+# Turn on tracing of internal errors and deprecated options
+trace enable tracepoints "error deprecated"
+
+# Enable TCP/IP connections
+interface tcp library STAFTCP option port=${staf.port}
+
+# Set default local trust
+trust machine local://local level 5
+
+# Default Service Loader Service
+serviceloader library STAFDSLS
+SERVICE STAX LIBRARY JSTAF EXECUTE {STAF/Config/STAFRoot}/services/stax/STAX.jar \
+ OPTION JVMName=JVMSTAX \
+ OPTION JVM=${java.home}${file.separator}bin${file.separator}java${binary.extension} \
+ OPTION J2=-Xmx384m
+SERVICE EVENT LIBRARY JSTAF EXECUTE {STAF/Config/STAFRoot}/services/stax/STAFEvent.jar \
+ OPTION JVMName=JVMSTAXEVENT \
+ OPTION JVM=${java.home}${file.separator}bin${file.separator}java${binary.extension}
+SET MAXQUEUESIZE 10000
+trust level 5 machine tcp://localhost
+trust level 5 user anonymous
+service log library STAFLog parms "Directory {STAF/Config/STAFRoot}/../logs ResolveMessage"
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer/replay.bat b/opendj-sdk/opends/tests/functional-tests/staf-installer/replay.bat
index 26ed984..bae6bdb 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer/replay.bat
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer/replay.bat
@@ -1,11 +1,11 @@
-@echo off
-echo Backing configuration up
-move "${tests.config}" "${tests.config.backup}"
-echo Loading configuration as of ${tests.run.time}
-copy "${tests.run.dir}${file.separator}${tests.run.time}${file.separator}config${file.separator}${tests.config.file}" "${tests.config}"
-echo Starting test run
-"${staf.install.dir}${file.separator}bin${file.separator}STAF.exe" local STAX "${tests.request}"
-echo Removing configuration of ${tests.run.time}
-del /f "${tests.config}"
-echo Restoring original configuration
-move "${tests.config.backup}" "${tests.config}"
+@echo off
+echo Backing configuration up
+move "${tests.config}" "${tests.config.backup}"
+echo Loading configuration as of ${tests.run.time}
+copy "${tests.run.dir}${file.separator}${tests.run.time}${file.separator}config${file.separator}${tests.config.file}" "${tests.config}"
+echo Starting test run
+"${staf.install.dir}${file.separator}bin${file.separator}STAF.exe" local STAX "${tests.request}"
+echo Removing configuration of ${tests.run.time}
+del /f "${tests.config}"
+echo Restoring original configuration
+move "${tests.config.backup}" "${tests.config}"
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer/replay.sh b/opendj-sdk/opends/tests/functional-tests/staf-installer/replay.sh
index 0793634..9ebd467 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer/replay.sh
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer/replay.sh
@@ -1,10 +1,10 @@
-echo "Backing configuration up"
-me "${tests.config}" "${tests.config.backup}"
-echo "Loading configuration as of ${tests.run.time}"
-cp "${tests.run.dir}${file.separator}${tests.run.time}${file.separator}config${file.separator}${tests.config.file}" "${tests.config}"
-echo "Starting test run"
-"${staf.install.dir}${file.separator}bin${file.separator}STAF" local STAX "${tests.request}"
-echo "Removing configuration of ${tests.run.time}"
-rm -f "${tests.config}"
-echo "Restoring original configuration"
-mv "${tests.config.backup}" "${tests.config}"
+echo "Backing configuration up"
+me "${tests.config}" "${tests.config.backup}"
+echo "Loading configuration as of ${tests.run.time}"
+cp "${tests.run.dir}${file.separator}${tests.run.time}${file.separator}config${file.separator}${tests.config.file}" "${tests.config}"
+echo "Starting test run"
+"${staf.install.dir}${file.separator}bin${file.separator}STAF" local STAX "${tests.request}"
+echo "Removing configuration of ${tests.run.time}"
+rm -f "${tests.config}"
+echo "Restoring original configuration"
+mv "${tests.config.backup}" "${tests.config}"
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer/staf-installer.properties b/opendj-sdk/opends/tests/functional-tests/staf-installer/staf-installer.properties
index aa49fd9..5225d77 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer/staf-installer.properties
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer/staf-installer.properties
@@ -1,56 +1,55 @@
-# Global section - top
-project.home=${basedir}${file.separator}..${file.separator}..
-host.name=localhost
-# Global section - bottom
-
-# Staf section - top
-staf.home=${project.home}${file.separator}tests${file.separator}functional-run
-staf.installer.dir=${basedir}${file.separator}staf-installer
-staf.install.dir=${staf.home}${file.separator}staf
-staf.bin.dir=${staf.install.dir}${file.separator}bin
-staf.config.dir=${staf.home}${file.separator}config
-staf.config.file=functional-tests.cfg
-staf.config=${staf.config.dir}${file.separator}${staf.config.file}
-staf.config.stubs=${staf.installer.dir}${file.separator}${staf.config.file}
-staf.tmp.dir=${staf.home}${file.separator}tmp
-staf.logs.dir=${staf.home}${file.separator}logs
-#
-staf.email.send=false
-staf.email.to=
-
-daily.build.time=213000
-daily.build.url=http://builds.opends.org/daily-builds/
-
-## TCP port on which to configure staf to listen
-## leave as is unless this port is already in use on your test machine
-staf.port.default=6500
-staf.port=${staf.port.default}
-# Staf section - bottom
-
-# Downloader section - top
-## where to download the staf bits before install
-bits.download.dir=${staf.home}${file.separator}staf-bits
-bits.download.url=http://superb-west.dl.sourceforge.net/sourceforge/staf
-bits.stax.archive=STAXV315.zip
-# Downloader section - bottom
-
-
-# Proxy section - top
-## set to match your own proxy if any
-proxy.host=webcache.central.sun.com
-proxy.port=8080
-proxy.user=
-proxy.pass=
-# Proxy section - bottom
-
-# Tests section - top
-tests.dir=${basedir}
-tests.run.dir=${staf.home}${file.separator}run
-tests.config.dir=${tests.dir}${file.separator}config
-tests.config.file=config.py
-tests.config.stubs=${staf.installer.dir}${file.separator}${tests.config.file}.stubs
-tests.config=${tests.config.dir}${file.separator}${tests.config.file}
-tests.config.backup=${tests.config}.orig
-tests.python=${tests.dir}${file.separator}shared${file.separator}python${file.separator}security.py
-tests.xml=${tests.dir}${file.separator}testcases${file.separator}runTestJob.xml
-# Tests section - bottom
+# Global section - top
+host.name=localhost
+# Global section - bottom
+
+# Staf section - top
+staf.home=${project.home}${file.separator}tests${file.separator}functional-run
+staf.installer.dir=${basedir}${file.separator}staf-installer
+staf.install.dir=${staf.home}${file.separator}staf
+staf.bin.dir=${staf.install.dir}${file.separator}bin
+staf.config.dir=${staf.home}${file.separator}config
+staf.config.file=functional-tests.cfg
+staf.config=${staf.config.dir}${file.separator}${staf.config.file}
+staf.config.stubs=${staf.installer.dir}${file.separator}${staf.config.file}
+staf.tmp.dir=${staf.home}${file.separator}tmp
+staf.logs.dir=${staf.home}${file.separator}logs
+#
+staf.email.send=false
+staf.email.to=
+
+daily.build.time=213000
+daily.build.url=http://builds.opends.org/daily-builds/
+
+## TCP port on which to configure staf to listen
+## leave as is unless this port is already in use on your test machine
+staf.port.default=6500
+staf.port=${staf.port.default}
+# Staf section - bottom
+
+# Downloader section - top
+## where to download the staf bits before install
+bits.download.dir=${staf.home}${file.separator}staf-bits
+bits.download.url=http://superb-west.dl.sourceforge.net/sourceforge/staf
+bits.stax.archive=STAXV315.zip
+# Downloader section - bottom
+
+
+# Proxy section - top
+## set to match your own proxy if any
+proxy.host=webcache.central.sun.com
+proxy.port=8080
+proxy.user=
+proxy.pass=
+# Proxy section - bottom
+
+# Tests section - top
+tests.dir=${basedir}
+tests.run.dir=${staf.home}${file.separator}run
+tests.config.dir=${tests.dir}${file.separator}config
+tests.config.file=config.py
+tests.config.stubs=${staf.installer.dir}${file.separator}${tests.config.file}.stubs
+tests.config=${tests.config.dir}${file.separator}${tests.config.file}
+tests.config.backup=${tests.config}.orig
+tests.python=${tests.dir}${file.separator}shared${file.separator}python${file.separator}security.py
+tests.xml=${tests.dir}${file.separator}testcases${file.separator}runTestJob.xml
+# Tests section - bottom
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer/windows-x86-32.properties b/opendj-sdk/opends/tests/functional-tests/staf-installer/windows-x86-32.properties
index 9da7d03..8168434 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer/windows-x86-32.properties
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer/windows-x86-32.properties
@@ -1,2 +1,2 @@
-bits.staf.archive=STAF3201-setup-win32.jar
-
+bits.staf.archive=STAF3201-setup-win32.jar
+
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer/windows-x86-64.properties b/opendj-sdk/opends/tests/functional-tests/staf-installer/windows-x86-64.properties
index 8371f00..088cb06 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer/windows-x86-64.properties
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer/windows-x86-64.properties
@@ -1 +1 @@
-staf.archive.name=STAF320-setup-win64.jar
+staf.archive.name=STAF320-setup-win64.jar
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer/windows.properties b/opendj-sdk/opends/tests/functional-tests/staf-installer/windows.properties
index 9da7d03..8168434 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer/windows.properties
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer/windows.properties
@@ -1,2 +1,2 @@
-bits.staf.archive=STAF3201-setup-win32.jar
-
+bits.staf.archive=STAF3201-setup-win32.jar
+
--
Gitblit v1.10.0