diff options
-rw-r--r-- | spss.server/build.xml | 16 | ||||
-rw-r--r-- | spss.server/lib/iaik-moa-20030703/iaik_Pkcs11Provider.jar (renamed from spss.server/lib/iaik-moa-20030703/iaikPkcs11Provider.jar) | bin | 300522 -> 300522 bytes | |||
-rw-r--r-- | spss.server/lib/iaik-moa-20030703/iaik_Pkcs11Wrapper.jar (renamed from spss.server/lib/iaik-moa-20030703/iaikPkcs11Wrapper.jar) | bin | 257497 -> 257497 bytes | |||
-rw-r--r-- | spss.server/lib/iaik-moa-20030703/iaik_ecc.jar | bin | 98434 -> 85649 bytes | |||
-rw-r--r-- | spss.server/lib/iaik-moa-20030703/iaik_ixsil.jar | bin | 0 -> 197880 bytes | |||
-rw-r--r-- | spss.server/lib/iaik-moa-20030703/iaik_moa_full.jar (renamed from spss.server/lib/iaik-moa-20030703/iaik-moa-full.jar) | bin | 572975 -> 574138 bytes | |||
-rw-r--r-- | spss.server/lib/iaik-moa-20030703/ixsil.jar | bin | 167965 -> 0 bytes | |||
-rw-r--r-- | spss.server/lib/iaik-moa-20030703/signed/iaik_Pkcs11Provider_signed.jar (renamed from spss.server/lib/iaik-moa-20030703/signed/iaikPkcs11Provider.jar) | bin | 315751 -> 315751 bytes | |||
-rw-r--r-- | spss.server/lib/iaik-moa-20030703/signed/iaik_ecc.jar | bin | 98434 -> 0 bytes | |||
-rw-r--r-- | spss.server/lib/iaik-moa-20030703/signed/iaik_ecc_signed.jar | bin | 0 -> 92897 bytes | |||
-rw-r--r-- | spss.server/lib/iaik-moa-20030703/signed/iaik_jce_full_signed.jar (renamed from spss.server/lib/iaik-moa-20030703/signed/iaik_jce_full.jar) | bin | 711194 -> 711194 bytes |
11 files changed, 8 insertions, 8 deletions
diff --git a/spss.server/build.xml b/spss.server/build.xml index 0b2e704db..2bbf67622 100644 --- a/spss.server/build.xml +++ b/spss.server/build.xml @@ -67,8 +67,8 @@ <pathelement location="${lib.commons-logging}/commons-logging-api.jar"/> <pathelement location="${lib.commons-discovery}/commons-discovery.jar"/> <pathelement location="${lib.servlet}/servlet-2_3-fcs-classfiles.zip"/> - <pathelement location="${lib.iaik-moa}/iaik-moa-full.jar"/> - <pathelement location="${lib.iaik-moa}/ixsil.jar"/> + <pathelement location="${lib.iaik-moa}/iaik_moa_full.jar"/> + <pathelement location="${lib.iaik-moa}/iaik_ixsil.jar"/> <pathelement location="${lib.iaik-moa}/iaik_jce_full.jar"/> <pathelement location="${lib.iaik-moa}/iaik_ecc.jar"/> <pathelement location="${env.MOA_COMMON_TEST_JAR}"/> @@ -110,7 +110,7 @@ <lib dir="${lib.axis}"/> <lib dir="${lib.jaxen}"/> <lib dir="${lib.iaik-moa}" - excludes="iaik_jce_full.jar, win32/**, linux/**, solaris/**, signed/**"/> + excludes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar, win32/**, linux/**, solaris/**, signed/**"/> <lib file="${lib.commons-logging}/commons-logging.jar"/> <lib file="${lib.commons-discovery}/commons-discovery.jar"/> <lib file="${env.MOA_COMMON_JAR}"/> @@ -253,7 +253,7 @@ <fileset dir="${handbook}/conf"/> </copy> <copy toDir="${dist.ws}/ext13"> - <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar"/> + <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar"/> <fileset dir="${lib.jsse}"/> </copy> <copy toDir="${dist.ws}/ext14"> @@ -266,7 +266,7 @@ <fileset dir="${tools}"/> <fileset dir="${lib.iaik-moa}"> <include name="iaik_jce_full.jar"/> - <include name="iaik-moa-full.jar"/> + <include name="iaik_moa_full.jar"/> <include name="iaik_ecc.jar"/> </fileset> <fileset dir="${lib.log4j}"/> @@ -312,7 +312,7 @@ <fileset dir="${lib.xerces}"/> <fileset dir="${lib.xalan}"/> <fileset dir="${lib.postgres-jdbc}"/> - <fileset dir="${lib.iaik-moa}" excludes="signed/**, iaik_jce_full.jar"/> + <fileset dir="${lib.iaik-moa}" excludes="signed/**, iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar"/> <fileset dir="${lib.commons-logging}"/> <fileset dir="${lib.log4j}"/> <fileset dir="${lib.commons-discovery}"/> @@ -321,7 +321,7 @@ <fileset dir="${handbook}/conf"/> </copy> <copy toDir="${dist.lib}/ext13"> - <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar"/> + <fileset dir="${lib.iaik-moa}" includes="iaik_jce_full.jar, iaik_ecc.jar, iaik_Pkcs11Provider.jar"/> <fileset dir="${lib.jsse}"/> </copy> <copy toDir="${dist.lib}/ext14"> @@ -331,7 +331,7 @@ <fileset dir="${tools}"/> <fileset dir="${lib.iaik-moa}"> <include name="iaik_jce_full.jar"/> - <include name="iaik-moa-full.jar"/> + <include name="iaik_moa_full.jar"/> <include name="iaik_ecc.jar"/> </fileset> <fileset dir="${lib.log4j}"/> diff --git a/spss.server/lib/iaik-moa-20030703/iaikPkcs11Provider.jar b/spss.server/lib/iaik-moa-20030703/iaik_Pkcs11Provider.jar Binary files differindex f5ca425db..f5ca425db 100644 --- a/spss.server/lib/iaik-moa-20030703/iaikPkcs11Provider.jar +++ b/spss.server/lib/iaik-moa-20030703/iaik_Pkcs11Provider.jar diff --git a/spss.server/lib/iaik-moa-20030703/iaikPkcs11Wrapper.jar b/spss.server/lib/iaik-moa-20030703/iaik_Pkcs11Wrapper.jar Binary files differindex 0ee74172b..0ee74172b 100644 --- a/spss.server/lib/iaik-moa-20030703/iaikPkcs11Wrapper.jar +++ b/spss.server/lib/iaik-moa-20030703/iaik_Pkcs11Wrapper.jar diff --git a/spss.server/lib/iaik-moa-20030703/iaik_ecc.jar b/spss.server/lib/iaik-moa-20030703/iaik_ecc.jar Binary files differindex e1557d15e..baee85463 100644 --- a/spss.server/lib/iaik-moa-20030703/iaik_ecc.jar +++ b/spss.server/lib/iaik-moa-20030703/iaik_ecc.jar diff --git a/spss.server/lib/iaik-moa-20030703/iaik_ixsil.jar b/spss.server/lib/iaik-moa-20030703/iaik_ixsil.jar Binary files differnew file mode 100644 index 000000000..5deb99985 --- /dev/null +++ b/spss.server/lib/iaik-moa-20030703/iaik_ixsil.jar diff --git a/spss.server/lib/iaik-moa-20030703/iaik-moa-full.jar b/spss.server/lib/iaik-moa-20030703/iaik_moa_full.jar Binary files differindex 8f0523c8e..220a2cd03 100644 --- a/spss.server/lib/iaik-moa-20030703/iaik-moa-full.jar +++ b/spss.server/lib/iaik-moa-20030703/iaik_moa_full.jar diff --git a/spss.server/lib/iaik-moa-20030703/ixsil.jar b/spss.server/lib/iaik-moa-20030703/ixsil.jar Binary files differdeleted file mode 100644 index ada154483..000000000 --- a/spss.server/lib/iaik-moa-20030703/ixsil.jar +++ /dev/null diff --git a/spss.server/lib/iaik-moa-20030703/signed/iaikPkcs11Provider.jar b/spss.server/lib/iaik-moa-20030703/signed/iaik_Pkcs11Provider_signed.jar Binary files differindex 2897f436c..2897f436c 100644 --- a/spss.server/lib/iaik-moa-20030703/signed/iaikPkcs11Provider.jar +++ b/spss.server/lib/iaik-moa-20030703/signed/iaik_Pkcs11Provider_signed.jar diff --git a/spss.server/lib/iaik-moa-20030703/signed/iaik_ecc.jar b/spss.server/lib/iaik-moa-20030703/signed/iaik_ecc.jar Binary files differdeleted file mode 100644 index e1557d15e..000000000 --- a/spss.server/lib/iaik-moa-20030703/signed/iaik_ecc.jar +++ /dev/null diff --git a/spss.server/lib/iaik-moa-20030703/signed/iaik_ecc_signed.jar b/spss.server/lib/iaik-moa-20030703/signed/iaik_ecc_signed.jar Binary files differnew file mode 100644 index 000000000..2a7957226 --- /dev/null +++ b/spss.server/lib/iaik-moa-20030703/signed/iaik_ecc_signed.jar diff --git a/spss.server/lib/iaik-moa-20030703/signed/iaik_jce_full.jar b/spss.server/lib/iaik-moa-20030703/signed/iaik_jce_full_signed.jar Binary files differindex 425e249ca..425e249ca 100644 --- a/spss.server/lib/iaik-moa-20030703/signed/iaik_jce_full.jar +++ b/spss.server/lib/iaik-moa-20030703/signed/iaik_jce_full_signed.jar |