From 5166270383bd11faeaa484ab878844f9b9445527 Mon Sep 17 00:00:00 2001 From: kstranacher Date: Tue, 11 Aug 2009 08:11:40 +0000 Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1127 d688527b-c9ab-4aba-bd8d-4036d912da1d --- component-pkcs11libs.xml | 4 ++-- id/history.txt | 5 +++++ id/readme_1.4.5.txt | 1 + id/server/component-idlibs.xml | 4 ++-- pom.xml | 24 +++++++++++----------- .../iaik_Pkcs11Provider/maven-metadata-central.xml | 9 ++++---- .../maven-metadata-central.xml.md5 | 2 +- .../maven-metadata-central.xml.sha1 | 2 +- .../prod/iaik_Pkcs11Provider/maven-metadata.xml | 9 ++++---- .../iaik_Pkcs11Provider/maven-metadata.xml.md5 | 2 +- .../iaik_Pkcs11Provider/maven-metadata.xml.sha1 | 2 +- spss/server/history.txt | 5 +++++ .../moa/spss/server/invoke/DataObjectFactory.java | 22 ++++++++++++++++++-- .../tools/.settings/org.maven.ide.eclipse.prefs | 9 ++++++++ 14 files changed, 70 insertions(+), 30 deletions(-) create mode 100644 spss/server/tools/.settings/org.maven.ide.eclipse.prefs diff --git a/component-pkcs11libs.xml b/component-pkcs11libs.xml index c967690d5..8edd4793f 100644 --- a/component-pkcs11libs.xml +++ b/component-pkcs11libs.xml @@ -30,9 +30,9 @@ - iaik.prod:iaik_Pkcs11Wrapper:dll:wince30arm + iaik.prod:iaik_Pkcs11Wrapper:dll:win64 - /pkcs11/wince30arm + /pkcs11/win64 pkcs11wrapper.${extension} diff --git a/id/history.txt b/id/history.txt index 3ebb1068d..ce0466470 100644 --- a/id/history.txt +++ b/id/history.txt @@ -10,8 +10,13 @@ Fixes: - IAIK Libraries aktualisiert: iaik-moa: Version 1.26 + iaik-ecc: Version 2.19 + iaik-jce: Version 3.18_MOA + iaikPkcs11Provider: Version 1.2.6 + iaikPkcs11Wrapper: Version 1.2.17 - Neue Errorpages +- Keine Ausgabe der Stammzahl im Log-Level Debug (war zuvor für Testkarten möglich) ===== Version MOA-ID 1.4.4: Änderungen seit Version MOA-ID 1.4.3: diff --git a/id/readme_1.4.5.txt b/id/readme_1.4.5.txt index 2706414f4..4bab73297 100644 --- a/id/readme_1.4.5.txt +++ b/id/readme_1.4.5.txt @@ -12,6 +12,7 @@ gleichen Verzeichnis): - JSSE Abhängigkeit wurde entfernt (Fixed Bug #335) - Neue Errorpages +- Keine Ausgabe der Stammzahl im Log-Level Debug (war zuvor für Testkarten möglich) ------------------------------------------------------------------------------- B. Durchführung eines Updates ------------------------------------------------------------------------------- diff --git a/id/server/component-idlibs.xml b/id/server/component-idlibs.xml index c967690d5..8edd4793f 100644 --- a/id/server/component-idlibs.xml +++ b/id/server/component-idlibs.xml @@ -30,9 +30,9 @@ - iaik.prod:iaik_Pkcs11Wrapper:dll:wince30arm + iaik.prod:iaik_Pkcs11Wrapper:dll:win64 - /pkcs11/wince30arm + /pkcs11/win64 pkcs11wrapper.${extension} diff --git a/pom.xml b/pom.xml index e1d899e12..1f1bb30b0 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ iaik.prod iaik_jce_full - 3.16_MOA + 3.18_MOA compile @@ -261,7 +261,7 @@ iaik.prod iaik_ecc - 2.16 + 2.19 provided @@ -285,13 +285,13 @@ iaik.prod iaik_Pkcs11Wrapper - 1.2.16 + 1.2.17 compile iaik.prod iaik_Pkcs11Wrapper - 1.2.16 + 1.2.17 win32 dll runtime @@ -299,7 +299,7 @@ iaik.prod iaik_Pkcs11Wrapper - 1.2.16 + 1.2.17 linux so runtime @@ -307,7 +307,7 @@ iaik.prod iaik_Pkcs11Wrapper - 1.2.16 + 1.2.17 linux_x64 so runtime @@ -315,7 +315,7 @@ iaik.prod iaik_Pkcs11Wrapper - 1.2.16 + 1.2.17 solaris_sparc so runtime @@ -323,16 +323,16 @@ iaik.prod iaik_Pkcs11Wrapper - 1.2.16 + 1.2.17 solaris_sparcv9 so runtime - + iaik.prod iaik_Pkcs11Wrapper - 1.2.16 - wince30arm + 1.2.17 + win64 dll runtime @@ -414,7 +414,7 @@ iaik.prod iaik_Pkcs11Wrapper - wince30arm + win64 dll runtime diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml index 7a76487ab..ce32c47b8 100644 --- a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml +++ b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml @@ -1,13 +1,14 @@ iaik.prod iaik_Pkcs11Provider - 1.2.4 + 1.2.6 - 1.2.4 - 1.2.4 + 1.2.6 + 1.2.6 1.2.4 + 1.2.6 - 20070814085134 + 20090810085134 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.md5 b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.md5 index 47cb1967e..8d4b8aa6c 100644 --- a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.md5 +++ b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.md5 @@ -1 +1 @@ -0a8cf5b3db2e06b822ab0a396784f102 \ No newline at end of file +7D1B96A00ED443FC6B744474B5BF3388 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.sha1 b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.sha1 index f83857744..29841c45f 100644 --- a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.sha1 +++ b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.sha1 @@ -1 +1 @@ -4d66c586f60c6ffc9a330b5ce1f0644d7399966a \ No newline at end of file +28B666EBA7FE10C7B7EC6515A08CD718523F03B6 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml index 7a76487ab..ce32c47b8 100644 --- a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml +++ b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml @@ -1,13 +1,14 @@ iaik.prod iaik_Pkcs11Provider - 1.2.4 + 1.2.6 - 1.2.4 - 1.2.4 + 1.2.6 + 1.2.6 1.2.4 + 1.2.6 - 20070814085134 + 20090810085134 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.md5 b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.md5 index 47cb1967e..8d4b8aa6c 100644 --- a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.md5 +++ b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.md5 @@ -1 +1 @@ -0a8cf5b3db2e06b822ab0a396784f102 \ No newline at end of file +7D1B96A00ED443FC6B744474B5BF3388 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.sha1 b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.sha1 index f83857744..17980d2f0 100644 --- a/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.sha1 +++ b/repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.sha1 @@ -1 +1 @@ -4d66c586f60c6ffc9a330b5ce1f0644d7399966a \ No newline at end of file +098BE92B2A0E2647C692AC89C34DCF121992F2F5 \ No newline at end of file diff --git a/spss/server/history.txt b/spss/server/history.txt index 7a14b56ea..11853dbbf 100644 --- a/spss/server/history.txt +++ b/spss/server/history.txt @@ -4,6 +4,11 @@ - IAIK Libraries aktualisiert: iaik-moa: Version 1.26 + iaik-ecc: Version 2.19 + iaik-jce: Version 3.18_MOA + iaikPkcs11Provider: Version 1.2.6 + iaikPkcs11Wrapper: Version 1.2.17 + - Überprüfung von ArchiveCutOff und Implementierung eines Retention Intervalls für CRLs. - Hinzufügen der Möglichkeit Retention Intervalle für bestimmte CAs zu konfigurieren. Dadurch wurde auch das Konfigurations Schema und der Namespace geändert. diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java index 37a5c09eb..fab8a6dd7 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java @@ -65,6 +65,7 @@ import at.gv.egovernment.moa.util.MOAEntityResolver; import at.gv.egovernment.moa.util.MOAErrorHandler; import at.gv.egovernment.moa.util.StreamEntityResolver; import at.gv.egovernment.moa.util.StreamUtils; +import at.gv.egovernment.moa.util.XPathUtils; /** * A class to create DataObjects contained in different @@ -194,10 +195,12 @@ public class DataObjectFactory { Element element = checkForSingleElement(((ContentXML) content).getXMLContent()); contentBytes = DOMUtils.serializeNode(element, "UTF-8"); + break; } - default : + default : { contentBytes = null; // this will not happen + } } } catch (MOAApplicationException e) { throw e; @@ -205,8 +208,23 @@ public class DataObjectFactory { throw new MOAApplicationException("2219", null); } + // For logging in Debug-Mode: Mask baseid with xxx + String logString = new String(contentBytes); + String startS = ""; + String endS = "urn:publicid:gv.at:baseid"; + String logWithMaskedBaseid; + int start = logString.indexOf(startS); + if (start > -1) { + int end = logString.indexOf(endS); + logWithMaskedBaseid = logString.substring(0, start); + logWithMaskedBaseid += startS; + logWithMaskedBaseid += "xxxxxxxxxxxxxxxxxxxxxxxx"; + logWithMaskedBaseid += logString.substring(end, logString.length()); + } + else + logWithMaskedBaseid = logString; // try to parse validating - Logger.trace(">>> parsing the following content: \n" + new String(contentBytes)); + Logger.trace(">>> parsing the following content: \n" + logWithMaskedBaseid); try { ByteArrayInputStream is = new ByteArrayInputStream(contentBytes); Document doc = diff --git a/spss/server/tools/.settings/org.maven.ide.eclipse.prefs b/spss/server/tools/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..373d31d5c --- /dev/null +++ b/spss/server/tools/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Tue Jul 07 16:06:50 CEST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 -- cgit v1.2.3