Added options for creating distributables without IAIK libraries included.

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

1 files changed, 194 insertions, 57 deletions

diff --git a/id.server/build.xml b/id.server/build.xml
index 48cfc47ae..736fddb38 100644
--- a/id.server/build.xml
+++ b/id.server/build.xml
@@ -30,6 +30,7 @@
 	<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="dist.iaik" value="${dist}/iaik"/>
 	<property name="prj.build" value="../build"/>
 	<property name="prj.common" value="../common"/>
 	<property name="prj.oa" value="../id.oa"/>
@@ -52,39 +53,44 @@
 	<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)">
+	<!--IAIK libraries for commercial use (target VM=1.3)-->
+	<path id="compile.iaik.full">
 		<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"/>
+		<pathelement location="${lib.iaik-moa}/ixsil.jar"/>
 	</path>
-	<path id="compile.iaik.full.signed" description="IAIK libraries for commercial use (jdk1.4 and higher)">
+	<!--IAIK libraries for commercial use (target VM=1.4 or higher)-->
+	<path id="compile.iaik.full.signed">
 		<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"/>
+		<pathelement location="${lib.iaik-moa}/ixsil.jar"/>
 	</path>
-	<path id="compile.iaik.eval" description="IAIK libraries for educational and research use (jdk1.3)">
+	<!--IAIK libraries for educational and research use (target VM=1.3)-->
+	<path id="compile.iaik.eval">
 		<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"/>
+		<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)">	
+	<!--IAIK libraries for educational and research use (target VM=1.4 or higher)-->
+	<path id="compile.iaik.eval.signed">
 		<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"/>
+		<pathelement location="${lib.iaik-moa-eval}/ixsil.jar"/>
 	</path>
-	<path id="compile.basepath" description="compile paths without IAIK libraries">
+	<!-- classpaths without IAIK libraries -->
+	<path id="compile.basepath">
 		<pathelement location="${lib.axis}/axis.jar"/>
 		<pathelement location="${lib.axis}/jaxrpc.jar"/>
 		<pathelement location="${lib.axis}/saaj.jar"/>
@@ -109,18 +115,22 @@
 		<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">
+	<!--  classpath with IAIK unsigned libraries for commercial use (target VM=1.3) -->
+	<path id="compile.classpath">
 		<path refid="compile.basepath"/>
-		<path refid="compile.iaik.full"/>		
+		<path refid="compile.iaik.full"/>
 	</path>
+	<!--  classpath with IAIK signed libraries for commercial use (target VM=1.4 or higher) -->
 	<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>
+	<!--  classpath with IAIK unsigned libraries for educational and research use (target VM=1.3) -->
 	<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>
+	<!--  classpath with IAIK unsigned libraries for educational and research use (target VM=1.4 or higher)" -->
 	<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"/>
@@ -140,32 +150,33 @@
 		<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">
+	<target name="compile" depends="init" description="compiles with IAIK unsigned libraries for commercial use (target VM=1.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)">
+	<target name="compile-signed" depends="init" description="compiles with IAIK signed libraries for commercial use (VM=VM 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">
+	<target name="compile-eval" depends="init" description="compiles with IAIK unsigned libraries for research and educational use (target VM=1.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>
+		<echo>classpathref= ${lib.iaik-moa-eval}</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)">
+	<target name="compile-eval-signed" depends="init" description="compiles with IAIK signed libraries for research and educational use (VM=VM 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>
+		<echo>classpathref= ${lib.iaik-moa-eval}</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">
+	<!--  base target for moa-id-auth.war file with IAIK libraries for commercial use  -->
+	<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.axis}"/>
@@ -185,7 +196,8 @@
 			<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">
+	<!--  base target for moa-id-auth.war file with IAIK libraries for educational and research use  -->
+	<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.axis}"/>
@@ -205,12 +217,41 @@
 			<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"/>
+	<!--  base target for moa-id-auth.war file without IAIK libraries  -->
+	<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.axis}"/>
+			<lib dir="${lib.jaxen}"/>
+			<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>
+	<!-- create war files with IAIK libraries -->
+	<target name="package-auth" depends="compile,package-auth-base" description="creates war file with IAIK libraries for commercial use (target VM=1.3)"/>
+	<target name="package-auth-signed" depends="compile-signed,package-auth-base" description="creates war file with signed IAIK libraries for commercial use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<target name="package-auth-eval" depends="compile-eval,package-auth-base-eval" description="creates war file with IAIK libraries for educational and research use (target VM=1.3)"/>
+	<target name="package-auth-eval-signed" depends="compile-eval-signed,package-auth-base-eval" description="creates war file with signed IAIK libraries for educational and research use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<!--create  war files without IAIK libraries -->
+	<target name="package-auth-woIAIK" depends="compile,package-auth-base-woIAIK" description="creates war file without IAIK libraries (target VM=1.3)"/>
+	<target name="package-auth-signed-woIAIK" depends="compile-signed,package-auth-base-woIAIK" description="creates war file without IAIK libraries (target VM=VM used for running ant (recommended: 1.4 or higher))"/>
+	<target name="package-auth-eval-woIAIK" depends="compile-eval,package-auth-base-woIAIK" description="creates war file without IAIK libraries (target VM=1.3)"/>
+	<target name="package-auth-eval-signed-woIAIK" depends="compile-eval-signed,package-auth-base-woIAIK" description="creates war file withouth IAIK libraries (target VM=VM used for running ant (recommended: 1.4 or higher))"/>
+	
+
 	<!-- package moa-id-proxy.war -->
