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/functions/webcontainer.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/webcontainer.xml b/opends/tests/staf-tests/shared/functions/webcontainer.xml
index 104c05e..3ec0c2d 100755
--- a/opends/tests/staf-tests/shared/functions/webcontainer.xml
+++ b/opends/tests/staf-tests/shared/functions/webcontainer.xml
@@ -106,7 +106,7 @@
<call function="'GetEntry'">
{
'location' : STAXServiceMachine,
- 'entry' : '%s/services/DSML/tomcatCertificate' % LOCAL_STAF_ROOT,
+ 'entry' : '%s/tomcatCertificate' % TMPDIR,
'attribute' : 'TYPE'
}
</call>
@@ -118,9 +118,9 @@
'command' : '%s/bin/keytool' % (LOCAL_JAVA_HOME),
'arguments' : '-genkey -alias tomcat -keyalg rsa \
-dname "cn=tomcat,O=Sun Microsystems,C=US" \
- -keystore "%s/services/DSML/tomcatCertificate" \
+ -keystore "%s/tomcatCertificate" \
-storepass "changeit" -keypass "changeit" \
- -storetype JKS ' % (LOCAL_STAF_ROOT),
+ -storetype JKS ' % (TMPDIR),
'path' : '%s/bin' % (LOCAL_JAVA_HOME),
'expectedRC': 0
}
@@ -129,7 +129,7 @@
<call function="'copyFile'">
{ 'location' : STAXServiceMachine,
- 'srcfile' : '%s/services/DSML/tomcatCertificate' % (LOCAL_STAF_ROOT),
+ 'srcfile' : '%s/tomcatCertificate' % (TMPDIR),
'destfile' : '%s/%s-%s/conf/tomcatCertificate' % (wcPath, WC_TYPE, WC_VERSION),
'remotehost' : mylocation
}
--
Gitblit v1.10.0