Updated for building distributions with IAIK full (commercial) or IAIK

eval (research and educational use).


git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@349 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 522 insertions, 401 deletions

diff --git a/id.server/build.xml b/id.server/build.xml
index f72cbad1b..48cfc47ae 100644
--- a/id.server/build.xml
+++ b/id.server/build.xml
@@ -7,407 +7,528 @@
 
 -->
 <project name="moa.id.server" default="dist-all" basedir=".">
-  <property environment="env"/>
-  <property name="version" value="1.2.0d10"/>
-  <property name="projectroot" value="."/>
-  <property name="src" value="src"/>
-  <property name="res" value="res"/>
-  <property name="data" value="data"/>
-  <property name="doc" value="doc"/>
-  <property name="html" value="html"/>
-  <property name="html.auth" value="${html}/auth"/>
-  <property name="webinf.auth" value="${html.auth}/WEB-INF"/>
-  <property name="html.proxy" value="${html}/proxy"/>
-  <property name="webinf.proxy" value="${html.proxy}/WEB-INF"/>
-  <property name="tmp" value="tmp"/>
-  <property name="compile" value="${tmp}/compile"/>
-  <property name="api-doc" value="${tmp}/api-doc"/>
-  <property name="api-doc.internal" value="${tmp}/api-doc-internal"/>
-  <property name="dist" value="${tmp}/dist"/>
-  <property name="dist.auth" value="${dist}/auth"/>
-  <property name="dist.auth-zip" value="${dist}/auth-zip"/>
-  <property name="dist.proxy" value="${dist}/proxy"/>
-  <property name="dist.proxy-zip" value="${dist}/proxy-zip"/>
-  <property name="dist.src" value="${dist}/src"/>
-  <property name="dist.src-zip" value="${dist}/src-zip"/>
-  <property name="prj.build" value="../build"/>
-  <property name="prj.common" value="../common"/>
-  <property name="prj.oa" value="../id.oa"/>
-  <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.2"/>
-  <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_03"/>
-  <property name="lib.junit" value="${lib}/junit-3.8.1"/>
-  <property name="lib.log4j" value="${lib}/log4j-1.2.8"/>
-  <property name="lib.moa-spss" value="${lib}/moa-spss-1.2d04"/>
-  <property name="lib.postgres-jdbc" value="${lib}/postgres-jdbc2-7.3"/>
-  <property name="lib.servlet" value="${lib}/servlet-2.3"/>
-  <property name="lib.xalan" value="${lib}/xalan-j-2.5.1"/>
-  <property name="lib.xerces" value="${lib}/xerces-j-2.4.0"/>
-  <property name="lib.regexp" value="${lib}/regexp-1.3"/>
-  <property name="lib.dav4j" value="${lib}/dav4j"/>	
-  <property name="lib.mail" value="${lib}/tomcat-libs"/>
-  <property name="lib.activation" value="${lib}/tomcat-libs"/>
-	                   
-  <path id="compile.classpath">
-    <pathelement location="${lib.axis}/axis.jar"/>
-    <pathelement location="${lib.axis}/jaxrpc.jar"/>
-    <pathelement location="${lib.axis}/saaj.jar"/>
-    <pathelement location="${lib.jaxp}/jaxp-api.jar"/>
-    <pathelement location="${lib.jaxp}/dom.jar"/>
-    <pathelement location="${lib.jaxp}/sax.jar"/>
-    <pathelement location="${lib.xerces}/xerces.jar"/>
-    <pathelement location="${lib.jaxen}/jaxen-core.jar"/>
-    <pathelement location="${lib.jaxen}/jaxen-dom.jar"/>
-    <pathelement location="${lib.jaxen}/saxpath.jar"/>
-    <pathelement location="${lib.xalan}/xalan.jar"/>
-    <pathelement location="${lib.junit}/junit.jar"/>
-    <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"/>
-  	  	
-    <fileset dir="${lib.jsse}" />
-    <pathelement location="${lib.commons-logging}/commons-logging-api.jar"/>
-    <pathelement location="${lib.commons-discovery}/commons-discovery.jar"/>
-    <pathelement location="${lib.servlet}/servlet-2_3-fcs-classfiles.zip"/>
-    <pathelement location="${lib.iaik-moa}/iaik-moa-full.jar"/>
-    <pathelement location="${lib.iaik-moa}/ixsil.jar"/>
-    <pathelement location="${lib.iaik-moa}/iaik_ecc.jar"/>
-    <pathelement location="${lib.iaik-moa}/iaik_ldap.jar"/>
-    <pathelement location="${lib.iaik-moa}/iaik_X509TrustManager.jar"/>
-    <pathelement location="${lib.iaik-moa}/iaik_jce_full.jar"/>
-    <pathelement location="${lib.moa-spss}/moa-common.jar"/>
-    <pathelement location="${lib.moa-spss}/moa-spss.jar"/>
-    <pathelement location="${env.MOA_COMMON_TEST_JAR}"/>
-  </path>
-
-  <!-- set up directories etc. -->
-  <target name="init">
-    <tstamp/>
-    <echo>Time (hhmm): ${TSTAMP}</echo>
-    <mkdir dir="${tmp}"/>
-    <mkdir dir="${compile}"/>
-    <mkdir dir="${api-doc.internal}"/>
-    <mkdir dir="${dist.auth}"/>
-    <mkdir dir="${dist.auth-zip}"/>
-    <mkdir dir="${dist.proxy}"/>
-    <mkdir dir="${dist.proxy-zip}"/>
-    <mkdir dir="${dist.src}"/>
-    <mkdir dir="${dist.src-zip}"/>
-  </target>
-
-  <!-- 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>
-
-  <!-- package moa-id-auth.war -->
-  <target name="package-auth" depends="compile">
-    <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.axis}"/>
-      <lib dir="${lib.jaxen}"/>
-      <lib dir="${lib.iaik-moa}" excludes="iaik_jce_full.jar,iaik_ldap.jar"/>
-      <lib dir="${lib.moa-spss}"/>
-      <lib dir="${lib.postgres-jdbc}"/>
-      <lib dir="${lib.commons-logging}" includes="commons-logging.jar"/>
-      <lib dir="${lib.xalan}"/>
-      <lib dir="${lib.jaxp}"/>
-      <lib dir="${lib.log4j}"/>
-      <lib dir="${lib.regexp}"/>
-      <classes dir="${compile}">
-        <exclude name="**/proxy/**"/>
-        <exclude name="test/**"/>
-      </classes>
-      <classes dir="${res}"/>
-      <zipfileset file="${res}/resources/wsdl/MOA-SPSS-1.2.xsd" prefix="resources/schemas"/>
-    </war>
-  </target>
-  
-  <!-- package moa-id-proxy.war -->
-  <target name="package-proxy" depends="compile">
-    <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.axis}"/>
-      <lib dir="${lib.jaxen}"/>
-      <lib dir="${lib.iaik-moa}" excludes="iaik_jce_full.jar,iaik_ldap.jar"/>
-      <lib dir="${lib.moa-spss}" includes="moa-common.jar"/>
-      <lib dir="${lib.commons-logging}" includes="commons-logging.jar"/>
-      <lib dir="${lib.xalan}"/>
-      <lib dir="${lib.jaxp}"/>
-      <lib dir="${lib.log4j}"/>
-      <lib dir="${lib.postgres-jdbc}"/>
-      <lib dir="${lib.dav4j}"/>
-      <classes dir="${compile}">
-        <exclude name="**/auth/**"/>
-        <exclude name="test/**"/>
-      </classes>
-      <classes dir="${res}"/>
-    </war>
-  </target>
-
-
- 
-  <!-- create JavaDoc for the MOA-ID API -->
-  <target name="api-doc" depends="compile">
-    <javadoc defaultexcludes="yes"
-           destdir="${api-doc}"
-           author="false"
-           version="false"
-           use="true"
-           windowtitle="MOA ID API"
-           useexternalfile="yes"
-           sourcefiles=
-             "src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java,src/at/gv/egovernment/moa/id/AuthenticationException.java,src/at/gv/egovernment/moa/id/data/AuthenticationData.java,src/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.java,src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java,src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java,src/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java,src/at/gv/egovernment/moa/id/proxy/NotAllowedException.java"
-      >
-      <link offline="false" href="http://java.sun.com/j2se/1.3/docs/api/"/>
-      <doctitle><![CDATA[<h1>MOA ID API</h1>]]></doctitle>
-      <classpath refid="compile.classpath"/>
-    </javadoc>
-  </target>
-  
-  <!-- create JavaDoc for the server internal classes -->
-  <target name="api-doc-internal" depends="compile">
-    <javadoc defaultexcludes="yes"
-           destdir="${api-doc.internal}"
-           author="true"
-           version="true"
-           use="true"
-           windowtitle="MOA ID Server Internal API"
-           useexternalfile="yes">
-      <packageset dir="${prj.common}/src">
-        <exclude name="test/**"/>
-      </packageset>
-      <packageset dir="src">
-        <exclude name="test/**"/>
-      </packageset>
-      <group title="MOA ID Exception Classes"
-             packages="at.gv.egovernment.moa.id">
-      </group>
-      <group title="MOA ID Configuration">
-        <package name="at.gv.egovernment.moa.id.config"/>
-        <package name="at.gv.egovernment.moa.id.config.auth"/>
-        <package name="at.gv.egovernment.moa.id.config.proxy"/>
-      </group>
-      <group title="MOA ID Authentication Server">
-        <package name="at.gv.egovernment.moa.id.auth"/>
-        <package name="at.gv.egovernment.moa.id.auth.builder"/>
-        <package name="at.gv.egovernment.moa.id.auth.data"/>
-        <package name="at.gv.egovernment.moa.id.auth.invoke"/>
-        <package name="at.gv.egovernment.moa.id.auth.parser"/>
-        <package name="at.gv.egovernment.moa.id.auth.validator"/>
-      </group>
-      <group title="MOA ID Authentication Servlets and Web Services">
-        <package name="at.gv.egovernment.moa.id.auth.servlet"/>
-      </group>
-      <group title="MOA ID Data Classes">
-        <package name="at.gv.egovernment.moa.id.data"/>
-      </group>
-      <group title="MOA ID TrustManager">
-        <package name="at.gv.egovernment.moa.id.iaik.pki.jsse"/>
-        <package name="at.gv.egovernment.moa.id.iaik.pki"/>
-        <package name="at.gv.egovernment.moa.id.iaik.config"/>
-        <package name="at.gv.egovernment.moa.id.iaik.servertools.observer"/>
-      </group>
-      <group title="MOA ID Proxy Server">
-        <package name="at.gv.egovernment.moa.id.proxy"/>
-        <package name="at.gv.egovernment.moa.id.proxy.builder"/>
-        <package name="at.gv.egovernment.moa.id.proxy.invoke"/>
-        <package name="at.gv.egovernment.moa.id.proxy.parser"/>
-      </group>
-      <group title="MOA ID Proxy Servlet">
-        <package name="at.gv.egovernment.moa.id.proxy.servlet"/>
-      </group>
-      <group title="Utilities">
-        <package name="at.gv.egovernment.moa.util"/>
-        <package name="at.gv.egovernment.moa.id.util"/>
-      </group>
-      <group title="Logging">
-        <package name="at.gv.egovernment.moa.logging"/>
-      </group>
-      <link offline="false" href="http://java.sun.com/j2se/1.3/docs/api/"/>
-      <link offline="false" href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
-      <doctitle><![CDATA[<h1>MOA ID Server Internal API</h1>]]></doctitle>
-      <classpath refid="compile.classpath"/>
-    </javadoc>
-  </target>
-  
-  <!-- create the moa-id-auth distributable -->
-  <target name="dist-auth" depends="package-auth">
-    <copy toDir="${dist.auth}/conf">
-      <fileset dir="${data}/deploy/conf" excludes="moa-id/oa/**"/>
-    </copy>
-    <mkdir dir="${dist.auth}/conf/moa-id/certs/certstore"/>    
-    <mkdir dir="${dist.auth}/conf/moa-id/certs/ca-certs"/>    
-    <mkdir dir="${dist.auth}/conf/moa-id/certs/server-certs"/>        
-    <copy todir="${dist.auth}/doc">
-      <fileset dir="${doc}"/>
-    </copy>
-    <copy toDir="${dist.auth}/ext13">
-      <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar,iaik_ldap.jar"/>
-      <fileset dir="${lib.jsse}"/>
-    </copy>
-    <copy toDir="${dist.auth}/ext14">
-      <fileset dir="${lib.iaik-moa}/signed" includes="iaik_jce_full.jar,iaik_ldap.jar"/>
-    </copy>
-    <copy toDir="${dist.auth}/endorsed">
-      <fileset dir="${lib.xerces}"/>
-      <fileset dir="${lib.xalan}"/>
-    </copy>
-    <copy todir="${dist.auth}/tomcat">
-      <fileset dir="${data}/deploy/tomcat"/>
-    </copy>
-    <copy todir="${dist.auth}/templates">
-      <fileset dir="${data}/deploy/templates"/>
-    </copy>
-  	<copy toDir="${dist.auth}/">
-  	      <fileset dir="${projectroot}/" includes="history.txt" />
-  	</copy>    
-  </target>
-  
-  <!-- create the zipped moa-id-auth distributable -->
-  <target name="dist-auth-zip" depends="dist-auth">
-    <zip zipfile="${dist.auth-zip}/moa-id-auth-${version}.zip">
-      <zipfileset dir="${dist.auth}" prefix="moa-id-auth-${version}"/>
-    </zip>
-  </target>
-  
-  <!-- create the moa-id-proxy distributable -->
-  <target name="dist-proxy" depends="package-proxy">
-    <copy toDir="${dist.proxy}/conf">
-      <fileset dir="${data}/deploy/conf" excludes="moa-spss/**,moa-id/transforms/**"/>
-    </copy>
-    <mkdir dir="${dist.proxy}/conf/moa-id/certs/certstore"/>    
-    <mkdir dir="${dist.proxy}/conf/moa-id/certs/ca-certs"/>    
-    <mkdir dir="${dist.proxy}/conf/moa-id/certs/server-certs"/>        
-    <copy todir="${dist.proxy}/doc">
-      <fileset dir="${doc}"/>
-    </copy>
-    <copy toDir="${dist.proxy}/ext13">
-      <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar,iaik_ldap.jar"/>
-      <fileset dir="${lib.jsse}"/>
-    </copy>
-    <copy toDir="${dist.proxy}/ext14">
-      <fileset dir="${lib.iaik-moa}/signed" includes="iaik_jce_full.jar,iaik_ldap.jar"/>
-    </copy>
-    <copy toDir="${dist.proxy}/endorsed">
-      <fileset dir="${lib.xerces}"/>
-      <fileset dir="${lib.xalan}"/>
-    </copy>
-    <copy todir="${dist.proxy}/tomcat">
-      <fileset dir="${data}/deploy/tomcat"/>
-    </copy>
-    <copy todir="${dist.proxy}/templates">
-      <fileset dir="${data}/deploy/templates"/>
-    </copy>
-  	<copy toDir="${dist.proxy}/">
-  	      <fileset dir="${projectroot}/" includes="history.txt" />
-  	</copy>        
-  </target>
-  
-  <!-- create the zipped moa-id-proxy distributable -->
-  <target name="dist-proxy-zip" depends="dist-proxy">
-    <zip zipfile="${dist.proxy-zip}/moa-id-proxy-${version}.zip">
-      <zipfileset dir="${dist.proxy}" prefix="moa-id-proxy-${version}"/>
-    </zip>
-  </target>
-  
-  <!-- create the source distributable -->
-  <target name="dist-src" depends="init">
-    <copy toDir="${dist.src}/build">
-      <fileset dir="${prj.build}"/>
-    </copy>
-    <copy toDir="${dist.src}/common">
-      <fileset dir="${prj.common}" excludes="tmp/**, bin/**"/>
-    </copy>
-    <copy toDir="${dist.src}/id.server">
-      <fileset dir="." excludes="tmp/**, bin/**"/>
-    </copy>
-    <copy toDir="${dist.src}/id.oa">
-      <fileset dir="${prj.oa}" excludes="tmp/**"/>
-    </copy>
-  </target>
-  
-  <!-- create the source distributable, including javadoc -->
-  <target name="dist-src-doc" depends="dist-src,api-doc-internal">
-    <copy toDir="${dist.src}/doc/api-doc-internal">
-      <fileset dir="${api-doc.internal}"/>
-    </copy>
-  </target>
-  
-  <!-- create the zipped source distributable -->
-  <target name="dist-src-zip" depends="init,dist-src-doc">
-    <zip zipfile="${dist.src-zip}/moa-id-${version}-src.zip">
-      <zipfileset dir="${dist.src}" prefix="moa-id-${version}-src"/>
-    </zip>
-  </target>
-  
-  <!-- create all the distributables -->
-  <target name="dist-all" depends="dist-auth-zip,dist-proxy-zip,dist-src-zip"/>
-  
-  <!-- deploy moa-id-auth to catalina (needs MOA_AUTH_DEPLOY defined) -->
-  <target name="deploy-auth" depends="dist-auth">
-	<fail message="env.MOA_AUTH_DEPLOY not set" unless="env.MOA_AUTH_DEPLOY"/>
-	<property name="deploy" value="${env.MOA_AUTH_DEPLOY}"/>
-	<property name="deploy.webapps" value="${deploy}/webapps"/>
-    <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">
-      <fileset dir="${dist.auth}/conf"/>
-    </copy -->
-    <!-- copy libraries to MOA_AUTH_DEPLOY/common/endorsed -->
-    <copy toDir="${deploy}/common/endorsed">
-      <fileset dir="${dist.auth}/endorsed"/>
-    </copy>
-  </target>
-  
-  <!-- deploy moa-id-proxy to catalina (needs MOA_PROXY_DEPLOY defined) -->
-  <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}/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">
+	<property environment="env"/>
+	<property name="version" value="1.2.0d11"/>
+	<property name="projectroot" value="."/>
+	<property name="src" value="src"/>
+	<property name="res" value="res"/>
+	<property name="data" value="data"/>
+	<property name="doc" value="doc"/>
+	<property name="html" value="html"/>
+	<property name="html.auth" value="${html}/auth"/>
+	<property name="webinf.auth" value="${html.auth}/WEB-INF"/>
+	<property name="html.proxy" value="${html}/proxy"/>
+	<property name="webinf.proxy" value="${html.proxy}/WEB-INF"/>
+	<property name="tmp" value="tmp"/>
+	<property name="compile" value="${tmp}/compile"/>
+	<property name="api-doc" value="${tmp}/api-doc"/>
+	<property name="api-doc.internal" value="${tmp}/api-doc-internal"/>
+	<property name="dist" value="${tmp}/dist"/>
+	<property name="dist.auth" value="${dist}/auth"/>
+	<property name="dist.auth-zip" value="${dist}/auth-zip"/>
+	<property name="dist.proxy" value="${dist}/proxy"/>
+	<property name="dist.proxy-zip" value="${dist}/proxy-zip"/>
+	<property name="dist.src" value="${dist}/src"/>
+	<property name="dist.src-zip" value="${dist}/src-zip"/>
+	<property name="prj.build" value="../build"/>
+	<property name="prj.common" value="../common"/>
+	<property name="prj.oa" value="../id.oa"/>
+	<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.2"/>
+	<property name="lib.iaik-moa" value="${lib}/iaik-moa-20030703/full"/>
+	<property name="lib.iaik-moa-eval" value="${lib}/iaik-moa-20030703/eval"/>
+	<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_03"/>
+	<property name="lib.junit" value="${lib}/junit-3.8.1"/>
+	<property name="lib.log4j" value="${lib}/log4j-1.2.8"/>
+	<property name="lib.moa-spss" value="${lib}/moa-spss-1.2d04"/>
+	<property name="lib.postgres-jdbc" value="${lib}/postgres-jdbc2-7.3"/>
+	<property name="lib.servlet" value="${lib}/servlet-2.3"/>
+	<property name="lib.xalan" value="${lib}/xalan-j-2.5.1"/>
+	<property name="lib.xerces" value="${lib}/xerces-j-2.4.0"/>
+	<property name="lib.regexp" value="${lib}/regexp-1.3"/>
+	<property name="lib.dav4j" value="${lib}/dav4j"/>
+	<property name="lib.mail" value="${lib}/tomcat-libs"/>
+	<property name="lib.activation" value="${lib}/tomcat-libs"/>
+	<path id="compile.iaik.full" description="IAIK libraries for commercial use (jdk1.3)">
+		<pathelement location="${lib.iaik-moa}/iaik-moa-full.jar"/>
+		<pathelement location="${lib.iaik-moa}/iaik_ecc.jar"/>
+		<pathelement location="${lib.iaik-moa}/iaik_ldap.jar"/>
+		<pathelement location="${lib.iaik-moa}/iaik_X509TrustManager.jar"/>
+		<pathelement location="${lib.iaik-moa}/iaik_jce_full.jar"/>
+		<pathelement location="${lib.iaik-moa}ixsil.jar"/>
+	</path>
+	<path id="compile.iaik.full.signed" description="IAIK libraries for commercial use (jdk1.4 and higher)">
+		<pathelement location="${lib.iaik-moa}/iaik-moa-full.jar"/>
+		<pathelement location="${lib.iaik-moa}/signed/iaik_ecc.jar"/>
+		<pathelement location="${lib.iaik-moa}/iaik_ldap.jar"/>
+		<pathelement location="${lib.iaik-moa}/iaik_X509TrustManager.jar"/>
+		<pathelement location="${lib.iaik-moa}/signed/iaik_jce_full.jar"/>
+		<pathelement location="${lib.iaik-moa}ixsil.jar"/>
+	</path>
+	<path id="compile.iaik.eval" description="IAIK libraries for educational and research use (jdk1.3)">
+		<pathelement location="${lib.iaik-moa-eval}/iaik-moa-full.jar"/>
+		<pathelement location="${lib.iaik-moa-eval}/iaik_ecc.jar"/>
+		<pathelement location="${lib.iaik-moa-eval}/iaik_ldap.jar"/>
+		<pathelement location="${lib.iaik-moa-eval}/iaik_X509TrustManager.jar"/>
+		<pathelement location="${lib.iaik-moa-eval}/iaik_jce_full.jar"/>
+		<pathelement location="${lib.iaik-moa-eval}ixsil.jar"/>
+	</path>
+	<path id="compile.iaik.eval.signed" description="IAIK libraries for educational and research use (jdk1.4 and higher)">	
+		<pathelement location="${lib.iaik-moa-eval}/iaik-moa-full.jar"/>
+		<pathelement location="${lib.iaik-moa-eval}/signed/iaik_ecc.jar"/>
+		<pathelement location="${lib.iaik-moa-eval}/iaik_ldap.jar"/>
+		<pathelement location="${lib.iaik-moa-eval}/iaik_X509TrustManager.jar"/>
+		<pathelement location="${lib.iaik-moa-eval}/signed/iaik_jce_full.jar"/>
+		<pathelement location="${lib.iaik-moa-eval}ixsil.jar"/>
+	</path>
+	<path id="compile.basepath" description="compile paths without IAIK libraries">
+		<pathelement location="${lib.axis}/axis.jar"/>
+		<pathelement location="${lib.axis}/jaxrpc.jar"/>
+		<pathelement location="${lib.axis}/saaj.jar"/>
+		<pathelement location="${lib.jaxp}/jaxp-api.jar"/>
+		<pathelement location="${lib.jaxp}/dom.jar"/>
+		<pathelement location="${lib.jaxp}/sax.jar"/>
+		<pathelement location="${lib.xerces}/xerces.jar"/>
+		<pathelement location="${lib.jaxen}/jaxen-core.jar"/>
+		<pathelement location="${lib.jaxen}/jaxen-dom.jar"/>
+		<pathelement location="${lib.jaxen}/saxpath.jar"/>
+		<pathelement location="${lib.xalan}/xalan.jar"/>
+		<pathelement location="${lib.junit}/junit.jar"/>
+		<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"/>
+		<fileset dir="${lib.jsse}"/>
+		<pathelement location="${lib.commons-logging}/commons-logging-api.jar"/>
+		<pathelement location="${lib.commons-discovery}/commons-discovery.jar"/>
+		<pathelement location="${lib.servlet}/servlet-2_3-fcs-classfiles.zip"/>
+		<pathelement location="${lib.moa-spss}/moa-common.jar"/>
+		<pathelement location="${lib.moa-spss}/moa-spss.jar"/>
+		<pathelement location="${env.MOA_COMMON_TEST_JAR}"/>
+	</path>
+	<path id="compile.classpath" description="classpath with IAIK unsigned libraries for commercial use">
+		<path refid="compile.basepath"/>
+		<path refid="compile.iaik.full"/>		
+	</path>
+	<path id="compile.classpath.signed" description="classpath with IAIK signed libraries for commercial use">
+		<path refid="compile.basepath"/>
+		<path refid="compile.iaik.full.signed"/>
+	</path>
+	<path id="compile.classpath.eval" description="classpath with IAIK unsigned libraries for educational and research use">
+		<path refid="compile.basepath"/>
+		<path refid="compile.iaik.eval"/>
+	</path>
+	<path id="compile.classpath.eval.signed" description="classpath with IAIK signed libraries for educational and research use">
+		<path refid="compile.basepath"/>
+		<path refid="compile.iaik.eval.signed"/>
+	</path>
+	<!-- set up directories etc. -->
+	<target name="init">
+		<tstamp/>
+		<echo>Time (hhmm): ${TSTAMP}</echo>
+		<mkdir dir="${tmp}"/>
+		<mkdir dir="${compile}"/>
+		<mkdir dir="${api-doc.internal}"/>
+		<mkdir dir="${dist.auth}"/>
+		<mkdir dir="${dist.auth-zip}"/>
+		<mkdir dir="${dist.proxy}"/>
+		<mkdir dir="${dist.proxy-zip}"/>
+		<mkdir dir="${dist.src}"/>
+		<mkdir dir="${dist.src-zip}"/>
+	</target>
+	<!-- compile everything -->
+	<target name="compile" depends="init" description="compiles with IAIK unsigned libraries for commercial use and target jdk1.3">
+		<echo message="compiling with IAIK libraries for commercial use (target VM version: 1.3)"/>
+		<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="1.3"/>
+	</target>
+	<target name="compile-signed" depends="init" description="compiles with IAIK signed libraries for commercial use and target derived from the JVM used for running Ant (recommended: 1.4 or higher)">
+		<echo message="compiling with IAIK libraries for commercial use (target VM version: same as used for running ant)"/>
+		<fail message="env.MOA_COMMON_TEST_JAR not set" unless="env.MOA_COMMON_TEST_JAR"/>
+		<echo>classpathref= ${lib.iaik-moa}/signed</echo>
+		<javac srcdir="${src}" destdir="${compile}" classpathref="compile.classpath.signed" debug="on"/>
+	</target>
+	<target name="compile-eval" depends="init" description="compiles with IAIK unsigned libraries for research and educational use and target jdk1.3">
+		<echo message="compiling with IAIK libraries for research and educational use (target VM version: 1.3)"/>
+		<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.eval" debug="on" target="1.3"/>
+	</target>
+	<target name="compile-eval-signed" depends="init" description="compiles with IAIK signed libraries for research and educational use and target derived from the JVM used for running Ant (recommended: 1.4 or higher)">
+		<echo message="compiling with IAIK libraries for research and educational use (target VM version: same as used for running ant)"/>
+		<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.eval" debug="on"/>
+	</target>
+	<!-- package moa-id-auth.war -->
+	<target name="package-auth-base" description="base target for moa-id-auth.war file for commercial use">
+		<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.axis}"/>
+			<lib dir="${lib.jaxen}"/>
+			<lib dir="${lib.iaik-moa}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar,signed/,linux/libpkcs11wrapper.so,solaris/libpkcs11wrapper.so"/>
+			<lib dir="${lib.moa-spss}"/>
+			<lib dir="${lib.postgres-jdbc}"/>
+			<lib dir="${lib.commons-logging}" includes="commons-logging.jar"/>
+			<lib dir="${lib.jaxp}"/>
+			<lib dir="${lib.log4j}"/>
+			<lib dir="${lib.regexp}"/>
+			<classes dir="${compile}">
+				<exclude name="**/proxy/**"/>
+				<exclude name="test/**"/>
+			</classes>
+			<classes dir="${res}"/>
+			<zipfileset file="${res}/resources/wsdl/MOA-SPSS-1.2.xsd" prefix="resources/schemas"/>
+		</war>
+	</target>
+	<target name="package-auth-base-eval" description="base target for moa-id-auth.war file for educational and research use">
+		<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.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"/>
+			<lib dir="${lib.moa-spss}"/>
+			<lib dir="${lib.postgres-jdbc}"/>
+			<lib dir="${lib.commons-logging}" includes="commons-logging.jar"/>
+			<lib dir="${lib.jaxp}"/>
+			<lib dir="${lib.log4j}"/>
+			<lib dir="${lib.regexp}"/>
+			<classes dir="${compile}">
+				<exclude name="**/proxy/**"/>
+				<exclude name="test/**"/>
+			</classes>
+			<classes dir="${res}"/>
+			<zipfileset file="${res}/resources/wsdl/MOA-SPSS-1.2.xsd" prefix="resources/schemas"/>
+		</war>
+	</target>
+	<target name="package-auth" depends="compile,package-auth-base" description="creates war file with IAIK libraries (jdk1.3) for commercial use"/>
+	<target name="package-auth-signed" depends="compile-signed,package-auth-base" description="creates war file with signed IAIK libraries (jdk1.4 and higher) for commercial use"/>
+	<target name="package-auth-eval" depends="compile-eval,package-auth-base-eval" description="creates war file with IAIK libraries (jdk1.3) for educational and research use"/>
+	<target name="package-auth-eval-signed" depends="compile-eval-signed,package-auth-base-eval" description="creates war file with signedIAIK libraries (jdk1.4 and higher) for educational and research use"/>
+	<!-- package moa-id-proxy.war -->
+	<target name="package-proxy-base" 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.axis}"/>
+			<lib dir="${lib.jaxen}"/>
+			<lib dir="${lib.iaik-moa}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar,signed/,linux/libpkcs11wrapper.so,solaris/libpkcs11wrapper.so"/>
+			<lib dir="${lib.moa-spss}" includes="moa-common.jar"/>
+			<lib dir="${lib.commons-logging}" includes="commons-logging.jar"/>
+			<lib dir="${lib.jaxp}"/>
+			<lib dir="${lib.log4j}"/>
+			<lib dir="${lib.postgres-jdbc}"/>
+			<lib dir="${lib.dav4j}"/>
+			<classes dir="${compile}">
+				<exclude name="**/auth/**"/>
+				<exclude name="test/**"/>
+			</classes>
+			<classes dir="${res}"/>
+		</war>
+	</target>
+	<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.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"/>
+			<lib dir="${lib.moa-spss}" includes="moa-common.jar"/>
+			<lib dir="${lib.commons-logging}" includes="commons-logging.jar"/>
+			<lib dir="${lib.jaxp}"/>
+			<lib dir="${lib.log4j}"/>
+			<lib dir="${lib.postgres-jdbc}"/>
+			<lib dir="${lib.dav4j}"/>
+			<classes dir="${compile}">
+				<exclude name="**/auth/**"/>
+				<exclude name="test/**"/>
+			</classes>
+			<classes dir="${res}"/>
+		</war>
+	</target>
+	<target name="package-proxy" depends="compile,package-proxy-base" description="creates war file with IAIK libraries (jdk1.3) for commercial use"/>
+	<target name="package-proxy-signed" depends="compile-signed,package-proxy-base" description="creates war file with signed IAIK libraries (jdk1.4 and higher) for commercial use"/>
+	<target name="package-proxy-eval" depends="compile-eval,package-proxy-base-eval" description="creates war file with IAIK libraries (jdk1.3) for educational and research use"/>
+	<target name="package-proxy-eval-signed" depends="compile-eval-signed,package-proxy-base-eval" description="creates war file with signedIAIK libraries (jdk1.4 and higher) for educational and research use"/>
+	<!-- create JavaDoc for the MOA-ID API -->
+	<target name="api-doc" depends="compile">
+		<javadoc defaultexcludes="yes" destdir="${api-doc}" author="false" version="false" use="true" windowtitle="MOA ID API" useexternalfile="yes" sourcefiles="src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java,src/at/gv/egovernment/moa/id/AuthenticationException.java,src/at/gv/egovernment/moa/id/data/AuthenticationData.java,src/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.java,src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java,src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java,src/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java,src/at/gv/egovernment/moa/id/proxy/NotAllowedException.java">
+			<link offline="false" href="http://java.sun.com/j2se/1.3/docs/api/"/>
+			<doctitle><![CDATA[<h1>MOA ID API</h1>]]></doctitle>
+			<classpath refid="compile.classpath"/>
+		</javadoc>
+	</target>
+	<!-- create JavaDoc for the server internal classes -->
+	<target name="api-doc-internal" depends="compile">
+		<javadoc defaultexcludes="yes" destdir="${api-doc.internal}" author="true" version="true" use="true" windowtitle="MOA ID Server Internal API" useexternalfile="yes">
+			<packageset dir="${prj.common}/src">
+				<exclude name="test/**"/>
+			</packageset>
+			<packageset dir="src">
+				<exclude name="test/**"/>
+			</packageset>
+			<group title="MOA ID Exception Classes" packages="at.gv.egovernment.moa.id"/>
+			<group title="MOA ID Configuration">
+				<package name="at.gv.egovernment.moa.id.config"/>
+				<package name="at.gv.egovernment.moa.id.config.auth"/>
+				<package name="at.gv.egovernment.moa.id.config.proxy"/>
+			</group>
+			<group title="MOA ID Authentication Server">
+				<package name="at.gv.egovernment.moa.id.auth"/>
+				<package name="at.gv.egovernment.moa.id.auth.builder"/>
+				<package name="at.gv.egovernment.moa.id.auth.data"/>
+				<package name="at.gv.egovernment.moa.id.auth.invoke"/>
+				<package name="at.gv.egovernment.moa.id.auth.parser"/>
+				<package name="at.gv.egovernment.moa.id.auth.validator"/>
+			</group>
+			<group title="MOA ID Authentication Servlets and Web Services">
+				<package name="at.gv.egovernment.moa.id.auth.servlet"/>
+			</group>
+			<group title="MOA ID Data Classes">
+				<package name="at.gv.egovernment.moa.id.data"/>
+			</group>
+			<group title="MOA ID TrustManager">
+				<package name="at.gv.egovernment.moa.id.iaik.pki.jsse"/>
+				<package name="at.gv.egovernment.moa.id.iaik.pki"/>
+				<package name="at.gv.egovernment.moa.id.iaik.config"/>
+				<package name="at.gv.egovernment.moa.id.iaik.servertools.observer"/>
+			</group>
+			<group title="MOA ID Proxy Server">
+				<package name="at.gv.egovernment.moa.id.proxy"/>
+				<package name="at.gv.egovernment.moa.id.proxy.builder"/>
+				<package name="at.gv.egovernment.moa.id.proxy.invoke"/>
+				<package name="at.gv.egovernment.moa.id.proxy.parser"/>
+			</group>
+			<group title="MOA ID Proxy Servlet">
+				<package name="at.gv.egovernment.moa.id.proxy.servlet"/>
+			</group>
+			<group title="Utilities">
+				<package name="at.gv.egovernment.moa.util"/>
+				<package name="at.gv.egovernment.moa.id.util"/>
+			</group>
+			<group title="Logging">
+				<package name="at.gv.egovernment.moa.logging"/>
+			</group>
+			<link offline="false" href="http://java.sun.com/j2se/1.3/docs/api/"/>
+			<link offline="false" href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
+			<doctitle><![CDATA[<h1>MOA ID Server Internal API</h1>]]></doctitle>
+			<classpath refid="compile.classpath"/>
+		</javadoc>
+	</target>
+	<!-- create the moa-id-auth distributable -->
+	<target name="copy-iaik-ext">
+		<copy toDir="${dist.auth}/ext13">
+			<fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar"/>
+			<fileset dir="${lib.jsse}"/>
+		</copy>
+		<copy toDir="${dist.auth}/ext14">
+			<fileset dir="${lib.iaik-moa}/signed" includes="*.jar"/>
+		</copy>
+	</target>
+	<target name="copy-iaik-ext-eval">
+		<copy toDir="${dist.auth}/ext13">
+			<fileset dir="${lib.iaik-moa-eval}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar"/>
+			<fileset dir="${lib.jsse}"/>
+		</copy>
+		<copy toDir="${dist.auth}/ext14">
+			<fileset dir="${lib.iaik-moa-eval}/signed" includes="*.jar"/>
+		</copy>
+	</target>
+	<target name="dist-auth-base" description="does all work for building a moa-id-auth distributable except of copying IAIK libraries">
+		<copy toDir="${dist.auth}/conf">
+			<fileset dir="${data}/deploy/conf" excludes="moa-id/oa/**"/>
+		</copy>
+		<mkdir dir="${dist.auth}/conf/moa-id/certs/certstore"/>
+		<mkdir dir="${dist.auth}/conf/moa-id/certs/ca-certs"/>
+		<mkdir dir="${dist.auth}/conf/moa-id/certs/server-certs"/>
+		<copy todir="${dist.auth}/doc">
+			<fileset dir="${doc}"/>
+		</copy>
+		<copy toDir="${dist.auth}/endorsed">
+			<fileset dir="${lib.xerces}"/>
+			<fileset dir="${lib.xalan}"/>
+		</copy>
+		<copy todir="${dist.auth}/tomcat">
+			<fileset dir="${data}/deploy/tomcat"/>
+		</copy>
+		<copy todir="${dist.auth}/templates">
+			<fileset dir="${data}/deploy/templates"/>
+		</copy>
+		<copy toDir="${dist.auth}/">
+			<fileset dir="${projectroot}/" includes="history.txt"/>
+		</copy>
+	</target>
+	<target name="dist-auth" depends="package-auth,dist-auth-base,copy-iaik-ext" description="builds moa-id-auth distributable with IAIK libraries (jdk1.3) for commercial use"/>
+	<target name="dist-auth-signed" depends="package-auth-signed,dist-auth-base, copy-iaik-ext" description="builds moa-id-auth distributable with IAIK libraries (jdk1.4 and higher) for commercial use"/>
+	<target name="dist-auth-eval" depends="package-auth-eval,dist-auth-base,copy-iaik-ext-eval" description="builds moa-id-auth distributable with IAIK libraries (jdk1.3) for research and educational use"/>
+	<target name="dist-auth-eval-signed" depends="package-auth-eval-signed,dist-auth-base,copy-iaik-ext-eval" description="builds moa-id-auth distributable with IAIK libraries (jdk1.4 and higher) for research and educational use"/>
+	<!-- create the zipped moa-id-auth distributable -->
+	<target name="dist-auth-zip-base">
+		<zip zipfile="${dist.auth-zip}/moa-id-auth-${version}.zip">
+			<zipfileset dir="${dist.auth}" prefix="moa-id-auth-${version}"/>
+		</zip>
+	</target>
+	<target name="dist-auth-zip" depends="dist-auth,dist-auth-zip-base" description="zips moa-id-auth distributable with IAIK libraries (jdk1.3) for commercial use"/>
+	<target name="dist-auth-zip-signed" depends="dist-auth-signed,dist-auth-zip-base" description="zips moa-id-auth distributable with IAIK libraries (jdk1.4 and higher) for commercial use"/>
+	<target name="dist-auth-zip-eval" depends="dist-auth-eval,dist-auth-zip-base" description="zips moa-id-auth distributable with IAIK libraries (jdk1.3) for research and educational use"/>
+	<target name="dist-auth-zip-eval-signed" depends="dist-auth-eval-signed,dist-auth-zip-base" description="zips moa-id-auth distributable with IAIK libraries (jdk1.3) for research and educational use"/>
+	<!-- create the moa-id-proxy distributable -->
+	<target name="copy-iaik-ext-proxy">
+		<copy toDir="${dist.proxy}/ext13">
+			<fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar"/>
+			<fileset dir="${lib.jsse}"/>
+		</copy>
+		<copy toDir="${dist.proxy}/ext14">
+			<fileset dir="${lib.iaik-moa}/signed" includes="*.jar"/>
+		</copy>
+	</target>
+	<target name="copy-iaik-ext-eval-proxy">
+		<copy toDir="${dist.proxy}/ext13">
+			<fileset dir="${lib.iaik-moa-eval}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar"/>
+			<fileset dir="${lib.jsse}"/>
+		</copy>
+		<copy toDir="${dist.proxy}/ext14">
+			<fileset dir="${lib.iaik-moa-eval}/signed" includes="*.jar"/>
+		</copy>
+	</target>
+	<target name="dist-proxy-base" description="does all work for building a moa-id-proxy distributable except of copying IAIK libraries">
+		<copy toDir="${dist.proxy}/conf">
+			<fileset dir="${data}/deploy/conf" excludes="moa-spss/**,moa-id/transforms/**"/>
+		</copy>
+		<mkdir dir="${dist.proxy}/conf/moa-id/certs/certstore"/>
+		<mkdir dir="${dist.proxy}/conf/moa-id/certs/ca-certs"/>
+		<mkdir dir="${dist.proxy}/conf/moa-id/certs/server-certs"/>
+		<copy todir="${dist.proxy}/doc">
+			<fileset dir="${doc}"/>
+		</copy>
+		<copy toDir="${dist.proxy}/endorsed">
+			<fileset dir="${lib.xerces}"/>
+			<fileset dir="${lib.xalan}"/>
+		</copy>
+		<copy todir="${dist.proxy}/tomcat">
+			<fileset dir="${data}/deploy/tomcat"/>
+		</copy>
+		<copy todir="${dist.proxy}/templates">
+			<fileset dir="${data}/deploy/templates"/>
+		</copy>
+		<copy toDir="${dist.proxy}/">
+			<fileset dir="${projectroot}/" includes="history.txt"/>
+		</copy>
+	</target>
+	<target name="dist-proxy" depends="package-proxy,dist-proxy-base,copy-iaik-ext-proxy" description="builds moa-id-proxy distributable with IAIK libraries (jdk1.3) for commercial use"/>
+	<target name="dist-proxy-signed" depends="package-proxy-signed,dist-proxy-base, copy-iaik-ext-proxy" description="builds moa-id-proxy distributable with IAIK libraries (jdk1.4 and higher) for commercial use"/>
+	<target name="dist-proxy-eval" depends="package-proxy-eval,dist-proxy-base,copy-iaik-ext-eval-proxy" description="builds moa-id-proxy distributable with IAIK libraries (jdk1.3) for research and educational use"/>
+	<target name="dist-proxy-eval-signed" depends="package-proxy-eval-signed,dist-proxy-base,copy-iaik-ext-eval-proxy" description="builds moa-id-proxy distributable with IAIK libraries (jdk1.4 and higher) for research and educational use"/>
+	<!-- create the zipped moa-id-proxy distributable -->
+	<target name="dist-proxy-zip-base">
+		<zip zipfile="${dist.proxy-zip}/moa-id-proxy-${version}.zip">
+			<zipfileset dir="${dist.proxy}" prefix="moa-id-proxy-${version}"/>
+		</zip>
+	</target>
+	<target name="dist-proxy-zip" depends="dist-proxy,dist-proxy-zip-base" description="zips moa-id-proxy distributable with IAIK libraries (jdk1.3) for commercial use"/>
+	<target name="dist-proxy-zip-signed" depends="dist-proxy-signed,dist-proxy-zip-base" description="zips moa-id-proxy distributable with IAIK libraries (jdk1.4 and higher) for commercial use"/>
+	<target name="dist-proxy-zip-eval" depends="dist-proxy-eval,dist-proxy-zip-base" description="zips moa-id-proxy distributable with IAIK libraries (jdk1.3) for research and educational use"/>
+	<target name="dist-proxy-zip-eval-signed" depends="dist-proxy-eval-signed,dist-proxy-zip-base" description="zips moa-id-proxy distributable with IAIK libraries (jdk1.3) for research and educational use"/>
+	<!-- create the source distributable -->
+	<target name="dist-src" depends="init">
+		<copy toDir="${dist.src}/build">
+			<fileset dir="${prj.build}"/>
+		</copy>
+		<copy toDir="${dist.src}/common">
+			<fileset dir="${prj.common}" excludes="tmp/**, bin/**"/>
+		</copy>
+		<copy toDir="${dist.src}/id.server">
+			<fileset dir="." excludes="tmp/**, bin/**"/>
+		</copy>
+		<copy toDir="${dist.src}/id.oa">
+			<fileset dir="${prj.oa}" excludes="tmp/**"/>
+		</copy>
+	</target>
+	<!-- create the source distributable, including javadoc -->
+	<target name="dist-src-doc" depends="dist-src,api-doc-internal">
+		<copy toDir="${dist.src}/doc/api-doc-internal">
+			<fileset dir="${api-doc.internal}"/>
+		</copy>
+	</target>
+	<!-- create the zipped source distributable -->
+	<target name="dist-src-zip" depends="init,dist-src-doc">
+		<zip zipfile="${dist.src-zip}/moa-id-${version}-src.zip">
+			<zipfileset dir="${dist.src}" prefix="moa-id-${version}-src"/>
+		</zip>
+	</target>
+	<!-- create all the distributables -->
+	<target name="dist-all" depends="dist-auth-zip,dist-proxy-zip,dist-src-zip" description="creates all distributables with IAIK libraries (jdk1.3) for commercial use"/>
+	<target name="dist-all-signed" depends="dist-auth-zip-signed,dist-proxy-zip-signed,dist-src-zip" description="creates all distributables with IAIK libraries (jdk1.4 and higher) for commercial use"/>
+	<target name="dist-all-eval" depends="dist-auth-zip-eval,dist-proxy-zip-eval,dist-src-zip" description="creates all distributables with IAIK libraries (jdk1.3) for research and educational use"/>
+	<target name="dist-all-eval-signed" depends="dist-auth-zip-eval-signed,dist-proxy-zip-eval-signed,dist-src-zip" description="creates all distributables with IAIK libraries (jdk1.4 and higher) for research and educational use"/>
+	<!-- deploy moa-id-auth to catalina (needs MOA_AUTH_DEPLOY defined) -->
+	<target name="deploy-auth-base">
+		<fail message="env.MOA_AUTH_DEPLOY not set" unless="env.MOA_AUTH_DEPLOY"/>
+		<property name="deploy" value="${env.MOA_AUTH_DEPLOY}"/>
+		<property name="deploy.webapps" value="${deploy}/webapps"/>
+		<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">
+      			<fileset dir="${dist.auth}/conf"/>
+   		 </copy -->
+		<!-- copy libraries to MOA_AUTH_DEPLOY/common/endorsed -->
+		<copy toDir="${deploy}/common/endorsed">
+			<fileset dir="${dist.auth}/endorsed"/>
+		</copy>
+	</target>
+	<target name="deploy-auth" depends="dist-auth,deploy-auth-base" description="deploys moa-id-auth with IAIK libraries (jdk1.3) for commercial use"/>
+	<target name="deploy-auth-signed" depends="dist-auth-signed,deploy-auth-base" description="deploys moa-id-auth with IAIK libraries (jdk1.4 and higher) for commercial use"/>
+	<target name="deploy-auth-eval" depends="dist-auth-eval,deploy-auth-base" description="deploys moa-id-auth with IAIK libraries (jdk1.3) for research and educational use"/>
+	<target name="deploy-auth-eval-signed" depends="dist-auth-eval-signed,deploy-auth-base" description="deploys moa-id-auth with IAIK libraries (jdk1.4 and higher) for research and educational use"/>
+	<!-- deploy moa-id-proxy to catalina (needs MOA_PROXY_DEPLOY defined) -->
+	<target name="deploy-proxy-base">
+		<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}/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">
       <fileset dir="${dist.proxy}/conf"/>
     </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">
