From 297651347fe6a2a5bd6451b0143343ecccc070fe Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 04 May 2009 16:12:57 +0000
Subject: [PATCH] New functionality to run tests (functional and stress) on a remote machine

---
 opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties |  125 +++++++++++++++++++++++------------------
 1 files changed, 70 insertions(+), 55 deletions(-)

diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
index 655ab61..9f47b90 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
@@ -23,37 +23,34 @@
 #
 #      Copyright 2007-2009 Sun Microsystems, Inc.
 
-## These values can be overrided using the user.properties file
-
-# Log directory section
-logs.dir=${basedir}${file.separator}temp${file.separator}logs
-
-# Repository section
-repository.dir=${basedir}${file.separator}temp${file.separator}repository
-
-# OpenDS section
-default.opends.dir=${project.home}${file.separator}build${file.separator}package
-default.opends.zip=${product.name}.zip
-opends.dir=${default.opends.dir}
-opends.zip=${default.opends.zip}
-
-# Java section
-java.path=${java.home}
 
 # Shared folder
-shared.dir=${basedir}${file.separator}shared
+shared.dir=${basedir}/shared
 
-# Proxy section
-proxy.enabled=n
-proxy.host=webcache.central.sun.com
-proxy.port=8080
-proxy.user=
-proxy.pass=
+
+######
+## These values can be overrided using the user.properties file
+######
+
+# Repository section
+repository.dir=${basedir}/temp/repository
+
+# STAF section
+staf.install.dir=${repository.dir}/install/staf-${os.myname}
+staf.config.dir=${repository.dir}/configs
+staf.shared.dir=${shared.dir}/staf
+staf.config.stubs=${staf.shared.dir}/staf-${staf.type}.cfg
+staf.config.file=${staf.config.dir}/staf-${staf.type}-${host.name}.cfg
+staf.bin.dir=${staf.install.dir}/bin
+staf.daemon=${staf.bin.dir}/STAFProc${extension.binary}
+staf.executable=${staf.bin.dir}/STAF${extension.binary}
 
 # Archives section
-archives.dir=${repository.dir}${file.separator}archives
+archives.dir=${repository.dir}/archives
+staf.default=true
 staf.url=http://superb-east.dl.sourceforge.net/sourceforge/staf
 staf.version=332
+staf.port=6500
 ## staf.archive value depends on os
 stax.version=335
 stax.archive=STAXV${stax.version}.zip
@@ -69,42 +66,60 @@
 tomcat.url=http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin
 tomcat.archive=apache-tomcat-${tomcat.version}.zip
 
-# STAF section
-staf.install.dir=${repository.dir}${file.separator}install${file.separator}staf-${os.myname}
-staf.port=6500
-staf.config.dir=${repository.dir}${file.separator}configs
-staf.shared.dir=${shared.dir}${file.separator}staf
-staf.config.stubs=${staf.shared.dir}${file.separator}staf-${staf.type}.cfg
-staf.config.file=${staf.config.dir}${file.separator}staf-${staf.type}-${host.name}.cfg
-staf.bin.dir=${staf.install.dir}${file.separator}bin
-staf.daemon=${staf.bin.dir}${file.separator}STAFProc${extension.binary}
-staf.executable=${staf.bin.dir}${file.separator}STAF${extension.binary}
-staf.email.send=false
-staf.email.to=
+# Proxy section
+proxy.enabled=false
+proxy.host=
+proxy.port=
+proxy.user=
+proxy.pass=
+
+
+######
+## These values can be overrided using the tests-XXX-XXX.properties file
+######
+
+# Hostname section
+local.hostname=${host.name}
+remote.hostname=${host.name}
+
+# Log directory section
+logs.dir=${basedir}/temp/logs
+
+# OpenDS section
+default.opends.dir=${project.home}/build/package
+default.opends.name=${product.name}
+opends.dir=${default.opends.dir}
+opends.name=${default.opends.name}
+
+# Java section
+java.path=${java.home}/..
+local.javahome=${java.home}/..
+remote.javahome=${java.home}/..
 
 # Tests section
-tests.dir=${basedir}${file.separator}${tests.type}
-tests.shared.dir=${shared.dir}${file.separator}tests
-tests.config.stubs=${tests.shared.dir}${file.separator}config.py.stubs
-tests.config.file=config-${host.name}.py
-tests.run.dir=${logs.dir}${file.separator}${tests.type}${file.separator}run
-tests.tmp.dir=${logs.dir}${file.separator}${tests.type}${file.separator}tmp
-tests.xml=${tests.shared.dir}${file.separator}runTestJob.xml
+tests.default=true
+tests.dir=${basedir}/${tests.type}
+tests.shared.dir=${shared.dir}/tests
+tests.config.stubs=${tests.shared.dir}/config.py.stubs
+tests.topology.dir=${shared.dir}/topology
+tests.run.dir=${logs.dir}/${tests.type}/run
+tests.tmp.dir=${logs.dir}/${tests.type}/tmp
+tests.xml=${tests.shared.dir}/runTestJob.xml
 opends.port.ldap=1389
+opends.port.admin=4444
 opends.port.ldaps=1636
-opends.port.jmx=1689
 opends.admin.dn=cn=myself
 opends.admin.pwd=password
 snmp.opendmk.lib.dir=
-test.plan.custom=${basedir}${file.separator}${tests.type}${file.separator}testcases${file.separator}run-custom-suites.dat
-test.plan.default=${basedir}${file.separator}${tests.type}${file.separator}testcases${file.separator}run-default-suites.dat
-test.plan.list=aci,backends,clu,core,dsconfig,dsml,groups,i18n,indexes,logging,monitoring,plugins,privileges,quickstart,replication,schema,security,setup,snmp,tasks,virtualAttributes
+test.plan.custom=
+test.plan.default=aci,backends,clu,core,dsconfig,dsml,groups,i18n,indexes,logging,monitoring,plugins,privileges,replication,schema,security,setup,snmp,tasks,virtualAttributes
+verbose.mode=false
+email.enabled=false
+email.to=
+email.server.host=emailhost
+email.server.port=emailport
 
-# Email section
-email.enabled=n
-email.to=${user.name}@${host.name}
-email.from=${user.name}@${host.name}
-email.server.host=${host.name}
-email.server.port=25
-email.server.user=
-email.server.pwd=
+#tests.os.string=${os.name}
+#tests.jvm.string=${java.version}(${sun.arch.data.model} bits)
+logs.uri=file://
+email.subject=Results for ${opends.name} on ${remote.hostname}

--
Gitblit v1.10.0