aboutsummaryrefslogtreecommitdiff
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
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
-rw-r--r--component-pkcs11libs.xml4
-rw-r--r--id/history.txt5
-rw-r--r--id/readme_1.4.5.txt1
-rw-r--r--id/server/component-idlibs.xml4
-rw-r--r--pom.xml24
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml9
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.md52
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata-central.xml.sha12
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml9
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.md52
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Provider/maven-metadata.xml.sha12
-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
14 files changed, 70 insertions, 30 deletions
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 @@
</dependencySet>
<dependencySet>
<includes>
- <include>iaik.prod:iaik_Pkcs11Wrapper:dll:wince30arm</include>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win64</include>
</includes>
- <outputDirectory>/pkcs11/wince30arm</outputDirectory>
+ <outputDirectory>/pkcs11/win64</outputDirectory>
<outputFileNameMapping>pkcs11wrapper.${extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
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 @@
</dependencySet>
<dependencySet>
<includes>
- <include>iaik.prod:iaik_Pkcs11Wrapper:dll:wince30arm</include>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win64</include>
</includes>
- <outputDirectory>/pkcs11/wince30arm</outputDirectory>
+ <outputDirectory>/pkcs11/win64</outputDirectory>
<outputFileNameMapping>pkcs11wrapper.${extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
diff --git a/pom.xml b/pom.xml
index e1d899e12..1f1bb30b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,7 +243,7 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_jce_full</artifactId>
- <version>3.16_MOA</version>
+ <version>3.18_MOA</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -261,7 +261,7 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_ecc</artifactId>
- <version>2.16</version>
+ <version>2.19</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -285,13 +285,13 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Wrapper</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Wrapper</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
<classifier>win32</classifier>
<type>dll</type>
<scope>runtime</scope>
@@ -299,7 +299,7 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Wrapper</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
<classifier>linux</classifier>
<type>so</type>
<scope>runtime</scope>
@@ -307,7 +307,7 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Wrapper</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
<classifier>linux_x64</classifier>
<type>so</type>
<scope>runtime</scope>
@@ -315,7 +315,7 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Wrapper</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
<classifier>solaris_sparc</classifier>
<type>so</type>
<scope>runtime</scope>
@@ -323,16 +323,16 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Wrapper</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
<classifier>solaris_sparcv9</classifier>
<type>so</type>
<scope>runtime</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Wrapper</artifactId>
- <version>1.2.16</version>
- <classifier>wince30arm</classifier>
+ <version>1.2.17</version>
+ <classifier>win64</classifier>
<type>dll</type>
<scope>runtime</scope>
</dependency>
@@ -414,7 +414,7 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Wrapper</artifactId>
- <classifier>wince30arm</classifier>
+ <classifier>win64</classifier>
<type>dll</type>
<scope>runtime</scope>
</dependency>
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 @@
<?xml version="1.0" encoding="UTF-8"?><metadata>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Provider</artifactId>
- <version>1.2.4</version>
+ <version>1.2.6</version>
<versioning>
- <latest>1.2.4</latest>
- <release>1.2.4</release>
+ <latest>1.2.6</latest>
+ <release>1.2.6</release>
<versions>
<version>1.2.4</version>
+ <version>1.2.6</version>
</versions>
- <lastUpdated>20070814085134</lastUpdated>
+ <lastUpdated>20090810085134</lastUpdated>
</versioning>
</metadata> \ 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 @@
<?xml version="1.0" encoding="UTF-8"?><metadata>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Provider</artifactId>
- <version>1.2.4</version>
+ <version>1.2.6</version>
<versioning>
- <latest>1.2.4</latest>
- <release>1.2.4</release>
+ <latest>1.2.6</latest>
+ <release>1.2.6</release>
<versions>
<version>1.2.4</version>
+ <version>1.2.6</version>
</versions>
- <lastUpdated>20070814085134</lastUpdated>
+ <lastUpdated>20090810085134</lastUpdated>
</versioning>
</metadata> \ 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 <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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 00:01:12 +0000