diff --git a/hsarweb/build.xml b/hsarweb/build.xml index 0a0d023..fa0554f 100644 --- a/hsarweb/build.xml +++ b/hsarweb/build.xml @@ -1,6 +1,8 @@ + + @@ -11,6 +13,16 @@ + + + + + + + + + + diff --git a/hsarweb/WebContent/WEB-INF/web.xml b/hsarweb/conf/WEB-INF/web.xml similarity index 82% rename from hsarweb/WebContent/WEB-INF/web.xml rename to hsarweb/conf/WEB-INF/web.xml index d9b0749..fc6e8d0 100644 --- a/hsarweb/WebContent/WEB-INF/web.xml +++ b/hsarweb/conf/WEB-INF/web.xml @@ -11,11 +11,11 @@ backendURL - https://agnes.ostwall195.de:9443/hsar/backend + https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/backend xmlrpcURL - https://agnes.ostwall195.de:9443/hsar/xmlrpc/hsadmin + https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/xmlrpc/hsadmin Vaadin production mode @@ -28,11 +28,11 @@ org.jasig.cas.client.authentication.AuthenticationFilter casServerLoginUrl - https://agnes.ostwall195.de:9443/cas/login + https://@LOGIN_HOST@:@LOGIN_PORT@/cas/login service - https://agnes.ostwall195.de:8443/hsarweb + https://@ADMIN_HOST@:@ADMIN_PORT@/hsarweb @@ -41,7 +41,7 @@ org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter casServerUrlPrefix - https://agnes.ostwall195.de:9443/cas + https://@LOGIN_HOST@:@LOGIN_PORT@/cas proxyReceptorUrl @@ -49,11 +49,11 @@ proxyCallbackUrl - https://agnes.ostwall195.de:8443/hsarweb/proxyCallback + https://@ADMIN_HOST@:@ADMIN_PORT@/hsarweb/proxyCallback service - https://agnes.ostwall195.de:8443/hsarweb + https://@ADMIN_HOST@:@ADMIN_PORT@/hsarweb