From 3ada8956004e645e8d5ba52bf8f214ca84e11bfb Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 8 Jul 2008 15:22:24 +0000
Subject: New manadate validator now is more prepared for wbPK representations

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1085 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../moa-id/transforms/TransformsInfoAuthBlockText.xml   |   6 +++---
 .../TransformsInfoAuthBlockText_deprecated.xml          |   6 +++---
 .../moa-spss/profiles/MOAIDTransformAuthBlockText.xml   |   6 +++---
 .../profiles/MOAIDTransformAuthBlockText_deprecated.xml |   6 +++---
 id/server/idserverlib/pom.xml                           |   2 +-
 .../id/mandate-validate/1.0/mandate-validate-1.0.jar    | Bin 24293 -> 0 bytes
 .../mandate-validate/1.0/mandate-validate-1.0.jar.md5   |   1 -
 .../mandate-validate/1.0/mandate-validate-1.0.jar.sha1  |   1 -
 .../id/mandate-validate/1.0/mandate-validate-1.0.pom    |   7 -------
 .../mandate-validate/1.0/mandate-validate-1.0.pom.md5   |   1 -
 .../mandate-validate/1.0/mandate-validate-1.0.pom.sha1  |   1 -
 .../id/mandate-validate/1.1/mandate-validate-1.1.jar    | Bin 0 -> 24292 bytes
 .../mandate-validate/1.1/mandate-validate-1.1.jar.md5   |   1 +
 .../mandate-validate/1.1/mandate-validate-1.1.jar.sha1  |   1 +
 .../id/mandate-validate/1.1/mandate-validate-1.1.pom    |   7 +++++++
 .../mandate-validate/1.1/mandate-validate-1.1.pom.md5   |   1 +
 .../mandate-validate/1.1/mandate-validate-1.1.pom.sha1  |   1 +
 .../MOA_Test_CA.20070823-20131022.Serno01.cer           | Bin 0 -> 958 bytes
 .../MOA_Test_CA.20070823-20131022.Serno01.cer           | Bin 0 -> 958 bytes
 .../EGIZ_Test_CA_-_Root.20070829-20180101.SerNo00.cer   | Bin 0 -> 1170 bytes
 20 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.jar
 delete mode 100644 repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.jar.md5
 delete mode 100644 repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.jar.sha1
 delete mode 100644 repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.pom
 delete mode 100644 repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.pom.md5
 delete mode 100644 repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.pom.sha1
 create mode 100644 repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.jar
 create mode 100644 repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.jar.md5
 create mode 100644 repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.jar.sha1
 create mode 100644 repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.pom
 create mode 100644 repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.pom.md5
 create mode 100644 repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.pom.sha1
 create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/MOA_Test_CA.20070823-20131022.Serno01.cer
 create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/MOA_Test_CA.20070823-20131022.Serno01.cer
 create mode 100644 spss/handbook/conf/moa-spss/trustProfiles/test/EGIZ_Test_CA_-_Root.20070829-20180101.SerNo00.cer

diff --git a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml
index bbf2f4608..0951bd415 100644
--- a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml
+++ b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml
@@ -54,10 +54,10 @@
 									<xsl:if test="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']">, 
 										<xsl:value-of select="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']/saml:AttributeValue/text()"/>
 									</xsl:if>, in deren Auftrag zu handeln.
-									<xsl:if test="//saml:Attribute[@AttributeName='MandatorWbpk']">
-										<h4>wbPK(*) des Vollmachtgebers: <xsl:value-of select="//saml:Attribute[@AttributeName='MandatorWbpk']/saml:AttributeValue/text()"/></h4>
-									</xsl:if>
 								</h4>
+								<xsl:if test="//saml:Attribute[@AttributeName='MandatorWbpk']">
+									<h4>wbPK(*) des Vollmachtgebers: <xsl:value-of select="//saml:Attribute[@AttributeName='MandatorWbpk']/saml:AttributeValue/text()"/></h4>
+								</xsl:if>
 								<p/>
 							</xsl:if>
 							<xsl:choose>
