hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

URLs in web.xml aus ant-properties

Browse Source
This commit is contained in:
Peter Hormanns 2011-05-16 11:54:15 +00:00
parent fde981d8ab
commit ff55215925
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hsarweb/build.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project name="hsarweb" default="war"> <project name="hsarweb" default="war">
<property file="${user.home}/.hsar.ant.properties" />
<path id="cp"> <path id="cp">
<fileset dir="WebContent/WEB-INF/lib"> <fileset dir="WebContent/WEB-INF/lib">
<include name="**/*.jar"/> <include name="**/*.jar"/>
@ -11,6 +13,16 @@
</path> </path>
<target name="war" depends="compile"> <target name="war" depends="compile">
<copy file="conf/WEB-INF/web.xml" todir="WebContent/WEB-INF/">
<filterset>
<filter token="LOGIN_HOST" value="${cas.domain.name}"/>
<filter token="LOGIN_PORT" value="${cas.https.port}"/>
<filter token="CONFIG_HOST" value="${hsar.domain.name}"/>
<filter token="CONFIG_PORT" value="${hsar.https.port}"/>
<filter token="ADMIN_HOST" value="${hsarweb.domain.name}"/>
<filter token="ADMIN_PORT" value="${hsarweb.https.port}"/>
</filterset>
</copy>
<war destfile="build/hsarweb.war" basedir="WebContent"> <war destfile="build/hsarweb.war" basedir="WebContent">
<classes dir="build/cls" /> <classes dir="build/cls" />
<classes dir="src"> <classes dir="src">

14
hsarweb/WebContent/WEB-INF/web.xml → hsarweb/conf/WEB-INF/web.xml
View File

@ -11,11 +11,11 @@
</context-param> </context-param>
<context-param> <context-param>
<param-name>backendURL</param-name> <param-name>backendURL</param-name>
<param-value>https://agnes.ostwall195.de:9443/hsar/backend</param-value> <param-value>https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/backend</param-value>
</context-param> </context-param>
<context-param> <context-param>
<param-name>xmlrpcURL</param-name> <param-name>xmlrpcURL</param-name>
<param-value>https://agnes.ostwall195.de:9443/hsar/xmlrpc/hsadmin</param-value> <param-value>https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/xmlrpc/hsadmin</param-value>
</context-param> </context-param>
<context-param> <context-param>
<description>Vaadin production mode</description> <description>Vaadin production mode</description>
@ -28,11 +28,11 @@
<filter-class>org.jasig.cas.client.authentication.AuthenticationFilter</filter-class> <filter-class>org.jasig.cas.client.authentication.AuthenticationFilter</filter-class>
<init-param> <init-param>
<param-name>casServerLoginUrl</param-name> <param-name>casServerLoginUrl</param-name>
<param-value>https://agnes.ostwall195.de:9443/cas/login</param-value> <param-value>https://@LOGIN_HOST@:@LOGIN_PORT@/cas/login</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>service</param-name> <param-name>service</param-name>
<param-value>https://agnes.ostwall195.de:8443/hsarweb</param-value> <param-value>https://@ADMIN_HOST@:@ADMIN_PORT@/hsarweb</param-value>
</init-param> </init-param>
</filter> </filter>
@ -41,7 +41,7 @@
<filter-class>org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter</filter-class> <filter-class>org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter</filter-class>
<init-param> <init-param>
<param-name>casServerUrlPrefix</param-name> <param-name>casServerUrlPrefix</param-name>
<param-value>https://agnes.ostwall195.de:9443/cas</param-value> <param-value>https://@LOGIN_HOST@:@LOGIN_PORT@/cas</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>proxyReceptorUrl</param-name> <param-name>proxyReceptorUrl</param-name>
@ -49,11 +49,11 @@
</init-param> </init-param>
<init-param> <init-param>
<param-name>proxyCallbackUrl</param-name> <param-name>proxyCallbackUrl</param-name>
<param-value>https://agnes.ostwall195.de:8443/hsarweb/proxyCallback</param-value> <param-value>https://@ADMIN_HOST@:@ADMIN_PORT@/hsarweb/proxyCallback</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>service</param-name> <param-name>service</param-name>
<param-value>https://agnes.ostwall195.de:8443/hsarweb</param-value> <param-value>https://@ADMIN_HOST@:@ADMIN_PORT@/hsarweb</param-value>
</init-param> </init-param>
</filter> </filter>