From 9c6d701770fe660618ac119eb5189d999cdac027 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Thu, 15 Mar 2007 01:12:34 +0000
Subject: [PATCH] 1. fixed typo in ant script 2. removed ResolveMessage from STAF Log service 3. removed spawning new JVM for each separate STAF service 4. update to STAX v3.2.0
---
opends/tests/functional-tests/staf-installer.xml | 4 +++-
opends/tests/functional-tests/staf-installer/functional-tests.cfg | 24 ++++++++++++------------
opends/tests/functional-tests/staf-installer/staf-installer.properties | 2 +-
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/opends/tests/functional-tests/staf-installer.xml b/opends/tests/functional-tests/staf-installer.xml
index 10fc9ed..7b48781 100644
--- a/opends/tests/functional-tests/staf-installer.xml
+++ b/opends/tests/functional-tests/staf-installer.xml
@@ -343,7 +343,7 @@
</target>
<target name="run-tests-check" depends="run-tests-build-pkg">
- <condition property="opends.port.ldap.taken">run
+ <condition property="opends.port.ldap.taken">
<socket port="${opends.port.ldap}" server="${host.name}"/>
</condition>
<condition property="opends.port.ldaps.taken">
@@ -580,7 +580,9 @@
<exec
dir="${staf.bin.dir}"
executable="${staf.daemon}"
+ ><!--
spawn="true">
+ -->
<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"/>
diff --git a/opends/tests/functional-tests/staf-installer/functional-tests.cfg b/opends/tests/functional-tests/staf-installer/functional-tests.cfg
index e2d9805..2dd23be 100644
--- a/opends/tests/functional-tests/staf-installer/functional-tests.cfg
+++ b/opends/tests/functional-tests/staf-installer/functional-tests.cfg
@@ -15,31 +15,31 @@
# LOG SERVICE CONFIGURATION
SERVICE Log LIBRARY STAFLog \
- PARMS "Directory {STAF/Config/STAFRoot}/../logs ResolveMessage"
+ PARMS "Directory {STAF/Config/STAFRoot}/../logs"
# ZIP SERVICE CONFIGURATION
SERVICE Zip LIBRARY STAFZip
# EVENT SERVICE CONFIGURATION
# PARMS "MAXATTEMPTS 5 ACKNOWLEDGETIMEOUT 30000" \
+# OPTION JVMName=EventJVM \
+# OPTION JVM=${java.home}${file.separator}bin${file.separator}java${binary.extension}
SERVICE Event LIBRARY JSTAF \
- EXECUTE {STAF/Config/STAFRoot}/services/event/STAFEvent.jar \
- OPTION JVMName=EventJVM \
- OPTION JVM=${java.home}${file.separator}bin${file.separator}java${binary.extension}
+ EXECUTE {STAF/Config/STAFRoot}/services/event/STAFEvent.jar
# EVENTMANAGER SERVICE CONFIGURATION
# PARMS "EVENTSERVICENAME=EVENT" \
-SERVICE EventManager LIBRARY JSTAF \
- EXECUTE {STAF/Config/STAFRoot}/services/eventmanager/STAFEventManager.jar \
- OPTION JVMName=EventManagerJVM \
- OPTION JVM=${java.home}${file.separator}bin${file.separator}java${binary.extension}
+#SERVICE EventManager LIBRARY JSTAF \
+# EXECUTE {STAF/Config/STAFRoot}/services/eventmanager/STAFEventManager.jar \
+# OPTION JVMName=EventManagerJVM \
+# OPTION JVM=${java.home}${file.separator}bin${file.separator}java${binary.extension}
# STAX SERVICE CONFIGURATION
+# OPTION JVMName=StaxJVM \
+# OPTION JVM=${java.home}${file.separator}bin${file.separator}java${binary.extension} \
+# OPTION J2=-Xmx384m
SERVICE Stax LIBRARY JSTAF \
- EXECUTE {STAF/Config/STAFRoot}/services/stax/STAX.jar \
- OPTION JVMName=StaxJVM \
- OPTION JVM=${java.home}${file.separator}bin${file.separator}java${binary.extension} \
- OPTION J2=-Xmx384m
+ EXECUTE {STAF/Config/STAFRoot}/services/stax/STAX.jar
#EMAIL SERVICE CONFIGURATION
#SERVICE Email LIBRARY JSTAF \
diff --git a/opends/tests/functional-tests/staf-installer/staf-installer.properties b/opends/tests/functional-tests/staf-installer/staf-installer.properties
index ae599f9..9dbe895 100644
--- a/opends/tests/functional-tests/staf-installer/staf-installer.properties
+++ b/opends/tests/functional-tests/staf-installer/staf-installer.properties
@@ -39,7 +39,7 @@
bits.email.archive=EmailV320.zip
bits.event.archive=EventV310.zip
bits.eventmanager.archive=EventManagerV321.zip
-bits.stax.archive=STAXV315.zip
+bits.stax.archive=STAXV320.zip
# Downloader section - bottom
--
Gitblit v1.10.0