-	<target name="package-proxy-base" description="base target for moa-id-proxy.war file for commercial use">
+	<!--  base target for moa-id-proxy.war file with IAIK libraries for commercial use  -->
+	<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.axis}"/>
@@ -229,6 +270,7 @@
 			<classes dir="${res}"/>
 		</war>
 	</target>
+	<!--  base target for moa-id-proxy.war file with IAIK libraries for educational and research use  -->
 	<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"/>
@@ -248,10 +290,36 @@
 			<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"/>
+	<!--  base target for moa-id-proxy.war file without IAIK libraries  -->
+	<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.axis}"/>
+			<lib dir="${lib.jaxen}"/>
+			<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>
+	<!-- create war files with IAIK libraries -->
+	<target name="package-proxy" depends="compile,package-proxy-base" description="creates war file with IAIK libraries for commercial use (target VM=1.3)"/>
+	<target name="package-proxy-signed" depends="compile-signed,package-proxy-base" description="creates war file with signed IAIK libraries for commercial use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<target name="package-proxy-eval" depends="compile-eval,package-proxy-base-eval" description="creates war file with IAIK libraries for educational and research use (target VM=1.3)"/>
+	<target name="package-proxy-eval-signed" depends="compile-eval-signed,package-proxy-base-eval" description="creates war file with signed IAIK libraries for educational and research use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+<!--create  war files without IAIK libraries -->
+<target name="package-proxy-woIAIK" depends="compile,package-proxy-base-woIAIK" description="creates war file without IAIK libraries (target VM=1.3)"/>
+	<target name="package-proxy-signed-woIAIK" depends="compile-signed,package-proxy-base-woIAIK" description="creates war file without IAIK libraries (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<target name="package-proxy-eval-woIAIK" depends="compile-eval,package-proxy-base-woIAIK" description="creates war file without IAIK libraries (target VM=1.3)"/>
+	<target name="package-proxy-eval-signed-woIAIK" depends="compile-eval-signed,package-proxy-base-woIAIK" description="creates war file withouth IAIK libraries (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+
 	<!-- 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">
@@ -317,11 +385,35 @@
 			<classpath refid="compile.classpath"/>
 		</javadoc>
 	</target>
+	<target name="copy-iaik" description="copies all IAIK libraries to the distribution folder">
+		<mkdir dir="${dist.iaik}"/>
+		<copy toDir="${dist.iaik}/ext13">
+			<fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar"/>
+		</copy>
+		<copy toDir="${dist.iaik}/ext14">
+			<fileset dir="${lib.iaik-moa}/signed" includes="*.jar"/>
+		</copy>
+		<copy toDir="${dist.iaik}">
+			<fileset dir="${lib.iaik-moa}" includes="iaik_X509TrustManager.jar,iaikPkcs11Wrapper.jar,ixsil.jar,iaik-moa-full.jar,win32/"/>
+		</copy>
+	</target>
+	<target name="copy-iaik-eval" description="copies all IAIK evaluation libraries to the distribution folder">
+		<mkdir dir="${dist.iaik}"/>
+		<copy toDir="${dist.iaik}/ext13">
+			<fileset dir="${lib.iaik-moa-eval}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar"/>
+		</copy>
+		<copy toDir="${dist.iaik}/ext14">
+			<fileset dir="${lib.iaik-moa-eval}/signed" includes="*.jar"/>
+		</copy>
+		<copy toDir="${dist.iaik}">
+			<fileset dir="${lib.iaik-moa-eval}" includes="iaik_X509TrustManager.jar,iaikPkcs11Wrapper.jar,ixsil.jar,iaik-moa-full.jar,win32/"/>
+		</copy>
+	</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"/>
@@ -330,13 +422,13 @@
 	<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">
+	<!-- do all copying work for building a moa-id-auth distributable except of copying IAIK libraries -->
+	<target name="dist-auth-base">
 		<copy toDir="${dist.auth}/conf">
 			<fileset dir="${data}/deploy/conf" excludes="moa-id/oa/**"/>
 		</copy>