diff --git a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText_deprecated.xml b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText_deprecated.xml
index a41bf93c6..2f087aaf6 100644
--- a/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText_deprecated.xml
+++ b/id/server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText_deprecated.xml
@@ -50,10 +50,10 @@
 									<xsl:if test="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']">, 
 										<xsl:value-of select="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']/saml:AttributeValue/text()"/>
 									</xsl:if>, in deren Auftrag zu handeln.
-									<xsl:if test="//saml:Attribute[@AttributeName='MandatorWbpk']">
-										<h4>wbPK(*) des Vollmachtgebers: <xsl:value-of select="//saml:Attribute[@AttributeName='MandatorWbpk']/saml:AttributeValue/text()"/></h4>
-									</xsl:if>
 								</h4>
+								<xsl:if test="//saml:Attribute[@AttributeName='MandatorWbpk']">
+									<h4>wbPK(*) des Vollmachtgebers: <xsl:value-of select="//saml:Attribute[@AttributeName='MandatorWbpk']/saml:AttributeValue/text()"/></h4>
+								</xsl:if>
 								<p/>
 							</xsl:if>
 							<xsl:choose>
diff --git a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText.xml
index 7feeb563f..43ee1f704 100644
--- a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText.xml
+++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText.xml
@@ -55,10 +55,10 @@
 									<xsl:if test="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']">, 
 										<xsl:value-of select="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']/saml:AttributeValue/text()"/>
 									</xsl:if>, in deren Auftrag zu handeln.
-									<xsl:if test="//saml:Attribute[@AttributeName='MandatorWbpk']">
-										<h4>wbPK(*) des Vollmachtgebers: <xsl:value-of select="//saml:Attribute[@AttributeName='MandatorWbpk']/saml:AttributeValue/text()"/></h4>
-									</xsl:if>
 								</h4>
+								<xsl:if test="//saml:Attribute[@AttributeName='MandatorWbpk']">
+									<h4>wbPK(*) des Vollmachtgebers: <xsl:value-of select="//saml:Attribute[@AttributeName='MandatorWbpk']/saml:AttributeValue/text()"/></h4>
+								</xsl:if>
 								<p/>
 							</xsl:if>
 							<xsl:choose>
diff --git a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText_deprecated.xml b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText_deprecated.xml
index 802c4d11c..885aa766a 100644
--- a/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText_deprecated.xml
+++ b/id/server/data/deploy/conf/moa-spss/profiles/MOAIDTransformAuthBlockText_deprecated.xml
@@ -51,10 +51,10 @@
 									<xsl:if test="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']">, 
 										<xsl:value-of select="//saml:Attribute[@AttributeName='MandatorDomainIdentifier']/saml:AttributeValue/text()"/>
 									</xsl:if>, in deren Auftrag zu handeln.
-									<xsl:if test="//saml:Attribute[@AttributeName='MandatorWbpk']">
-										<h4>wbPK(*) des Vollmachtgebers: <xsl:value-of select="//saml:Attribute[@AttributeName='MandatorWbpk']/saml:AttributeValue/text()"/></h4>
-									</xsl:if>
 								</h4>
+								<xsl:if test="//saml:Attribute[@AttributeName='MandatorWbpk']">
+									<h4>wbPK(*) des Vollmachtgebers: <xsl:value-of select="//saml:Attribute[@AttributeName='MandatorWbpk']/saml:AttributeValue/text()"/></h4>
+								</xsl:if>
 								<p/>
 							</xsl:if>
 							<xsl:choose>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 64f69c214..c8fc02844 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -124,7 +124,7 @@
 		<dependency>
 			<groupId>at.gv.egovernment.moa.id</groupId>
 			<artifactId>mandate-validate</artifactId>
