From eab28f20befe6f3ad46c81302864ea2aefaca890 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Wed, 07 May 2008 11:11:12 +0000
Subject: [PATCH] relocate dsml test certs to services/DSML
---
opends/tests/functional-tests/staf-installer/functional-tests.cfg | 2 +-
opends/tests/shared/functions/webcontainer.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opends/tests/functional-tests/staf-installer/functional-tests.cfg b/opends/tests/functional-tests/staf-installer/functional-tests.cfg
index d7800a2..7882b90 100644
--- a/opends/tests/functional-tests/staf-installer/functional-tests.cfg
+++ b/opends/tests/functional-tests/staf-installer/functional-tests.cfg
@@ -82,7 +82,7 @@
OPTION JVMNAME=httpJVM \
OPTION J2=-Xmx128m -Xms32m \
-Djavax.net.ssl.trustStorePassword=changeit \
- -Djavax.net.ssl.trustStore={STAF/Config/STAFRoot}/services/http/tomcatCertificate
+ -Djavax.net.ssl.trustStore={STAF/Config/STAFRoot}/services/DSML/tomcatCertificate
#DSML SERVICE CONFIGURATION
#uncomment following if you want it to be in separate JVMs
diff --git a/opends/tests/shared/functions/webcontainer.xml b/opends/tests/shared/functions/webcontainer.xml
index d546870..757308f 100755
--- a/opends/tests/shared/functions/webcontainer.xml
+++ b/opends/tests/shared/functions/webcontainer.xml
@@ -115,7 +115,7 @@
'command' : '%s/bin/keytool' % (JAVA_HOME),
'arguments' : '-genkey -alias tomcat -keyalg rsa \
-dname "cn=tomcat,O=Sun Microsystems,C=US" \
- -keystore "%s/services/http/tomcatCertificate" \
+ -keystore "%s/services/DSML/tomcatCertificate" \
-storepass "changeit" -keypass "changeit" \
-storetype JKS ' % (stafRoot),
'path' : '%s/bin' % (JAVA_HOME),
@@ -125,7 +125,7 @@
<call function="'copyFile'">
{ 'location' : STAXServiceMachine,
- 'srcfile' : '%s/services/http/tomcatCertificate' % (stafRoot),
+ 'srcfile' : '%s/services/DSML/tomcatCertificate' % (stafRoot),
'destfile' : '%s/%s-%s/conf/tomcatCertificate' % (wcPath, WC_TYPE, WC_VERSION),
'remotehost' : mylocation
}
--
Gitblit v1.10.0