From 66f795f1f31a16eb1861a402a554d457889a5897 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@hostsharing.net>
Date: Thu, 05 May 2011 18:00:25 +0200
Subject: [PATCH] web.xml Anpassungen aus Properties

---
 hsarback/build.xml |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/hsarback/build.xml b/hsarback/build.xml
index 124db53..7c81b63 100644
--- a/hsarback/build.xml
+++ b/hsarback/build.xml
@@ -33,7 +33,20 @@
 		<delete dir="${dist.home}" />
 	</target>
 
+	<target name="deploy" depends="war">
+		<delete dir="${hsar.deploy.dir}/hsar" />
+		<copy file="build/hsar.war" todir="${hsar.deploy.dir}" />
+	</target>
+
 	<target name="war" depends="enhance">
+		<copy file="conf/WEB-INF/web.xml" todir="webapp/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}"/>
+			</filterset>
+		</copy>
         <war destfile="build/hsar.war" basedir="webapp">
         	<lib dir="lib">
     		    <include name="**/*.jar"/>
@@ -74,13 +87,13 @@
 
 	<target name="init-db" description="init empty database">
 		<sql
-			classpath="/usr/share/java/postgresql-jdbc3-8.2.jar"
+			classpath="/usr/share/java/postgresql-jdbc3.jar"
 			driver="org.postgresql.Driver" 
 			url="jdbc:postgresql://localhost:5432/${database.name}"
 			userid="${database.user}" password="${database.password}" 
 			src="database/schema.sql" />		
 		<sql
-			classpath="/usr/share/java/postgresql-jdbc3-8.2.jar"
+			classpath="/usr/share/java/postgresql-jdbc3.jar"
 			driver="org.postgresql.Driver" 
 			url="jdbc:postgresql://localhost:5432/${database.name}"
 			userid="${database.user}" password="${database.password}" 
@@ -89,7 +102,7 @@
 	
 	<target name="drop-db" description="make empty database">
 		<sql
-			classpath="/usr/share/java/postgresql-jdbc3-8.2.jar"
+			classpath="/usr/share/java/postgresql-jdbc3.jar"
 			driver="org.postgresql.Driver" 
 			url="jdbc:postgresql://localhost:5432/${database.name}"
 			userid="${database.user}" password="${database.password}" 

--
Gitblit v1.9.1