-			<version>1.0</version>
+			<version>1.1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.jar b/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.jar
deleted file mode 100644
index 21d86c338..000000000
Binary files a/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.jar and /dev/null differ
diff --git a/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.jar.md5 b/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.jar.md5
deleted file mode 100644
index c32158b3b..000000000
--- a/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-2d3655dea63771be43ece3eaa16b82ad
\ No newline at end of file
diff --git a/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.jar.sha1 b/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.jar.sha1
deleted file mode 100644
index f2dcb61bf..000000000
--- a/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2685c61f99bda72813f1d8961fca7454a51d5b3a
\ No newline at end of file
diff --git a/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.pom b/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.pom
deleted file mode 100644
index 4e3a79da1..000000000
--- a/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.pom
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>at.gv.egovernment.moa.id</groupId>
-  <artifactId>mandate-validate</artifactId>
-  <version>1.0</version>
-  <description>Mandate Infobox Validator for MOA-ID</description>
-</project>
diff --git a/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.pom.md5 b/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.pom.md5
deleted file mode 100644
index 489105d20..000000000
--- a/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-aede47770bdc200272ab25dc592ba9a2
\ No newline at end of file
diff --git a/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.pom.sha1 b/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.pom.sha1
deleted file mode 100644
index 9a8d887f5..000000000
--- a/repository/at/gv/egovernment/moa/id/mandate-validate/1.0/mandate-validate-1.0.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6ab04e68a562187282f0ec40209a07353f12c325
\ No newline at end of file
diff --git a/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.jar b/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.jar
new file mode 100644
index 000000000..e82986124
Binary files /dev/null and b/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.jar differ
diff --git a/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.jar.md5 b/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.jar.md5
new file mode 100644
index 000000000..555bf9b75
--- /dev/null
+++ b/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.jar.md5
@@ -0,0 +1 @@
+5fe35cf763701c4fab80d0f151c6f55b
\ No newline at end of file
diff --git a/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.jar.sha1 b/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.jar.sha1
new file mode 100644
index 000000000..7f077274a
--- /dev/null
+++ b/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.jar.sha1
@@ -0,0 +1 @@
+2c52349bf0255de412507628e764ee0433b210a3
\ No newline at end of file
diff --git a/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.pom b/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.pom
new file mode 100644
index 000000000..abfdf6187
--- /dev/null
+++ b/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.pom
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>at.gv.egovernment.moa.id</groupId>
+  <artifactId>mandate-validate</artifactId>
+  <version>1.1</version>
+  <description>Mandate Infobox Validator for MOA-ID</description>
+</project>
diff --git a/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.pom.md5 b/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.pom.md5
new file mode 100644
index 000000000..e5e428512
--- /dev/null
+++ b/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.pom.md5
@@ -0,0 +1 @@
+91ea39c3ac0f82bf63dd13a7999b5190
\ No newline at end of file
diff --git a/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.pom.sha1 b/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.pom.sha1
new file mode 100644
index 000000000..f02972492
--- /dev/null
+++ b/repository/at/gv/egovernment/moa/id/mandate-validate/1.1/mandate-validate-1.1.pom.sha1
@@ -0,0 +1 @@
+b43ee1a3b9ce95598841aecdf4d52d95f87530d5
\ No newline at end of file
diff --git a/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/MOA_Test_CA.20070823-20131022.Serno01.cer b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/MOA_Test_CA.20070823-20131022.Serno01.cer
new file mode 100644
index 000000000..05a8b86f9
Binary files /dev/null and b/spss/handbook/conf/moa-spss/trustProfiles/certifiedSignature+Test/MOA_Test_CA.20070823-20131022.Serno01.cer differ
diff --git a/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/MOA_Test_CA.20070823-20131022.Serno01.cer b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/MOA_Test_CA.20070823-20131022.Serno01.cer
new file mode 100644
index 000000000..05a8b86f9
Binary files /dev/null and b/spss/handbook/conf/moa-spss/trustProfiles/secureSignature+Test/MOA_Test_CA.20070823-20131022.Serno01.cer differ
diff --git a/spss/handbook/conf/moa-spss/trustProfiles/test/EGIZ_Test_CA_-_Root.20070829-20180101.SerNo00.cer b/spss/handbook/conf/moa-spss/trustProfiles/test/EGIZ_Test_CA_-_Root.20070829-20180101.SerNo00.cer
new file mode 100644
index 000000000..ed5ba194c
Binary files /dev/null and b/spss/handbook/conf/moa-spss/trustProfiles/test/EGIZ_Test_CA_-_Root.20070829-20180101.SerNo00.cer differ
-- 
cgit v1.2.3