Improvements in ant build + update STAF/services versions + dynamic dsmlSer...

Christophe Sovant

11.48.2009 7252c1c1dba0b7ad4b2e692169da526491994aab

 opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties

@@ -24,10 +24,6 @@
#      Copyright 2007-2009 Sun Microsystems, Inc.


# Shared folder
shared.dir=${basedir}/shared


######
## These values can be overrided using the user.properties file
######
@@ -35,36 +31,17 @@
# 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}/archives
staf.default=true
staf.url=http://superb-east.dl.sourceforge.net/sourceforge/staf
staf.version=332
staf.version=334
staf.port=6500
## staf.archive value depends on os
stax.version=335
stax.archive=STAXV${stax.version}.zip
stax.version=337
email.version=332
email.archive=EmailV${email.version}.zip
event.version=312
event.archive=EventV${event.version}.zip
eventmanager.version=334
eventmanager.archive=EventManagerV${eventmanager.version}.zip
event.version=313
eventmanager.version=335
http.version=301
http.archive=HTTPV${http.version}.zip
tomcat.version=6.0.20
tomcat.url=http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat.version}/bin
tomcat.archive=apache-tomcat-${tomcat.version}.zip

# Proxy section
proxy.enabled=false
@@ -84,6 +61,9 @@
## These values can be overrided using the tests-XXX-XXX.properties file
######

# Shared folder
shared.dir=${basedir}/shared

# Hostname section
local.hostname=${host.name}
remote.hostname=${host.name}
@@ -103,24 +83,28 @@
local.javahome=${java.home}/..
remote.javahome=${java.home}/..

# STAF section
staf.shared.dir=${shared.dir}/staf
staf.config.stubs=${staf.shared.dir}/staf-${staf.type}.cfg

# Tests section
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.admin.dn=cn=myself
opends.admin.pwd=password
replication.split=false
snmp.opendmk.lib.dir=
ldclt.dir=
temp.dir=/tmp
test.plan.custom=
test.plan.functional.default=aci,backends,clu,core,dsconfig,dsml,groups,i18n,indexes,logging,monitoring,plugins,privileges,replication,schema,security,setup,snmp,tasks,virtualAttributes
test.plan.functional.default=aci,backends,clu,clu_secure,core,dsconfig,dsml,groups,i18n,indexes,logging,monitoring,plugins,privileges,replication,schema,security,setup,snmp,tasks,virtualAttributes
test.plan.stress.default=ldap_operation,import_ldif
verbose.mode=false
logs.uri=file://