From 4dd1877ef3771633e096509dae7b8c99fee9ce4b Mon Sep 17 00:00:00 2001
From: rudolf <rudolf@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 28 Jun 2004 20:46:16 +0000
Subject: *** empty log message ***

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@144 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id.server/build.xml | 48 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 10 deletions(-)

(limited to 'id.server/build.xml')

diff --git a/id.server/build.xml b/id.server/build.xml
index 59a8a5d54..d5e1d8033 100644
--- a/id.server/build.xml
+++ b/id.server/build.xml
@@ -8,7 +8,7 @@
 -->
 <project name="moa.id.server" default="dist-all" basedir=".">
   <property environment="env"/>
-  <property name="version" value="1.2.0"/>
+  <property name="version" value="1.2.0d05"/>
   <property name="src" value="src"/>
   <property name="res" value="res"/>
   <property name="data" value="data"/>
@@ -38,9 +38,9 @@
   <property name="lib.iaik-moa" value="${lib}/iaik-moa-20030703"/>
   <property name="lib.jaxen" value="${lib}/jaxen-1.0"/>
   <property name="lib.jaxp" value="${lib}/jaxp-1.2_01"/>
-  <property name="lib.jsse" value="${lib}/jsse-1.0.3_01"/>
+  <property name="lib.jsse" value="${lib}/jsse-1.0.3_03"/>
   <property name="lib.junit" value="${lib}/junit-3.8.1"/>
-  <property name="lib.log4j" value="${lib}/log4j-1.2.7"/>
+  <property name="lib.log4j" value="${lib}/log4j-1.2.8"/>
   <property name="lib.moa-spss" value="${lib}/moa-spss-1.2d01"/>
   <property name="lib.postgres-jdbc" value="${lib}/postgres-jdbc2-7.3"/>
   <property name="lib.servlet" value="${lib}/servlet-2.3"/>
@@ -93,6 +93,7 @@
   <!-- compile everything -->
   <target name="compile" depends="init">
     <fail message="env.MOA_COMMON_TEST_JAR not set" unless="env.MOA_COMMON_TEST_JAR"/>
+    <echo>classpathref= ${lib.iaik-moa}</echo>
     <javac srcdir= "${src}" destdir="${compile}" classpathref="compile.classpath" debug="on"/>
   </target>
 
@@ -241,7 +242,7 @@
       <fileset dir="${lib.jsse}"/>
     </copy>
     <copy toDir="${dist.auth}/ext14">
-      <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar,iaik_ldap.jar"/>
+      <fileset dir="${lib.iaik-moa}/signed" includes="iaik_jce_full.jar,iaik_ldap.jar"/>
     </copy>
     <copy toDir="${dist.auth}/endorsed">
       <fileset dir="${lib.xerces}"/>
@@ -250,6 +251,9 @@
     <copy todir="${dist.auth}/tomcat">
       <fileset dir="${data}/deploy/tomcat"/>
     </copy>
+    <copy todir="${dist.auth}/templates">
+      <fileset dir="${data}/deploy/templates"/>
+    </copy>
   </target>
   
   <!-- create the zipped moa-id-auth distributable -->
@@ -275,7 +279,7 @@
       <fileset dir="${lib.jsse}"/>
     </copy>
     <copy toDir="${dist.proxy}/ext14">
-      <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar,iaik_ldap.jar"/>
+      <fileset dir="${lib.iaik-moa}/signed" includes="iaik_jce_full.jar,iaik_ldap.jar"/>
     </copy>
     <copy toDir="${dist.proxy}/endorsed">
       <fileset dir="${lib.xerces}"/>
@@ -284,6 +288,9 @@
     <copy todir="${dist.proxy}/tomcat">
       <fileset dir="${data}/deploy/tomcat"/>
     </copy>
+    <copy todir="${dist.proxy}/templates">
+      <fileset dir="${data}/deploy/templates"/>
+    </copy>    
   </target>
   
   <!-- create the zipped moa-id-proxy distributable -->
@@ -334,9 +341,9 @@
     <delete dir="${deploy.webapps}/moa-id-auth"/>
     <copy file="${dist.auth}/moa-id-auth.war" todir="${deploy.webapps}"/>
     <!-- copy sample configuration -->
-    <copy toDir="${deploy}/conf">
+    <!-- copy toDir="${deploy}/conf">
       <fileset dir="${dist.auth}/conf"/>
-    </copy>
+    </copy -->
     <!-- copy libraries to MOA_AUTH_DEPLOY/common/endorsed -->
     <copy toDir="${deploy}/common/endorsed">
       <fileset dir="${dist.auth}/endorsed"/>
@@ -347,18 +354,39 @@
   <target name="deploy-proxy" depends="dist-proxy">
 	<fail message="env.MOA_PROXY_DEPLOY not set" unless="env.MOA_PROXY_DEPLOY"/>
 	<property name="deploy.proxy" value="${env.MOA_PROXY_DEPLOY}"/>
-	<property name="deploy.proxy.webapps" value="${deploy.proxy}/webapps"/>
+	<property name="deploy.proxy.webapps" value="${deploy.proxy}/webappsProxy"/>
     <delete dir="${deploy.proxy.webapps}/moa-id-proxy"/>
     <copy file="${dist.proxy}/moa-id-proxy.war" todir="${deploy.proxy.webapps}"/>
     <!-- copy sample configuration -->
-    <copy toDir="${deploy.proxy}/conf">
+    <!-- copy toDir="${deploy.proxy}/conf">
       <fileset dir="${dist.proxy}/conf"/>
-    </copy>
+    </copy -->
     <!-- copy libraries to MOA_PROXY_DEPLOY/common/endorsed -->
     <copy toDir="${deploy.proxy}/common/endorsed">
       <fileset dir="${dist.proxy}/endorsed"/>
     </copy>
   </target>
+  
+  <!-- deploy moa-id-auth configuration to catalina (needs MOA_AUTH_DEPLOY defined) -->
+  <target name="deploy-config" depends="deploy-auth,deploy-proxy">
+	<fail message="env.MOA_AUTH_DEPLOY not set" unless="env.MOA_AUTH_DEPLOY"/>
+	<property name="deploy" value="${env.MOA_AUTH_DEPLOY}"/>
+	<property name="deploy.proxy" value="${env.MOA_PROXY_DEPLOY}"/>
+
+    <!-- copy sample configuration -->
+    <echo>toDir=${deploy}/conf</echo>
+    <echo>dir="${dist.auth}/conf</echo>
+    <copy toDir="${deploy}/conf">
+      <fileset dir="${dist.auth}/conf"/>
+    </copy>
+    <copy toDir="${deploy.proxy}/conf">
+      <fileset dir="${dist.proxy}/conf"/>
+    </copy>
+  </target>
+  
+
+  <!-- deploy proxy and auth component -->
+  <target name="deploy-all" depends="deploy-auth,deploy-proxy"/>
 
   <!-- clean temporary files -->
   <target name="clean">
-- 
cgit v1.2.3