mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
opends/tests/staf-tests/build
File was renamed from opends/tests/staf-tests/stress-tests/build @@ -23,7 +23,7 @@ # CDDL HEADER END # # # Copyright 2008 Sun Microsystems, Inc. # Copyright 2007-2008 Sun Microsystems, Inc. # Change to the location of this build script. @@ -48,4 +48,4 @@ 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 ${*} $ANT_HOME/bin/ant -lib $OPENDS_LIB/mail.jar:$OPENDS_LIB/activation.jar -f shared/ant/staf-installer.xml ${*} opends/tests/staf-tests/build.batold mode 100755 new mode 100644
File was renamed from opends/tests/staf-tests/stress-tests/build.bat @@ -47,6 +47,6 @@ if not "%*" == "" echo your parameters=%* echo Now running ant ... set OPENDS_LIB=%FT_HOME%\..\..\lib "%ANT_HOME%\bin\ant" -lib "%OPENDS_LIB%\mail.jar;%OPENDS_LIB%\activation.jar" -f staf-installer.xml %* "%ANT_HOME%\bin\ant" -lib "%OPENDS_LIB%\mail.jar;%OPENDS_LIB%\activation.jar" -f shared\ant\staf-installer.xml %* :end opends/tests/staf-tests/functional-tests/build
File was deleted opends/tests/staf-tests/functional-tests/build.bat
File was deleted opends/tests/staf-tests/functional-tests/staf-installer/failure.html
File was deleted opends/tests/staf-tests/shared/ant/Linux.properties
opends/tests/staf-tests/shared/ant/SunOS-sparc.properties
opends/tests/staf-tests/shared/ant/SunOS-x86.properties
opends/tests/staf-tests/shared/ant/SunOS.properties
opends/tests/staf-tests/shared/ant/staf-installer.properties
File was renamed from opends/tests/staf-tests/functional-tests/staf-installer/staf-installer.properties @@ -23,13 +23,15 @@ # # Copyright 2007-2008 Sun Microsystems, Inc. temp.dir=${project.home}${file.separator}tests${file.separator}staf-tests${file.separator}temp # Global section - top host.name=localhost # Global section - bottom # Staf section - top staf.home=${project.home}${file.separator}tests${file.separator}staf-tests${file.separator}functional-run staf.installer.dir=${basedir}${file.separator}staf-installer staf.home=${temp.dir}${file.separator}functional-run staf.installer.dir=${basedir}${file.separator}shared${file.separator}staf 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 @@ -79,7 +81,7 @@ bits.stax.archive=STAXV321.zip bits.http.archive=HTTPV300Beta13.zip ## where to download tomcat bits before install bits.webcontainer.download.dir=${project.home}${file.separator}tests${file.separator}staf-tests${file.separator}ext bits.webcontainer.download.dir=${staf.home}${file.separator}staf-bits bits.tomcat.download.url=http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.14/bin bits.tomcat.archive=apache-tomcat-6.0.14.zip # Downloader section - bottom @@ -94,19 +96,19 @@ # Proxy section - bottom # Tests section - top tests.dir=${basedir} tests.dir=${basedir}${file.separator}functional-tests 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.stubs=${basedir}${file.separator}shared${file.separator}tests${file.separator}${tests.config.file}.stubs tests.config=${tests.config.dir}${file.separator}${tests.config.file} tests.config.backup=${tests.config}.orig tests.xml=${tests.dir}${file.separator}testcases${file.separator}runTestJob.xml tests.xml=${basedir}${file.separator}shared${file.separator}tests${file.separator}runTestJob.xml # Tests section - bottom # test plan customization - top <property name="test.plan.file" value="${basedir}/testcases/run-custom-suites.dat" /> test.plan.list=sample,main_security,main_aci,main_clu,main_privileges,main_dsconfig,main_backends,main_core,main_schema,main_replication,main_indexes,main_groups,main_logging,main_plugins,main_tasks,main_virtualAttributes,main_monitoring,main_dsml,main_setup,main_snmp,main_i18n test.plan.dir=testcases test.plan.list=sample,security,aci,clu,privileges,dsconfig,backends,core,schema,replication,indexes,groups,logging,plugins,tasks,virtualAttributes,monitoring,dsml,setup,snmp,i18n test.plan.dir=functional-tests${file.separator}testcases test.plan.custom=${test.plan.dir}/run-custom-suites.dat test.plan.default=${test.plan.dir}/run-default-suites.dat # test plan customization - bottom opends/tests/staf-tests/shared/ant/staf-installer.xml
File was renamed from opends/tests/staf-tests/functional-tests/staf-installer.xml @@ -25,13 +25,13 @@ ! Copyright 2008 Sun Microsystems, Inc. ! --> <project name="opends-staf-installer" basedir="." default="usage"> <project name="opends-staf-installer" basedir="../.." default="usage"> <description> Installer ant file for the staf platform 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"/> <dirname file="${basedir}/.." property="project.home"/> <!-- installer wide settings - top --> <property file="${project.home}/PRODUCT"/> @@ -40,7 +40,7 @@ <!-- load user properties first if they have been set --> <property file="user.properties"/> <!-- this is the file where the default values are defined --> <property file="staf-installer/staf-installer.properties" /> <property file="shared/ant/staf-installer.properties" /> <!-- Define the os name in case we're on windows why do this ? @@ -53,17 +53,17 @@ <!-- Check if the current platform is supported --> <condition property="platform.supported"> <available file="staf-installer/${os.myname}.properties"/> <available file="shared/ant/${os.myname}.properties"/> </condition> <!-- Load architecture specific properties loading this one first allows to override common properties with platform specific properties --> <property file="staf-installer/${os.myname}-${os.arch}-${sun.arch.data.model}.properties" /> <property file="staf-installer/${os.myname}-${os.arch}.properties" /> <property file="shared/ant/${os.myname}-${os.arch}-${sun.arch.data.model}.properties" /> <property file="shared/ant/${os.myname}-${os.arch}.properties" /> <!-- Load properties common to the OS regardless of architecture --> <property file="staf-installer/${os.myname}.properties" /> <property file="shared/ant/${os.myname}.properties" /> <!-- Daily build properties --> <tstamp> @@ -275,7 +275,7 @@ <!-- adding dsml service extension --> <mkdir dir="${staf.install.dir}/services/dsml"/> <copy todir="${staf.install.dir}/services/dsml"> <fileset dir="${basedir}/../../ext/staf" includes="dsmlService.jar"/> <fileset dir="${basedir}/shared/dsml" includes="dsmlService.jar"/> </copy> </target> @@ -788,22 +788,23 @@ </target> <target name="run-my-tests-get-contrib-check"> <available file="ant-contrib.zip" property="ant-contrib.downloaded" /> <available file="${temp.dir}/ant-contrib.zip" property="ant-contrib.downloaded" /> </target> <target name="run-my-tests-get-contrib" depends="run-my-tests-get-contrib-check,download-do-prepare-check-proxy,download-do-prepare-set-proxy" unless="ant-contrib.downloaded"> <get src="http://easynews.dl.sourceforge.net/sourceforge/ant-contrib/ant-contrib-1.0b3-bin.zip" dest="ant-contrib.zip"/> <mkdir dir="${temp.dir}" /> <get src="http://easynews.dl.sourceforge.net/sourceforge/ant-contrib/ant-contrib-1.0b3-bin.zip" dest="${temp.dir}/ant-contrib.zip"/> </target> <target name="run-my-tests-expand-check"> <available file="ant-contrib" property="ant-contrib.expanded" /> <available file="${temp.dir}/ant-contrib" property="ant-contrib.expanded" /> </target> <target name="run-my-tests-expand" depends="run-my-tests-get-contrib,run-my-tests-expand-check" unless="ant-contrib.expanded"> <unzip src="ant-contrib.zip" dest="." /> <unzip src="${temp.dir}/ant-contrib.zip" dest="${temp.dir}" /> </target> <target name="run-my-tests-define" depends="run-my-tests-expand"> <taskdef resource="net/sf/antcontrib/antlib.xml"> <classpath> <fileset dir="ant-contrib"> <fileset dir="${temp.dir}/ant-contrib"> <include name="**/*.jar"/> </fileset> </classpath> @@ -1203,7 +1204,7 @@ </and> </condition> <available file="${daily.package}" property="daily.package.downloaded"/> <available file="testcases/run-custom-suites.dat" property="custom-suites.on" /> <available file="${tests.dir}/testcases/run-custom-suites.dat" property="custom-suites.on" /> <available file="${staf.install.dir}" type="dir" property="staf.installed" /> opends/tests/staf-tests/shared/ant/windows-x86-32.properties
opends/tests/staf-tests/shared/ant/windows-x86-64.properties
opends/tests/staf-tests/shared/ant/windows.properties
opends/tests/staf-tests/shared/dsml/dsmlService.jarBinary files differ
opends/tests/staf-tests/shared/staf/failure.htmlold mode 100755 new mode 100644
opends/tests/staf-tests/shared/staf/functional-tests.cfg
File was renamed from opends/tests/staf-tests/functional-tests/staf-installer/functional-tests.cfg @@ -86,8 +86,8 @@ #DSML SERVICE CONFIGURATION #uncomment following if you want it to be in separate JVMs #SERVICE DSML LIBRARY JSTAF \ # EXECUTE {STAF/Config/STAFRoot}/services/dsml/dsmlService.jar \ # OPTION JVMNAME=dsmlJVM \ # OPTION J2=-Xmx512m -Xms128m SERVICE DSML LIBRARY JSTAF \ EXECUTE {STAF/Config/STAFRoot}/services/dsml/dsmlService.jar \ OPTION JVMNAME=dsmlJVM \ OPTION J2=-Xmx512m -Xms128m \ OPTION JVM=/usr/bin/java opends/tests/staf-tests/shared/staf/replay.bat
opends/tests/staf-tests/shared/staf/replay.sh
opends/tests/staf-tests/shared/staf/stress-tests.cfg
opends/tests/staf-tests/shared/tests/config.py.stubs
opends/tests/staf-tests/shared/tests/runFuncTests.xml
File was renamed from opends/tests/staf-tests/functional-tests/testcases/runFuncTests.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE stax SYSTEM "../../shared/stax.dtd"> <!DOCTYPE stax SYSTEM "../stax.dtd"> <!-- ! CDDL HEADER START ! opends/tests/staf-tests/shared/tests/runStressTests.xml
File was renamed from opends/tests/staf-tests/stress-tests/testcases/runStressTests.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE stax SYSTEM "../../shared/stax.dtd"> <!DOCTYPE stax SYSTEM "../stax.dtd"> <!-- ! CDDL HEADER START ! opends/tests/staf-tests/shared/tests/runTestJob.xml
File was renamed from opends/tests/staf-tests/functional-tests/testcases/runTestJob.xml @@ -81,7 +81,7 @@ </script> <job name="'Job: %s %s' % (STAF_REMOTE_HOSTNAME,ServerOsString) " monitor="1" clearlogs="'Enabled'" logtcstartstop="'Enabled'"> <job-file>'%s/testcases/runFuncTests.xml' % TESTS_DIR</job-file> <job-file>'%s/shared/tests/runFuncTests.xml' % TESTS_ROOT</job-file> <job-scriptfiles machine="STAF_LOCAL_HOSTNAME"> STAXJobScriptFiles </job-scriptfiles> <job-action> <log>'Started sub-job %s on %s, %s' % (STAXSubJobID,STAF_REMOTE_HOSTNAME,ServerOsString )</log> opends/tests/staf-tests/stress-tests/staf-installer.xml
File was deleted opends/tests/staf-tests/stress-tests/staf-installer/Linux.properties
File was deleted opends/tests/staf-tests/stress-tests/staf-installer/SunOS-sparc.properties
File was deleted opends/tests/staf-tests/stress-tests/staf-installer/SunOS-x86.properties
File was deleted opends/tests/staf-tests/stress-tests/staf-installer/SunOS.properties
opends/tests/staf-tests/stress-tests/staf-installer/config.py.stubs
File was deleted opends/tests/staf-tests/stress-tests/staf-installer/replay.bat
File was deleted opends/tests/staf-tests/stress-tests/staf-installer/replay.sh
File was deleted opends/tests/staf-tests/stress-tests/staf-installer/staf-installer.properties
File was deleted opends/tests/staf-tests/stress-tests/staf-installer/windows-x86-32.properties
File was deleted opends/tests/staf-tests/stress-tests/staf-installer/windows-x86-64.properties
File was deleted opends/tests/staf-tests/stress-tests/staf-installer/windows.properties
File was deleted opends/tests/staf-tests/stress-tests/testcases/runTestJob.xml
File was deleted
