aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml24
-rw-r--r--id.server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml24
-rw-r--r--id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml24
-rw-r--r--id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml24
-rw-r--r--id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml24
-rw-r--r--id.server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml24
-rw-r--r--id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml24
-rw-r--r--id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml24
-rw-r--r--id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockProseStyle.html.xml49
-rw-r--r--id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml (renamed from id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml)2
-rw-r--r--id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTableStyle.html.xml107
-rw-r--r--id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml (renamed from id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml)6
12 files changed, 320 insertions, 36 deletions
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml b/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml
index 255744903..a71ee44b6 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml
+++ b/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration.xml
@@ -17,8 +17,15 @@
</Templates-->
<!-- Transformationen fuer die Anzeige des AUTH-Block im Secure Viewer -->
<SecurityLayer>
- <!-- TransformInfo in Textform -->
- <TransformsInfo filename="transforms/TransformsInfoAuthBlockText.xml"/>
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/>
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/>
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</SecurityLayer>
<MOA-SP>
<!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-SP Web Service, falls MOA-SP ueber Web Service angesprochen wird.
@@ -65,8 +72,17 @@
<BKUSelectionTemplate URL="sampleTemplates/SampleBKUSelectionTemplate.html"/>
<Template URL="sampleTemplates/SampleTemplate.html"/>
</Templates-->
- <!-- TransformInfo in Tabellenform; falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
- <!--TransformsInfo filename="transforms/TransformsInfoAuthBlock.xml"/-->
+ <!-- Falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
+
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/> -->
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</AuthComponent>
</OnlineApplication>
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml b/id.server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml
index 2a06a7496..ac4ae2b33 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml
+++ b/id.server/data/deploy/conf/moa-id/SampleMOAIDConfigurationProxy.xml
@@ -18,8 +18,15 @@
</Templates-->
<!-- Transformationen fuer die Anzeige des AUTH-Block im Secure Viewer -->
<SecurityLayer>
- <!-- TransformInfo in Textform -->
- <TransformsInfo filename="transforms/TransformsInfoAuthBlockText.xml"/>
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/>
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/>
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</SecurityLayer>
<MOA-SP>
<!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-SP Web Service, falls MOA-SP ueber Web Service angesprochen wird.
@@ -77,8 +84,17 @@
<BKUSelectionTemplate URL="sampleTemplates/SampleBKUSelectionTemplate.html"/>
<Template URL="sampleTemplates/SampleTemplate.html"/>
</Templates-->
- <!-- TransformInfo in Tabellenform; falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
- <!--TransformsInfo filename="transforms/TransformsInfoAuthBlock.xml"/-->
+ <!-- Falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
+
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/> -->
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</AuthComponent>
<!-- fuer MOA-ID-PROXY -->
<ProxyComponent configFileURL="oa/SampleOAConfiguration.xml" sessionTimeOut="600">
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml b/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml
index 147fcd5eb..a1f6e7ff3 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml
+++ b/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKs.xml
@@ -19,8 +19,15 @@
</Templates-->
<!-- Transformationen fuer die Anzeige des AUTH-Block im Secure Viewer -->
<SecurityLayer>
- <!-- TransformInfo in Textform -->
- <TransformsInfo filename="transforms/TransformsInfoAuthBlockText.xml"/>
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/>
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/>
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</SecurityLayer>
<MOA-SP>
<!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-SP Web Service, falls MOA-SP ueber Web Service angesprochen wird.
@@ -69,8 +76,17 @@
<BKUSelectionTemplate URL="sampleTemplates/SampleBKUSelectionTemplate.html"/>
<Template URL="sampleTemplates/SampleTemplate.html"/>
</Templates-->
- <!-- TransformInfo in Tabellenform; falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
- <!--TransformsInfo filename="transforms/TransformsInfoAuthBlock.xml"/-->
+ <!-- Falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
+
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/> -->
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</AuthComponent>
</OnlineApplication>
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml b/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml
index c59f55d57..1dfb3db0d 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml
+++ b/id.server/data/deploy/conf/moa-id/SampleMOAIDConfiguration_withTestBKsProxy.xml
@@ -19,8 +19,15 @@
</Templates-->
<!-- Transformationen fuer die Anzeige des AUTH-Block im Secure Viewer -->
<SecurityLayer>
- <!-- TransformInfo in Textform -->
- <TransformsInfo filename="transforms/TransformsInfoAuthBlockText.xml"/>
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/>
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/>
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</SecurityLayer>
<MOA-SP>
<!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-SP Web Service, falls MOA-SP ueber Web Service angesprochen wird.
@@ -80,8 +87,17 @@
<BKUSelectionTemplate URL="sampleTemplates/SampleBKUSelectionTemplate.html"/>
<Template URL="sampleTemplates/SampleTemplate.html"/>
</Templates-->
- <!-- TransformInfo in Tabellenform; falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
- <!--TransformsInfo filename="transforms/TransformsInfoAuthBlock.xml"/-->
+ <!-- Falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
+
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/> -->
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</AuthComponent>
<!-- fuer MOA-ID-PROXY -->
<ProxyComponent configFileURL="oa/SampleOAConfiguration.xml" sessionTimeOut="600">
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml b/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml
index e9e6cf069..ac1f528d7 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml
+++ b/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration.xml
@@ -19,8 +19,15 @@
</Templates-->
<!-- Transformationen fuer die Anzeige des AUTH-Block im Secure Viewer -->
<SecurityLayer>
- <!-- TransformInfo in Textform -->
- <TransformsInfo filename="transforms/TransformsInfoAuthBlockText.xml"/>
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/>
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/>
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</SecurityLayer>
<MOA-SP>
<!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-SP Web Service, falls MOA-SP ueber Web Service angesprochen wird.
@@ -72,8 +79,17 @@
<BKUSelectionTemplate URL="sampleTemplates/SampleBKUSelectionTemplate.html"/>
<Template URL="sampleTemplates/SampleTemplate.html"/>
</Templates-->
- <!-- TransformInfo in Tabellenform; falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
- <!--TransformsInfo filename="transforms/TransformsInfoAuthBlock.xml"/-->
+ <!-- Falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
+
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/> -->
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</AuthComponent>
</OnlineApplication>
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml b/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml
index a2c062e75..564a14e7f 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml
+++ b/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfigurationProxy.xml
@@ -19,8 +19,15 @@
</Templates-->
<!-- Transformationen fuer die Anzeige des AUTH-Block im Secure Viewer -->
<SecurityLayer>
- <!-- TransformInfo in Textform -->
- <TransformsInfo filename="transforms/TransformsInfoAuthBlockText.xml"/>
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/>
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/>
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</SecurityLayer>
<MOA-SP>
<!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-SP Web Service, falls MOA-SP ueber Web Service angesprochen wird.
@@ -84,8 +91,17 @@
<BKUSelectionTemplate URL="sampleTemplates/SampleBKUSelectionTemplate.html"/>
<Template URL="sampleTemplates/SampleTemplate.html"/>
</Templates-->
- <!-- TransformInfo in Tabellenform; falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
- <!--TransformsInfo filename="transforms/TransformsInfoAuthBlock.xml"/-->
+ <!-- Falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
+
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/> -->
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</AuthComponent>
<!-- fuer MOA-ID-PROXY -->
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml b/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml
index ad60599b9..c9c96ccc0 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml
+++ b/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKs.xml
@@ -20,8 +20,15 @@
</Templates-->
<!-- Transformationen fuer die Anzeige des AUTH-Block im Secure Viewer -->
<SecurityLayer>
- <!-- TransformInfo in Textform -->
- <TransformsInfo filename="transforms/TransformsInfoAuthBlockText.xml"/>
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/>
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/>
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</SecurityLayer>
<MOA-SP>
<!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-SP Web Service, falls MOA-SP ueber Web Service angesprochen wird.
@@ -75,8 +82,17 @@
<BKUSelectionTemplate URL="sampleTemplates/SampleBKUSelectionTemplate.html"/>
<Template URL="sampleTemplates/SampleTemplate.html"/>
</Templates-->
- <!-- TransformInfo in Tabellenform; wird anstelle der Default-Transformationen verwendet -->
- <!--TransformsInfo filename="transforms/TransformsInfoAuthBlock.xml"/-->
+ <!-- Falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
+
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/> -->
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</AuthComponent>
</OnlineApplication>
diff --git a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml b/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml
index b83266a62..8522b7145 100644
--- a/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml
+++ b/id.server/data/deploy/conf/moa-id/SampleMOAWIDConfiguration_withTestBKsProxy.xml
@@ -20,8 +20,15 @@
</Templates-->
<!-- Transformationen fuer die Anzeige des AUTH-Block im Secure Viewer -->
<SecurityLayer>
- <!-- TransformInfo in Textform -->
- <TransformsInfo filename="transforms/TransformsInfoAuthBlockText.xml"/>
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/>
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/>
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</SecurityLayer>
<MOA-SP>
<!-- URL und akzeptierte TLS-Server-Zertifikate des MOA-SP Web Service, falls MOA-SP ueber Web Service angesprochen wird.
@@ -87,8 +94,17 @@
<BKUSelectionTemplate URL="sampleTemplates/SampleBKUSelectionTemplate.html"/>
<Template URL="sampleTemplates/SampleTemplate.html"/>
</Templates-->
- <!-- TransformInfo in Tabellenform; wird anstelle der Default-Transformationen verwendet -->
- <!--TransformsInfo filename="transforms/TransformsInfoAuthBlock.xml"/-->
+ <!-- Falls aktiviert, werden diese Transformationen anstelle der Default-Transformationen verwendet -->
+
+ <!-- TransformInfo in Prosaform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Prosaform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockProseStyle.html.xml"/> -->
+
+ <!-- TransformInfo in Tabellenform, bevorzugte Variante: xhtml -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml"/> -->
+ <!-- TransformInfo in Tabellenform, alternative Variante fuer aeltere BKU -->
+ <!-- <TransformsInfo filename="transforms/TransformsInfoAuthBlockTableStyle.html.xml"/> -->
</AuthComponent>
<!-- fuer MOA-ID-PROXY -->
<ProxyComponent configFileURL="oa/SampleOAConfiguration.xml" sessionTimeOut="600">
diff --git a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockProseStyle.html.xml b/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockProseStyle.html.xml
new file mode 100644
index 000000000..07d926d14
--- /dev/null
+++ b/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockProseStyle.html.xml
@@ -0,0 +1,49 @@
+<sl10:TransformsInfo>
+ <dsig:Transforms>
+ <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+ <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
+ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#">
+ <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+ <xsl:template match="/" xmlns="http://www.w3.org/1999/xhtml">
+ <html>
+ <head>
+ <title>Signatur der Anmeldedaten</title>
+ </head>
+ <body>
+ <h1>Signatur der Anmeldedaten</h1>
+ <p/>
+ <h4>Mit meiner elektronischen Signatur beantrage ich, <b><xsl:value-of select="//@Issuer"/></b>,
+ geboren am
+ <xsl:value-of select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,9,2)"/>.
+ <xsl:value-of select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,6,2)"/>.
+ <xsl:value-of select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,1,4)"/>,
+ den Zugang zur gesicherten Anwendung.</h4>
+ <p/>
+ <h4>Datum und Uhrzeit:
+ <xsl:value-of select="substring(//@IssueInstant,9,2)"/>.
+ <xsl:value-of select="substring(//@IssueInstant,6,2)"/>.
+ <xsl:value-of select="substring(//@IssueInstant,1,4)"/>,
+ <xsl:value-of select="substring(//@IssueInstant,12,2)"/>:
+ <xsl:value-of select="substring(//@IssueInstant,15,2)"/>:
+ <xsl:value-of select="substring(//@IssueInstant,18,2)"/>
+ </h4>
+ <xsl:if test="//saml:Attribute[@AttributeName='wbPK']">
+ <h4>wbPK(*): <xsl:value-of select="//saml:Attribute[@AttributeName='wbPK']/saml:AttributeValue/pr:Identification/pr:Value"/>
+ </h4>
+ <p/>
+ <hr/>
+ <h6>(*) wbPK: Das <i>wirtschaftsbereichsspezifische
+ Personenkennzeichen</i> wird aus den jeweiligen Stammzahlen des Bürgers und des Wirtschaftsunternehmens
+ berechnet und ermöglicht eine eindeutige Zuordnung des Bürgers zum Wirtschaftsunternehmen.</h6>
+ </xsl:if>
+ </body>
+ </html>
+ </xsl:template>
+ </xsl:stylesheet>
+ </dsig:Transform>
+ <dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/>
+ </dsig:Transforms>
+ <sl10:FinalDataMetaInfo>
+ <sl10:MimeType>text/html</sl10:MimeType>
+ </sl10:FinalDataMetaInfo>
+</sl10:TransformsInfo>
diff --git a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml b/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml
index 85d449b2e..5089140b4 100644
--- a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockText.xml
+++ b/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockProseStyle.xhtml.xml
@@ -39,6 +39,6 @@ geboren am
<dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/>
</dsig:Transforms>
<sl10:FinalDataMetaInfo>
- <sl10:MimeType>text/html</sl10:MimeType>
+ <sl10:MimeType>application/xhtml+xml</sl10:MimeType>
</sl10:FinalDataMetaInfo>
</sl10:TransformsInfo>
diff --git a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTableStyle.html.xml b/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTableStyle.html.xml
new file mode 100644
index 000000000..05f91750c
--- /dev/null
+++ b/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTableStyle.html.xml
@@ -0,0 +1,107 @@
+<sl10:TransformsInfo>
+ <dsig:Transforms>
+ <dsig:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+ <dsig:Transform Algorithm="http://www.w3.org/TR/1999/REC-xslt-19991116">
+ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#">
+ <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+ <xsl:template match="/" xmlns="http://www.w3.org/1999/xhtml">
+ <html>
+ <head>
+ <title>Signatur der Anmeldedaten</title>
+ </head>
+ <body>
+ <p>Bitte bestätigen Sie mit Ihrer Unterschrift folgende Angaben:</p>
+ <table>
+ <tr>
+ <td>
+ <b>Name:</b>
+ </td>
+ <td>
+ <xsl:value-of select="//@Issuer"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <b>Geburtsdatum:</b>
+ </td>
+ <td>
+ <xsl:value-of select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,9,2)"/>.
+ <xsl:value-of select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,6,2)"/>.
+ <xsl:value-of select="substring(//saml:Attribute[@AttributeName='Geburtsdatum']/saml:AttributeValue,1,4)"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <b>Applikation:</b>
+ </td>
+ <td>
+ <xsl:value-of select="//saml:Attribute[@AttributeName='OA']/saml:AttributeValue"/>
+ </td>
+ </tr>
+ <xsl:if test="//saml:Attribute[@AttributeName='Geschaeftsbereich']">
+ <tr>
+ <td>
+ <b>Geschäftsbereich:</b>
+ </td>
+ <td>
+ <xsl:value-of select="//saml:Attribute[@AttributeName='Geschaeftsbereich']/saml:AttributeValue"/>
+ </td>
+ </tr>
+ </xsl:if>
+ <tr>
+ <td>
+ <b>Anmeldeserver:</b>
+ </td>
+ <td>
+ <xsl:value-of select="//saml:NameIdentifier"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <b>Datum:</b>
+ </td>
+ <td>
+ <xsl:value-of select="substring(//@IssueInstant,9,2)"/>.
+ <xsl:value-of select="substring(//@IssueInstant,6,2)"/>.
+ <xsl:value-of select="substring(//@IssueInstant,1,4)"/>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <b>Uhrzeit:</b>
+ </td>
+ <td>
+ <xsl:value-of select="substring(//@IssueInstant,12,2)"/>:
+ <xsl:value-of select="substring(//@IssueInstant,15,2)"/>:
+ <xsl:value-of select="substring(//@IssueInstant,18,2)"/>
+ </td>
+ </tr>
+ <xsl:if test="//saml:Attribute[@AttributeName='wbPK']">
+ <tr>
+ <td>
+ <b>wbPK (*):</b>
+ </td>
+ <td>
+ <xsl:value-of select="//saml:Attribute[@AttributeName='wbPK']/saml:AttributeValue/pr:Identification/pr:Value"/>
+ </td>
+ </tr>
+ </xsl:if>
+ </table>
+ <xsl:if test="//saml:Attribute[@AttributeName='wbPK']">
+ <p/>
+ <hr/>
+ <h6>(*): Das <i>wirtschaftsbereichsspezifische Personenkennzeichen (wbPK)</i> wird aus den jeweiligen
+ Stammzahlen des Bürgers und des Wirtschaftsunternehmens berechnet und ermöglicht eine eindeutige
+ Zuordnung des Bürgers zum Wirtschaftsunternehmen.</h6>
+ </xsl:if>
+ </body>
+ </html>
+ </xsl:template>
+ </xsl:stylesheet>
+ </dsig:Transform>
+ <dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/>
+ </dsig:Transforms>
+ <sl10:FinalDataMetaInfo>
+ <sl10:MimeType>text/html</sl10:MimeType>
+ </sl10:FinalDataMetaInfo>
+</sl10:TransformsInfo>
diff --git a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml b/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml
index 715c1df92..915a6bf2f 100644
--- a/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlock.xml
+++ b/id.server/data/deploy/conf/moa-id/transforms/TransformsInfoAuthBlockTableStyle.xhtml.xml
@@ -43,8 +43,8 @@
</td>
</tr>
<xsl:if test="//saml:Attribute[@AttributeName='Geschaeftsbereich']">
- <tr class="boldstyle">
- <td>
+ <tr>
+ <td class="boldstyle">
Geschäftsbereich:
</td>
<td>
@@ -100,6 +100,6 @@
<dsig:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments"/>
</dsig:Transforms>
<sl10:FinalDataMetaInfo>
- <sl10:MimeType>text/html</sl10:MimeType>
+ <sl10:MimeType>application/xhtml+xml</sl10:MimeType>
</sl10:FinalDataMetaInfo>
</sl10:TransformsInfo>