From f8c810642641ac5024cbda48abba7929c57308f5 Mon Sep 17 00:00:00 2001
From: "peter.danner" <peter.danner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 1 Dec 2005 09:11:56 +0000
Subject: added tomcat libs to use with tomcats 5.x.x

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

diff --git a/id.server/build.xml b/id.server/build.xml
index 84aeb3738..ba372f3f9 100644
--- a/id.server/build.xml
+++ b/id.server/build.xml
@@ -37,7 +37,7 @@
 	<property name="lib" value="lib"/>
 	<property name="lib.axis" value="${lib}/axis-1.1rc2"/>
 	<property name="lib.commons-logging" value="${lib}/commons-logging-1.0.4"/>
-  <property name="lib.iaik-moa" value="${lib}/iaik-moa-20051107"/>
+	<property name="lib.iaik-moa" value="${lib}/iaik-moa-20051107"/>
 	<property name="lib.iaik-moa-full" value="${lib.iaik-moa}/full"/>
 	<property name="lib.iaik-moa-eval" value="${lib.iaik-moa}/eval"/>
 	<property name="lib.jaxen" value="${lib}/jaxen-1.0"/>
@@ -93,6 +93,7 @@
 	</path>
 	<!-- classpaths without IAIK libraries -->
 	<path id="compile.basepath">
+		<pathelement location="${lib.activation}/activation.jar"/>
 		<pathelement location="${lib.axis}/axis.jar"/>
 		<pathelement location="${lib.axis}/jaxrpc.jar"/>
 		<pathelement location="${lib.axis}/saaj.jar"/>
@@ -108,7 +109,6 @@
 		<pathelement location="${lib.regexp}/jakarta-regexp-1.3.jar"/>
 		<pathelement location="${lib.dav4j}/dav4j.jar"/>
 		<pathelement location="${lib.mail}/mail.jar"/>
-		<pathelement location="${lib.activation}/activation.jar"/>
 		<pathelement location="${lib.httpsclient}/httpsclient.jar"/>
 		<fileset dir="${lib.jsse}"/>
 		<pathelement location="${lib.commons-logging}/commons-logging-api.jar"/>
@@ -182,6 +182,7 @@
 	<target name="package-auth-base">
 		<war warfile="${dist.auth}/moa-id-auth.war" webxml="${webinf.auth}/web.xml">
 			<fileset dir="${html.auth}" includes="errorpage-auth.jsp,message-auth.jsp,WEB-INF/server-config.wsdd"/>
+			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
 			<lib dir="${lib.jaxen}"/>
 			<lib dir="${lib.iaik-moa-full}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar,signed/,linux/libpkcs11wrapper.so,solaris/libpkcs11wrapper.so"/>
@@ -203,6 +204,7 @@
 	<target name="package-auth-base-eval">
 		<war warfile="${dist.auth}/moa-id-auth.war" webxml="${webinf.auth}/web.xml">
 			<fileset dir="${html.auth}" includes="errorpage-auth.jsp,message-auth.jsp,WEB-INF/server-config.wsdd"/>
+			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
 			<lib dir="${lib.jaxen}"/>
 			<lib dir="${lib.iaik-moa-eval}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar,signed/,linux/libpkcs11wrapper.so,solaris/libpkcs11wrapper.so"/>
@@ -224,6 +226,7 @@
 	<target name="package-auth-base-woIAIK" description="base target for moa-id-auth.war file without IAIK libraries">
 		<war warfile="${dist.auth}/moa-id-auth.war" webxml="${webinf.auth}/web.xml">
 			<fileset dir="${html.auth}" includes="errorpage-auth.jsp,message-auth.jsp,WEB-INF/server-config.wsdd"/>
+			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
 			<lib dir="${lib.jaxen}"/>
 			<lib dir="${lib.moa-spss}"/>
@@ -257,6 +260,7 @@
 	<target name="package-proxy-base">
 		<war warfile="${dist.proxy}/moa-id-proxy.war" webxml="${webinf.proxy}/web.xml">
 			<fileset dir="${html.proxy}" includes="errorpage-proxy.jsp,message-proxy.jsp"/>
+			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
 			<lib dir="${lib.jaxen}"/>
 			<lib dir="${lib.iaik-moa-full}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar,signed/,linux/libpkcs11wrapper.so,solaris/libpkcs11wrapper.so"/>
@@ -278,6 +282,7 @@
 	<target name="package-proxy-base-eval" description="base target for moa-id-proxy.war file for educational and research use">
 		<war warfile="${dist.proxy}/moa-id-proxy.war" webxml="${webinf.proxy}/web.xml">
 			<fileset dir="${html.proxy}" includes="errorpage-proxy.jsp,message-proxy.jsp"/>
+			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
 			<lib dir="${lib.jaxen}"/>
 			<lib dir="${lib.iaik-moa-eval}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar,signed/,linux/libpkcs11wrapper.so,solaris/libpkcs11wrapper.so"/>
@@ -299,6 +304,7 @@
 	<target name="package-proxy-base-woIAIK" description="base target for moa-id-proxy.war file for commercial use">
 		<war warfile="${dist.proxy}/moa-id-proxy.war" webxml="${webinf.proxy}/web.xml">
 			<fileset dir="${html.proxy}" includes="errorpage-proxy.jsp,message-proxy.jsp"/>
+			<lib dir="${lib.activation}"/>
 			<lib dir="${lib.axis}"/>
 			<lib dir="${lib.jaxen}"/>
 			<lib dir="${lib.moa-spss}" includes="moa-common.jar"/>
-- 
cgit v1.2.3