@@ -346,6 +438,9 @@
 		<copy todir="${dist.auth}/doc">
 			<fileset dir="${doc}"/>
 		</copy>
+		<copy toDir="${dist.auth}/ext13">
+			<fileset dir="${lib.jsse}"/>
+		</copy>
 		<copy toDir="${dist.auth}/endorsed">
 			<fileset dir="${lib.xerces}"/>
 			<fileset dir="${lib.xalan}"/>
@@ -360,25 +455,40 @@
 			<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 -->
+	<!-- create moa-id-auth distributables with IAIK libraries included -->
+	<target name="dist-auth" depends="package-auth,dist-auth-base,copy-iaik-ext" description="builds moa-id-auth distributable with IAIK libraries for commercial use (target VM=1.3)"/>
+	<target name="dist-auth-signed" depends="package-auth-signed,dist-auth-base, copy-iaik-ext" description="builds moa-id-auth distributable with IAIK libraries for commercial use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<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 for research and educational use (target VM=1.3)"/>
+	<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 for research and educational use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+<!-- create moa-id-auth distributables without IAIK libraries -->
+	<target name="dist-auth-woIAIK" depends="package-auth-woIAIK,dist-auth-base" description="builds moa-id-auth distributable without IAIK libraries (target VM=1.3)"/>
+	<target name="dist-auth-signed-woIAIK" depends="package-auth-signed-woIAIK,dist-auth-base" description="builds moa-id-auth distributable without IAIK libraries (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<target name="dist-auth-eval-woIAIK" depends="package-auth-eval-woIAIK,dist-auth-base" description="builds moa-id-auth distributable without IAIK libraries (target VM=1.3)"/>
+	<target name="dist-auth-eval-signed-woIAIK" depends="package-auth-eval-signed-woIAIK,dist-auth-base" description="builds moa-id-auth distributable without IAIK libraries (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+
+	<!-- create the zipped moa-id-auth distributables -->
 	<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 -->
+	<!-- create the zipped moa-id-auth distributables with IAIK libraries included -->
+	<target name="dist-auth-zip" depends="dist-auth,dist-auth-zip-base" description="zips moa-id-auth distributable without IAIK libraries for commercial use (target VM=1.3)"/>
+	<target name="dist-auth-zip-signed" depends="dist-auth-signed,dist-auth-zip-base" description="zips moa-id-auth distributable with IAIK libraries for commercial use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<target name="dist-auth-zip-eval" depends="dist-auth-eval,dist-auth-zip-base" description="zips moa-id-auth distributable with IAIK libraries for research and educational use (target VM=1.3)"/>
+	<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 for research and educational use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<!-- create the zipped moa-id-auth distributables without IAIK libraries included -->
+	<target name="dist-auth-zip-woIAIK" depends="dist-auth-woIAIK,dist-auth-zip-base" description="zips moa-id-auth distributable without IAIK libraries (target VM=1.3)"/>
+	<target name="dist-auth-zip-signed-woIAIK" depends="dist-auth-signed-woIAIK,dist-auth-zip-base" description="zips moa-id-auth distributable without IAIK libraries (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<target name="dist-auth-zip-eval-woIAIK" depends="dist-auth-eval-woIAIK,dist-auth-zip-base" description="zips moa-id-auth distributable without IAIK libraries (target VM=1.3)"/>
+	<target name="dist-auth-zip-eval-signed-woIAIK" depends="dist-auth-eval-signed-woIAIK,dist-auth-zip-base" description="zips moa-id-auth distributable without IAIK libraries (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+
+	
+	
+	<!-- create the moa-id-proxy distributables -->
 	<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"/>
@@ -387,7 +497,6 @@
 	<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"/>
@@ -407,6 +516,9 @@
 			<fileset dir="${lib.xerces}"/>
 			<fileset dir="${lib.xalan}"/>
 		</copy>
+		<copy toDir="${dist.proxy}/ext13">
+			<fileset dir="${lib.jsse}"/>
+		</copy>
 		<copy todir="${dist.proxy}/tomcat">
 			<fileset dir="${data}/deploy/tomcat"/>
 		</copy>
@@ -417,20 +529,32 @@
 			<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 -->
