Update auf Version 1.3.1, neue IAIK Libraries.

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

1 files changed, 32 insertions, 20 deletions

diff --git a/id.server/build.xml b/id.server/build.xml
index 5a8aba2f1..34149775d 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.3.1D01"/>
+	<property name="version" value="1.3.1"/>
 	<property name="projectroot" value="."/>
 	<property name="src" value="src"/>
 	<property name="res" value="res"/>
@@ -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-20060316"/>
 	<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"/>
@@ -45,7 +45,7 @@
 	<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.3.1D01"/>
+	<property name="lib.moa-spss" value="${lib}/moa-spss-1.3.1"/>
 	<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"/>
@@ -64,7 +64,7 @@
 		<pathelement location="${lib.iaik-moa-full}/iaik_ldap.jar"/>
 		<pathelement location="${lib.iaik-moa-full}/iaik_X509TrustManager.jar"/>
 		<pathelement location="${lib.iaik-moa-full}/iaik_jce_full.jar"/>
-		<pathelement location="${lib.iaik-moa-full}/ixsil.jar"/>
+		<pathelement location="${lib.iaik-moa-full}/iaik_ixsil.jar"/>
 	</path>
 	<!--IAIK libraries for commercial use (target VM=1.4 or higher)-->
 	<path id="compile.iaik.full.signed">
@@ -73,7 +73,7 @@
 		<pathelement location="${lib.iaik-moa-full}/iaik_ldap.jar"/>
 		<pathelement location="${lib.iaik-moa-full}/iaik_X509TrustManager.jar"/>
 		<pathelement location="${lib.iaik-moa-full}/signed/iaik_jce_full.jar"/>
-		<pathelement location="${lib.iaik-moa-full}/ixsil.jar"/>
+		<pathelement location="${lib.iaik-moa-full}/iaik_ixsil.jar"/>
 	</path>
 	<!--IAIK libraries for educational and research use (target VM=1.3)-->
 	<path id="compile.iaik.eval">
@@ -82,7 +82,7 @@
 		<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}/iaik_ixsil.jar"/>
 	</path>
 	<!--IAIK libraries for educational and research use (target VM=1.4 or higher)-->
 	<path id="compile.iaik.eval.signed">
@@ -91,7 +91,7 @@
 		<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}/iaik_ixsil.jar"/>
 	</path>
 	<!-- classpaths without IAIK libraries -->
 	<path id="compile.basepath">
@@ -187,7 +187,7 @@
 			<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"/>
+			<lib dir="${lib.iaik-moa-full}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.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"/>
@@ -209,7 +209,7 @@
 			<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"/>
+			<lib dir="${lib.iaik-moa-eval}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.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"/>
@@ -265,7 +265,7 @@
 			<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"/>
+			<lib dir="${lib.iaik-moa-full}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.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}"/>
@@ -287,7 +287,7 @@
 			<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"/>
+			<lib dir="${lib.iaik-moa-eval}" excludes="iaik_cms.jar,iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.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}"/>
@@ -402,32 +402,32 @@
 	<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-full}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar"/>
+			<fileset dir="${lib.iaik-moa-full}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.jar"/>
 		</copy>
 		<copy toDir="${dist.iaik}/ext14">
 			<fileset dir="${lib.iaik-moa-full}/signed" includes="*.jar"/>
 		</copy>
 		<copy toDir="${dist.iaik}">
-			<fileset dir="${lib.iaik-moa-full}" includes="iaik_X509TrustManager.jar,iaikPkcs11Wrapper.jar,ixsil.jar,iaik_moa_full.jar,win32/"/>
+			<fileset dir="${lib.iaik-moa-full}" includes="iaik_X509TrustManager.jar,iaik_Pkcs11Wrapper.jar,iaik_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"/>
+			<fileset dir="${lib.iaik-moa-eval}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.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/"/>
+			<fileset dir="${lib.iaik-moa-eval}" includes="iaik_X509TrustManager.jar,iaik_Pkcs11Wrapper.jar,iaik_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-full}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar"/>
+			<fileset dir="${lib.iaik-moa-full}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.jar"/>
 		</copy>
 		<copy toDir="${dist.auth}/ext14">
 			<fileset dir="${lib.iaik-moa-full}/signed" includes="*.jar"/>
@@ -435,7 +435,7 @@
 	</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.iaik-moa-eval}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.jar"/>
 		</copy>
 		<copy toDir="${dist.auth}/ext14">
 			<fileset dir="${lib.iaik-moa-eval}/signed" includes="*.jar"/>
@@ -450,7 +450,10 @@
 		<copy toDir="${dist.auth}/conf/moa-spss/certstore">
 			<fileset dir="${spss.certstore}"/>
 		</copy>
-		<mkdir dir="${dist.auth}/conf/moa-id/certs/certstore"/>
+		<copy toDir="${dist.auth}/conf/moa-id/certs/certstore">
+			<fileset dir="${spss.certstore}"/>
+		</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">
@@ -476,6 +479,12 @@
 			<fileset dir="${projectroot}/" includes="history.txt"/>
 		</copy>
 		<copy toDir="${dist.auth}/">
+			<fileset dir="${projectroot}/" includes="readme.txt"/>
+		</copy>
+		<copy toDir="${dist.proxy}/">
+			<fileset dir="${projectroot}/" includes="readme.txt"/>
+		</copy>
+		<copy toDir="${dist.auth}/">
 			<fileset dir="${projectroot}/" includes="APACHE-LICENSE-2.0.txt"/>
 		</copy>
 		<copy toDir="${dist.proxy}/">
@@ -522,7 +531,7 @@
 	<!-- create the moa-id-proxy distributables -->
 	<target name="copy-iaik-ext-proxy">
 		<copy toDir="${dist.proxy}/ext13">
-			<fileset dir="${lib.iaik-moa-full}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar"/>
+			<fileset dir="${lib.iaik-moa-full}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.jar"/>
 		</copy>
 		<copy toDir="${dist.proxy}/ext14">
 			<fileset dir="${lib.iaik-moa-full}/signed" includes="*.jar"/>
@@ -530,7 +539,7 @@
 	</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.iaik-moa-eval}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.jar"/>
 		</copy>
 		<copy toDir="${dist.proxy}/ext14">
 			<fileset dir="${lib.iaik-moa-eval}/signed" includes="*.jar"/>
@@ -562,6 +571,9 @@
 		<copy toDir="${dist.proxy}/">
 			<fileset dir="${projectroot}/" includes="history.txt"/>
 		</copy>
+		<copy toDir="${dist.proxy}/">
+			<fileset dir="${projectroot}/" includes="readme.txt"/>
+		</copy>
 	</target>
 	<!-- 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)"/>