From 0026d9becf489657e300fb2b65e67287475c7060 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Fri, 11 Sep 2009 14:48:00 +0000
Subject: [PATCH] Improvements in ant build + update STAF/services versions + dynamic dsmlService compilation/loading
---
opends/tests/staf-tests/shared/staf/staf-controller.cfg | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/opends/tests/staf-tests/shared/staf/staf-controller.cfg b/opends/tests/staf-tests/shared/staf/staf-controller.cfg
index 02075df..d757975 100644
--- a/opends/tests/staf-tests/shared/staf/staf-controller.cfg
+++ b/opends/tests/staf-tests/shared/staf/staf-controller.cfg
@@ -47,39 +47,35 @@
# STAX SERVICE CONFIGURATION
SERVICE Stax LIBRARY JSTAF \
- EXECUTE {STAF/Config/STAFRoot}/services/stax/STAX.jar \
- OPTION J2="-Xms1g -Xmx1g -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:NewSize=500m -XX:MaxNewSize=500m -XX:SurvivorRatio=6 -XX:PermSize=256m -XX:MaxPermSize=256m -Xoss1m -Xss1m" \
+ EXECUTE ${staf.install.dir}/${stax.name}/STAX.jar \
+ OPTION JVMNAME=stafJVM-${local.hostname} \
+ OPTION J2=-Xms1g -Xmx1g \
+ -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled \
+ -XX:+CMSPermGenSweepingEnabled -XX:NewSize=500m -XX:MaxNewSize=500m \
+ -XX:SurvivorRatio=6 -XX:PermSize=256m -XX:MaxPermSize=256m -Xoss2m -Xss2m \
OPTION JVM=${local.javahome}/bin/java \
PARMS "PYTHONOUTPUT JobUserLogAndMsg" "PYTHONLOGLEVEL Info"
# EVENT SERVICE CONFIGURATION
SERVICE Event LIBRARY JSTAF \
- EXECUTE {STAF/Config/STAFRoot}/services/event/STAFEvent.jar
+ EXECUTE ${staf.install.dir}/${event.name}/STAFEvent.jar
# EVENTMANAGER SERVICE CONFIGURATION
SERVICE EventManager LIBRARY JSTAF \
- EXECUTE {STAF/Config/STAFRoot}/services/eventmanager/STAFEventManager.jar
+ EXECUTE ${staf.install.dir}/${eventmanager.name}/STAFEventManager.jar
# EMAIL SERVICE CONFIGURATION
SERVICE Email LIBRARY JSTAF \
- EXECUTE {STAF/Config/STAFRoot}/services/email/STAFEmail.jar \
+ EXECUTE ${staf.install.dir}/${email.name}/STAFEmail.jar \
PARMS "MAILSERVER ${email.server.host} PORT ${email.server.port}"
SET MAXQUEUESIZE 10000
# HTTP SERVICE CONFIGURATION
SERVICE Http LIBRARY JSTAF \
- EXECUTE {STAF/Config/STAFRoot}/services/http/STAFHTTP.jar \
- OPTION JVMNAME=httpJVM \
- OPTION J2=-Xmx128m -Xms32m \
+ EXECUTE ${staf.install.dir}/${http.name}/STAFHTTP.jar \
+ OPTION JVMNAME=httpJVM-${local.hostname} \
+ OPTION J2=-Xms32m -Xmx128m \
-Djavax.net.ssl.trustStorePassword=changeit \
- -Djavax.net.ssl.trustStore={STAF/Config/STAFRoot}/services/DSML/tomcatCertificate \
+ -Djavax.net.ssl.trustStore=${temp.dir}/tomcatCertificate \
OPTION JVM=${local.javahome}/bin/java
-
-# DSML SERVICE CONFIGURATION
-SERVICE Dsml LIBRARY JSTAF \
- EXECUTE {STAF/Config/STAFRoot}/services/DSML/dsmlService.jar \
- OPTION JVMNAME=dsmlJVM \
- OPTION J2=-Xmx512m -Xms128m \
- OPTION JVM=${local.javahome}/bin/java
-
--
Gitblit v1.10.0