+	<!-- create the moa-id-proxy distributables with IAIK libraries included -->
+	<target name="dist-proxy" depends="package-proxy,dist-proxy-base,copy-iaik-ext-proxy" description="builds moa-id-proxy distributable with IAIK libraries for commercial use (target VM=1.3)"/>
+	<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 for commercial use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<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 for research and educational use (target VM=1.3)"/>
+	<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 for research and educational use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+<!-- create the zipped moa-id-proxy distributables without IAIK libraries included -->
+	<target name="dist-proxy-woIAIK" depends="package-proxy-woIAIK,dist-proxy-base" description="builds moa-id-proxy distributable without IAIK libraries (target VM=1.3)"/>
+	<target name="dist-proxy-signed-woIAIK" depends="package-proxy-signed-woIAIK,dist-proxy-base" description="builds moa-id-proxy distributable without IAIK libraries (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<target name="dist-proxy-eval-woIAIK" depends="package-proxy-eval-woIAIK,dist-proxy-base" description="builds moa-id-proxy distributable without IAIK libraries (target VM=1.3)"/>
+	<target name="dist-proxy-eval-signed-woIAIK" depends="package-proxy-eval-signed-woIAIK,dist-proxy-base" description="builds moa-id-proxy distributable without IAIK libraries (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<!-- create the zipped moa-id-proxy distributables -->
 	<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 moa-id-proxy distributables with IAIK libraries included -->
+	<target name="dist-proxy-zip" depends="dist-proxy,dist-proxy-zip-base" description="zips moa-id-proxy distributable with IAIK libraries for commercial use (target VM=1.3)"/>
+	<target name="dist-proxy-zip-signed" depends="dist-proxy-signed,dist-proxy-zip-base" description="zips moa-id-proxy distributable with IAIK libraries for commercial use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<target name="dist-proxy-zip-eval" depends="dist-proxy-eval,dist-proxy-zip-base" description="zips moa-id-proxy distributable with IAIK libraries for research and educational use (target VM=1.3)"/>
+	<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 for research and educational use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<!-- create the moa-id-proxy distributables without IAIK libraries included -->
+	<target name="dist-proxy-zip-woIAIK" depends="dist-proxy-woIAIK,dist-proxy-zip-base" description="zips moa-id-proxy distributable without IAIK libraries (target VM=1.3)"/>
+	<target name="dist-proxy-zip-signed-woIAIK" depends="dist-proxy-signed-woIAIK,dist-proxy-zip-base" description="zips moa-id-proxy distributable without IAIK libraries (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<target name="dist-proxy-zip-eval-woIAIK" depends="dist-proxy-eval-woIAIK,dist-proxy-zip-base" description="zips moa-id-proxy distributable with IAIK libraries (jdk1.3) for research and educational use (target VM=1.3)"/>
+	<target name="dist-proxy-zip-eval-signed-woIAIK" depends="dist-proxy-eval-signed-woIAIK,dist-proxy-zip-base" description="zips moa-id-proxy distributable without IAIK libraries (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
 	<!-- create the source distributable -->
 	<target name="dist-src" depends="init">
 		<copy toDir="${dist.src}/build">
@@ -458,11 +582,24 @@
 			<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"/>
+	<!-- create all the distributables with IAIK libraries included -->
+	<target name="dist-all" depends="dist-auth-zip,dist-proxy-zip,dist-src-zip" 
+			  description="creates all distributables with IAIK libraries for commercial use (target VM=1.3)"/>
+	<target name="dist-all-signed" depends="dist-auth-zip-signed,dist-proxy-zip-signed,dist-src-zip" 
+			  description="creates all distributables with IAIK libraries for commercial use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<target name="dist-all-eval" depends="dist-auth-zip-eval,dist-proxy-zip-eval,dist-src-zip" 
+			  description="creates all distributables with IAIK libraries for research and educational use (target VM=1.3)"/>
+	<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 for research and educational use (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+<!-- create all the distributables without IAIK libraries included -->
+	<target name="dist-all-woIAIK" depends="dist-auth-zip-woIAIK,dist-proxy-zip-woIAIK,dist-src-zip,copy-iaik" 
+			  description="creates all distributables without IAIK libraries (target VM=1.3)"/>
+	<target name="dist-all-signed-woIAIK" depends="dist-auth-zip-signed-woIAIK,dist-proxy-zip-signed-woIAIK,dist-src-zip,copy-iaik" 
+			  description="creates all distributables without IAIK libraries (target VM=VM used for running Ant (recommended: 1.4 or higher))"/>
+	<target name="dist-all-eval-woIAIK" depends="dist-auth-zip-eval-woIAIK,dist-proxy-zip-eval-woIAIK,dist-src-zip,copy-iaik-eval,copy-iaik-eval" 
+			  description="creates all distributables without IAIK libraries (target VM=1.3)"/>
+	<target name="dist-all-eval-signed-woIAIK" depends="dist-auth-zip-eval-signed-woIAIK,dist-proxy-zip-eval-signed-woIAIK,dist-src-zip,copy-iaik-eval" 
+			  description="creates all distributables without IAIK libraries (target VM=VM used for running Ant (recommended: 1.4 or higher))"/> 
 	<!-- 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"/>