diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-01-27 14:50:36 +0100 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-01-27 14:50:36 +0100 |
commit | e01b0fee1d650159561071bdb6027039edc2b76d (patch) | |
tree | 86339581d3753ba19a6c6f00049c0775248e1903 /id/server/data/deploy/tomcat/win32/startTomcat.bat | |
parent | 4dfca16cb46126d564240767a89fe8a9f4f9bcdf (diff) | |
parent | ec62813f4c0e8b3002d46f7bc315e7a27d720125 (diff) | |
download | moa-id-spss-e01b0fee1d650159561071bdb6027039edc2b76d.tar.gz moa-id-spss-e01b0fee1d650159561071bdb6027039edc2b76d.tar.bz2 moa-id-spss-e01b0fee1d650159561071bdb6027039edc2b76d.zip |
Merge branch 'moa-id-3.0.0-snapshot' into moa-id-3.2_(OPB)
Diffstat (limited to 'id/server/data/deploy/tomcat/win32/startTomcat.bat')
-rw-r--r-- | id/server/data/deploy/tomcat/win32/startTomcat.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/id/server/data/deploy/tomcat/win32/startTomcat.bat b/id/server/data/deploy/tomcat/win32/startTomcat.bat index b45a72ace..325ae1f20 100644 --- a/id/server/data/deploy/tomcat/win32/startTomcat.bat +++ b/id/server/data/deploy/tomcat/win32/startTomcat.bat @@ -15,7 +15,7 @@ set LOGGING_LOGBACK_OPT=-Dlogback.configurationFile=%CATALINA_HOME%/conf/moa-id/ set CONFIG_OPT_SPSS=-Dmoa.spss.server.configuration=%CATALINA_HOME%/conf/moa-spss/SampleMOASPSSConfiguration.xml
set CONFIG_OPT_ID=-Dmoa.id.configuration=file:%CATALINA_HOME%/conf/moa-id/moa-id.properties
set CONFIGTOOL_OPT=-Dmoa.id.webconfig=file:%CATALINA_HOME%/conf/moa-id-configuration/moa-id-configtool.properties
-set CONFIGTOOL_USER_OPT=-Duser.properties=":$CATALINA_BASE/conf/moa-id-configuration/userdatabase.properties"
+set CONFIGTOOL_USER_OPT=-Duser.properties=$CATALINA_BASE/conf/moa-id-configuration/userdatabase.properties
set DEMOOA_OPT=-Dmoa.id.demoOA=%CATALINA_HOME%/conf/moa-id-oa/oa.properties
set STORK_OPT=-Deu.stork.samlengine.config.location=%CATALINA_HOME%/conf/moa-id/stork/
set PROXY_OPT=-Dmoa.id.proxy.configuration=%CATALINA_HOME%/conf/moa-id-proxy/MOAIDConfiguration.xml
|