diff options
Diffstat (limited to 'id.server/build.xml')
| -rw-r--r-- | id.server/build.xml | 150 |
1 files changed, 33 insertions, 117 deletions
diff --git a/id.server/build.xml b/id.server/build.xml index a773ab737..f3e454808 100644 --- a/id.server/build.xml +++ b/id.server/build.xml @@ -6,7 +6,7 @@ $Id$ --> -<project name="moa.id.server" default="dist-all" basedir="."> +<project name="moa.id.server" default="dist-all-signed" basedir="."> <property environment="env"/> <property name="version" value="1.4.0"/> <property name="projectroot" value="."/> @@ -60,15 +60,6 @@ <property name="lib.activation" value="${lib}/tomcat-libs"/> <property name="handbook" value="../spss.handbook" /> <property name="spss.certstore" value="${handbook}/conf/moa-spss/certstore" /> - <!--IAIK libraries for commercial use (target VM=1.3)--> - <path id="compile.iaik.full"> - <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}/iaik_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-full}/iaik_moa_full.jar"/> @@ -78,15 +69,6 @@ <pathelement location="${lib.iaik-moa-full}/signed/iaik_jce_full.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"> - <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}/iaik_ixsil.jar"/> - </path> <!--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"/> @@ -126,21 +108,11 @@ <pathelement location="${lib.moa-spss}/moa-spss.jar"/> <pathelement location="${env.MOA_COMMON_TEST_JAR}"/> </path> - <!-- 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> <!-- 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"/> @@ -161,24 +133,12 @@ <mkdir dir="${dist.src-zip}"/> </target> <!-- compile everything --> - <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-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-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)"> - <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-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 (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"/> @@ -261,14 +221,10 @@ </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))"/> @@ -342,27 +298,43 @@ </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"> + <target name="api-doc" depends="compile-signed"> + <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"> + <tag name="invariant" scope="all" description="Invariants:"/> + <tag name="inv" scope="all" description="Invariants:"/> + <tag name="precondition" scope="all" description="Preconditions:"/> + <tag name="pre" scope="all" description="Preconditions:"/> + <tag name="postcondition" scope="all" description="Postconditions:"/> + <tag name="post" scope="all" description="Postconditions:"/> <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"/> + <classpath refid="compile.classpath.signed"/> </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"> + <target name="api-doc-internal" depends="compile-signed"> + <javadoc defaultexcludes="yes" + destdir="${api-doc.internal}" + author="true" + version="true" + use="true" + windowtitle="MOA ID Server Internal API" + useexternalfile="yes"> + <tag name="precondition" scope="all" description="Preconditions:"/> <packageset dir="${prj.common}/src"> <exclude name="test/**"/> </packageset> @@ -414,15 +386,12 @@ <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"/> + <classpath refid="compile.classpath.signed"/> </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-full}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.jar,iaik_Pkcs11Wrapper.jar"/> - </copy> - <copy toDir="${dist.iaik}/ext14"> + <copy toDir="${dist.iaik}/ext"> <fileset dir="${lib.iaik-moa-full}/signed" includes="*.jar"/> <fileset dir="${lib.iaik-moa-full}" includes="iaik_Pkcs11Wrapper.jar"/> </copy> @@ -432,10 +401,7 @@ </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,iaik_Pkcs11Provider.jar,iaik_Pkcs11Wrapper.jar"/> - </copy> - <copy toDir="${dist.iaik}/ext14"> + <copy toDir="${dist.iaik}/ext"> <fileset dir="${lib.iaik-moa-eval}/signed" includes="*.jar"/> <fileset dir="${lib.iaik-moa-eval}" includes="iaik_Pkcs11Wrapper.jar"/> </copy> @@ -446,19 +412,13 @@ <!-- 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,iaik_Pkcs11Provider.jar,iaik_Pkcs11Wrapper.jar"/> - </copy> - <copy toDir="${dist.auth}/ext14"> + <copy toDir="${dist.auth}/ext"> <fileset dir="${lib.iaik-moa-full}/signed" includes="*.jar"/> <fileset dir="${lib.iaik-moa-full}" includes="iaik_Pkcs11Wrapper.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,iaik_Pkcs11Provider.jar,iaik_Pkcs11Wrapper.jar"/> - </copy> - <copy toDir="${dist.auth}/ext14"> + <copy toDir="${dist.auth}/ext"> <fileset dir="${lib.iaik-moa-eval}/signed" includes="*.jar"/> <fileset dir="${lib.iaik-moa-eval}" includes="iaik_Pkcs11Wrapper.jar"/> </copy> @@ -481,9 +441,6 @@ <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}"/> @@ -521,14 +478,10 @@ </target> <!-- 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 --> @@ -538,33 +491,23 @@ </zip> </target> <!-- 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-full}" includes="iaik_jce_full.jar,iaik_ldap.jar,iaik_ecc.jar,iaik_Pkcs11Provider.jar,iaik_Pkcs11Wrapper.jar"/> - </copy> - <copy toDir="${dist.proxy}/ext14"> + <copy toDir="${dist.proxy}/ext"> <fileset dir="${lib.iaik-moa-full}/signed" includes="*.jar"/> <fileset dir="${lib.iaik-moa-full}" includes="iaik_Pkcs11Wrapper.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,iaik_Pkcs11Provider.jar,iaik_Pkcs11Wrapper.jar"/> - </copy> - <copy toDir="${dist.proxy}/ext14"> + <copy toDir="${dist.proxy}/ext"> <fileset dir="${lib.iaik-moa-eval}/signed" includes="*.jar"/> <fileset dir="${lib.iaik-moa-eval}" includes="iaik_Pkcs11Wrapper.jar"/> </copy> @@ -583,9 +526,6 @@ <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> @@ -600,14 +540,10 @@ </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)"/> <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"> @@ -616,14 +552,10 @@ </zip> </target> <!-- 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"> @@ -665,21 +597,13 @@ </zip> </target> <!-- 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) --> @@ -698,9 +622,7 @@ <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"> @@ -718,9 +640,7 @@ <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"> @@ -737,14 +657,10 @@ <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"> |