aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorharald.bratko <harald.bratko@d688527b-c9ab-4aba-bd8d-4036d912da1d>2005-10-31 11:39:47 +0000
committerharald.bratko <harald.bratko@d688527b-c9ab-4aba-bd8d-4036d912da1d>2005-10-31 11:39:47 +0000
commit619839fe9f1476a7f400d6a261ad0d1f6365cc77 (patch)
tree1f31459bc8b61dae2bff695d53b27313c07fa314
parent2857f9242b80542ea2b3280bcc0989b2dd09eec0 (diff)
downloadmoa-id-spss-619839fe9f1476a7f400d6a261ad0d1f6365cc77.tar.gz
moa-id-spss-619839fe9f1476a7f400d6a261ad0d1f6365cc77.tar.bz2
moa-id-spss-619839fe9f1476a7f400d6a261ad0d1f6365cc77.zip
Changed MOA SP configuration file property to "spss.config.xml"
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@542 d688527b-c9ab-4aba-bd8d-4036d912da1d
-rw-r--r--spss.server/data/deploy/tomcat/unix/moa-env.sh2
-rw-r--r--spss.server/data/deploy/tomcat/win32/startTomcat.bat2
2 files changed, 2 insertions, 2 deletions
diff --git a/spss.server/data/deploy/tomcat/unix/moa-env.sh b/spss.server/data/deploy/tomcat/unix/moa-env.sh
index 01d2605c2..49d6723a3 100644
--- a/spss.server/data/deploy/tomcat/unix/moa-env.sh
+++ b/spss.server/data/deploy/tomcat/unix/moa-env.sh
@@ -1,6 +1,6 @@
MOA_START=`pwd`
-CONFIG_OPT=-Dmoa.spss.server.configuration=$MOA_START/conf/moa-spss/MOA-SPSSConfiguration.xml
+CONFIG_OPT=-Dmoa.spss.server.configuration=$MOA_START/conf/moa-spss/spss.config.xml
LOGGING_OPT=-Dlog4j.configuration=file:$MOA_START/conf/moa-spss/log4j.properties
# NODE_ID_OPT=-Dmoa.node-id=node1
# TRUST_STORE_OPT=-Djavax.net.ssl.trustStore=truststore.jks
diff --git a/spss.server/data/deploy/tomcat/win32/startTomcat.bat b/spss.server/data/deploy/tomcat/win32/startTomcat.bat
index f97c5214e..b7d740d12 100644
--- a/spss.server/data/deploy/tomcat/win32/startTomcat.bat
+++ b/spss.server/data/deploy/tomcat/win32/startTomcat.bat
@@ -11,7 +11,7 @@ rem ----------------------------------------------------------------------------
set MOA_SPSS_CFG_HOME=%CATALINA_HOME%\conf\moa-spss
-set PARAM_SPSSCONFIG=-Dmoa.spss.server.configuration=%MOA_SPSS_CFG_HOME%\MOA-SPSSConfiguration.xml
+set PARAM_SPSSCONFIG=-Dmoa.spss.server.configuration=%MOA_SPSS_CFG_HOME%\spss.config.xml
set PARAM_LOGGING=-Dlog4j.configuration=file:%MOA_SPSS_CFG_HOME%\log4j.properties
set PARAM_NODEID=-Dmoa.node-id=Node1
set PARAMS_MOA=%PARAM_SPSSCONFIG% %PARAM_LOGGING% %PARAM_NODEID%