-    <delete dir="${tmp}"/>
-  </target>
+		<!-- copy libraries to MOA_PROXY_DEPLOY/common/endorsed -->
+		<copy toDir="${deploy.proxy}/common/endorsed">
+			<fileset dir="${dist.proxy}/endorsed"/>
+		</copy>
+	</target>
+	<target name="deploy-proxy" depends="dist-proxy,deploy-proxy-base" description="deploys moa-id-proxy with IAIK libraries (jdk1.3) for commercial use"/>
+	<target name="deploy-proxy-signed" depends="dist-proxy-signed,deploy-proxy-base" description="deploys moa-id-proxy with IAIK libraries (jdk1.4 and higher) for commercial use"/>
+	<target name="deploy-proxy-eval" depends="dist-proxy-eval,deploy-proxy-base" description="deploys moa-id-proxy with IAIK libraries (jdk1.3) for research and educational use"/>
+	<target name="deploy-proxy-eval-signed" depends="dist-proxy-eval-signed,deploy-proxy-base" description="deploys moa-id-proxy with IAIK libraries (jdk1.4 and higher) for research and educational use"/>
+	<!-- deploy moa-id-auth configuration to catalina (needs MOA_AUTH_DEPLOY defined) -->
+	<target name="deploy-config-base">
+		<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>
+	<target name="deploy-config" depends="deploy-auth,deploy-proxy,deploy-config-base"/>
+	<target name="deploy-config-signed" depends="deploy-auth-signed,deploy-proxy-signed,deploy-config-base"/>
+	<target name="deploy-config-eval" depends="deploy-auth-eval,deploy-proxy-eval,deploy-config-base"/>
+	<target name="deploy-config-eval-signed" depends="deploy-auth-eval-signed,deploy-proxy-eval-signed,deploy-config-base"/>
+	<!-- deploy proxy and auth component -->
+	<target name="deploy-all" depends="deploy-auth,deploy-proxy" description="deploys with IAIK libraries (jdk1.3) for commercial use"/>
+	<target name="deploy-all-signed" depends="deploy-auth-signed,deploy-proxy-signed" description="deploys with IAIK libraries (jdk1.4 and higher) for commercial use"/>
+	<target name="deploy-all-eval" depends="deploy-auth-eval,deploy-proxy-eval" description="deploys with IAIK libraries (jdk1.3) for research and educational use"/>
+	<target name="deploy-all-eval-signed" depends="deploy-auth-eval-signed,deploy-proxy-eval-signed" description="deploys with IAIK libraries (jdk1.4 and higher) for research and educational use"/>
+	<!-- clean temporary files -->
+	<target name="clean">
+		<delete dir="${tmp}"/>
+	</target>
 </project>