diff options
Diffstat (limited to 'id.server/build.xml')
| -rw-r--r-- | id.server/build.xml | 63 |
1 files changed, 36 insertions, 27 deletions
diff --git a/id.server/build.xml b/id.server/build.xml index 6b0bec0ea..84aeb3738 100644 --- a/id.server/build.xml +++ b/id.server/build.xml @@ -37,8 +37,9 @@ <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/full"/> - <property name="lib.iaik-moa-eval" value="${lib}/iaik-moa-20051107/eval"/> + <property name="lib.iaik-moa" value="${lib}/iaik-moa-20051107"/> + <property name="lib.iaik-moa-full" value="${lib.iaik-moa}/full"/> + <property name="lib.iaik-moa-eval" value="${lib.iaik-moa}/eval"/> <property name="lib.jaxen" value="${lib}/jaxen-1.0"/> <property name="lib.jaxp" value="${lib}/jaxp-1.2_01"/> <property name="lib.jsse" value="${lib}/jsse-1.0.3_03"/> @@ -56,21 +57,21 @@ <property name="lib.activation" value="${lib}/tomcat-libs"/> <!--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-full}/iaik-moa-full.jar"/> + <pathelement location="${lib.iaik-moa-full}/iaik_ecc.jar"/> + <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"/> </path> <!--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-full}/iaik-moa-full.jar"/> + <pathelement location="${lib.iaik-moa-full}/signed/iaik_ecc.jar"/> + <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"/> </path> <!--IAIK libraries for educational and research use (target VM=1.3)--> <path id="compile.iaik.eval"> @@ -155,13 +156,13 @@ <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> + <echo>classpathref= ${lib.iaik-moa-full}</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 (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> + <echo>classpathref= ${lib.iaik-moa-full}/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 (target VM=1.3)"> @@ -183,7 +184,7 @@ <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.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.moa-spss}"/> <lib dir="${lib.postgres-jdbc}"/> <lib dir="${lib.commons-logging}" includes="commons-logging.jar"/> @@ -258,7 +259,7 @@ <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.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.moa-spss}" includes="moa-common.jar"/> <lib dir="${lib.commons-logging}" includes="commons-logging.jar"/> <lib dir="${lib.jaxp}"/> @@ -393,13 +394,13 @@ <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"/> + <fileset dir="${lib.iaik-moa-full}" 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"/> + <fileset dir="${lib.iaik-moa-full}/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/"/> + <fileset dir="${lib.iaik-moa-full}" 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"> @@ -418,10 +419,10 @@ <!-- 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.iaik-moa-full}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar"/> </copy> <copy toDir="${dist.auth}/ext14"> - <fileset dir="${lib.iaik-moa}/signed" includes="*.jar"/> + <fileset dir="${lib.iaik-moa-full}/signed" includes="*.jar"/> </copy> </target> <target name="copy-iaik-ext-eval"> @@ -509,10 +510,10 @@ <!-- 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.iaik-moa-full}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaikPkcs11Provider.jar"/> </copy> <copy toDir="${dist.proxy}/ext14"> - <fileset dir="${lib.iaik-moa}/signed" includes="*.jar"/> + <fileset dir="${lib.iaik-moa-full}/signed" includes="*.jar"/> </copy> </target> <target name="copy-iaik-ext-eval-proxy"> @@ -585,8 +586,16 @@ <fileset dir="${prj.common}" excludes="tmp/**, bin/**"/> </copy> <copy toDir="${dist.src}/id.server"> - <fileset dir="." excludes="tmp/**, bin/**"/> - </copy> + <!--fileset dir="." excludes="tmp/**, bin/**, $(lib.iaik-moa)/**"/--> + <fileset dir="."> + <exclude name="tmp/**"/> + <exclude name="bin/**"/> + <exclude name="${lib.iaik-moa}/**"/> + </fileset> + </copy> + <copy toDir="${dist.src}/id.server/${lib.iaik-moa}"> + <fileset dir="${lib.iaik-moa-full}"/> + </copy> <copy toDir="${dist.src}/id.oa"> <fileset dir="${prj.oa}" excludes="tmp/**"/> </copy> |