aboutsummaryrefslogtreecommitdiff
path: root/id.server
diff options
context:
space:
mode:
Diffstat (limited to 'id.server')
-rw-r--r--id.server/build.xml30
1 files changed, 18 insertions, 12 deletions
diff --git a/id.server/build.xml b/id.server/build.xml
index efb464f35..83829a0cb 100644
--- a/id.server/build.xml
+++ b/id.server/build.xml
@@ -192,7 +192,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,iaik_Pkcs11Provider.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,iaik_Pkcs11Wrapper.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"/>
@@ -216,7 +216,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,iaik_Pkcs11Provider.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,iaik_Pkcs11Wrapper.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"/>
@@ -276,7 +276,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,iaik_Pkcs11Provider.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,iaik_Pkcs11Wrapper.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}"/>
@@ -298,7 +298,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,iaik_Pkcs11Provider.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,iaik_Pkcs11Wrapper.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}"/>
@@ -413,43 +413,47 @@
<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"/>
+ <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">
<fileset dir="${lib.iaik-moa-full}/signed" includes="*.jar"/>
+ <fileset dir="${lib.iaik-moa-full}" includes="iaik_Pkcs11Wrapper.jar"/>
</copy>
<copy toDir="${dist.iaik}">
- <fileset dir="${lib.iaik-moa-full}" includes="iaik_X509TrustManager.jar,iaik_Pkcs11Wrapper.jar,iaik_ixsil.jar,iaik_moa_full.jar,win32/"/>
+ <fileset dir="${lib.iaik-moa-full}" includes="iaik_X509TrustManager.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,iaik_Pkcs11Provider.jar"/>
+ <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">
<fileset dir="${lib.iaik-moa-eval}/signed" includes="*.jar"/>
+ <fileset dir="${lib.iaik-moa-eval}" includes="iaik_Pkcs11Wrapper.jar"/>
</copy>
<copy toDir="${dist.iaik}">
- <fileset dir="${lib.iaik-moa-eval}" includes="iaik_X509TrustManager.jar,iaik_Pkcs11Wrapper.jar,iaik_ixsil.jar,iaik_moa_full.jar,win32/"/>
+ <fileset dir="${lib.iaik-moa-eval}" includes="iaik_X509TrustManager.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,iaik_Pkcs11Provider.jar"/>
+ <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">
<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"/>
+ <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">
<fileset dir="${lib.iaik-moa-eval}/signed" includes="*.jar"/>
+ <fileset dir="${lib.iaik-moa-eval}" includes="iaik_Pkcs11Wrapper.jar"/>
</copy>
</target>
<!-- do all copying work for building a moa-id-auth distributable except of copying IAIK libraries -->
@@ -542,18 +546,20 @@
<!-- 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"/>
+ <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">
<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"/>
+ <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">
<fileset dir="${lib.iaik-moa-eval}/signed" includes="*.jar"/>
+ <fileset dir="${lib.iaik-moa-eval}" includes="iaik_Pkcs11Wrapper.jar"/>
</copy>
</target>
<target name="dist-proxy-base" description="does all work for building a moa-id-proxy distributable except of copying IAIK libraries">