From 793a8c5d516796bd939f636ba12e495cf3fb85d9 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Thu, 18 Oct 2012 17:14:44 +0200
Subject: [PATCH] fix pac-domin migration
---
hsarweb/build.xml | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/hsarweb/build.xml b/hsarweb/build.xml
index 2d69b64..eaad198 100644
--- a/hsarweb/build.xml
+++ b/hsarweb/build.xml
@@ -1,21 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="hsarweb" default="war">
+ <property file="${user.home}/.hsar.ant.properties" />
+
<path id="cp">
<fileset dir="WebContent/WEB-INF/lib">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="/usr/share/java">
+ <fileset dir="../hsarback/lib">
<include name="servlet-api-2.4.jar"/>
</fileset>
</path>
<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}"/>
+ <filter token="HTTPS" value="${hsar.https}"/>
+ </filterset>
+ </copy>
<war destfile="build/hsarweb.war" basedir="WebContent">
<classes dir="build/cls" />
<classes dir="src">
<include name="**/*.properties"/>
- <include name="**/*.png"/>
</classes>
</war>
</target>
@@ -27,4 +39,9 @@
/>
</target>
+ <target name="clean">
+ <delete dir="build"/>
+ <delete file="WebContent/WEB-INF/web.xml"/>
+ </target>
+
</project>
--
Gitblit v1.9.3