aboutsummaryrefslogtreecommitdiff
path: root/spss/server
diff options
context:
space:
mode:
authorkstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>2009-08-11 08:11:40 +0000
committerkstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>2009-08-11 08:11:40 +0000
commit5166270383bd11faeaa484ab878844f9b9445527 (patch)
tree6b1b646e1cf82b94faaeb991dbb98d35e2b36cfa /spss/server
parent2628b4fe3d06aa0d083f5edc8377536bd3c73eac (diff)
downloadmoa-id-spss-5166270383bd11faeaa484ab878844f9b9445527.tar.gz
moa-id-spss-5166270383bd11faeaa484ab878844f9b9445527.tar.bz2
moa-id-spss-5166270383bd11faeaa484ab878844f9b9445527.zip
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1127 d688527b-c9ab-4aba-bd8d-4036d912da1d
Diffstat (limited to 'spss/server')
-rw-r--r--spss/server/history.txt5
-rw-r--r--spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java22
-rw-r--r--spss/server/tools/.settings/org.maven.ide.eclipse.prefs9
3 files changed, 34 insertions, 2 deletions
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 <code>DataObject</code>s 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 = "<pr:Identification><pr:Value>";
+ String endS = "</pr:Value><pr:Type>urn:publicid:gv.at:baseid</pr:Type>";
+ 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