From 1c567f6eb16fa10d3811fbaaf70c4ab04fb08077 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 6 Feb 2014 15:42:53 +0100
Subject: BRZ:  -add SAML1 SourceID parameter in moa-id general

Bugfix:
 -SSO target had an error in case of business-service
 -OA with business-service whichout single sign-on produce an error
---
 .../src/main/resources/config/moaid_config_2.0.xsd | 46 +++++++++++-----------
 1 file changed, 22 insertions(+), 24 deletions(-)

(limited to 'id/server/moa-id-commons/src/main/resources')

diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
index 33ad5c990..7944a7321 100644
--- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
+++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
@@ -79,8 +79,8 @@
 	</xsd:simpleType>
 	<xsd:complexType name="StorkAttribute">
 		<xsd:sequence>
-			<xsd:element name="name" type="xsd:string"></xsd:element>
-			<xsd:element name="mandatory" type="xsd:boolean"></xsd:element>
+			<xsd:element name="name" type="xsd:string"/>
+			<xsd:element name="mandatory" type="xsd:boolean"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:simpleType name="LoginType">
@@ -281,6 +281,9 @@
 					<xsd:sequence>
 						<xsd:element name="SAML1" minOccurs="0">
 							<xsd:complexType>
+								<xsd:sequence>
+									<xsd:element name="SourceID" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+								</xsd:sequence>
 								<xsd:attribute name="isActive" type="xsd:boolean" default="false"/>
 							</xsd:complexType>
 						</xsd:element>
@@ -860,10 +863,10 @@
 					<xsd:element ref="SAMLSigningParameter"/>
 				</xsd:sequence>
 				<xsd:sequence>
-					<xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0" />
+					<xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0"/>
 				</xsd:sequence>
 				<xsd:sequence>
-					<xsd:element ref="Attributes" maxOccurs="unbounded" minOccurs="0" />
+					<xsd:element ref="Attributes" minOccurs="0" maxOccurs="unbounded"/>
 				</xsd:sequence>
 			</xsd:choice>
 		</xsd:complexType>
@@ -926,15 +929,14 @@
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
-    <xsd:element name="OA_STORK">
-   		<xsd:complexType>
+	<xsd:element name="OA_STORK">
+		<xsd:complexType>
 			<xsd:sequence>
-				<xsd:element name="StorkLogonEnabled"
-					type="xsd:boolean" />
-				<xsd:element ref="Qaa" maxOccurs="1" minOccurs="0"></xsd:element>
-				<xsd:element ref="OAAttributes" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+				<xsd:element name="StorkLogonEnabled" type="xsd:boolean"/>
+				<xsd:element ref="Qaa" minOccurs="0" maxOccurs="1"/>
+				<xsd:element ref="OAAttributes" minOccurs="0" maxOccurs="unbounded"/>
 			</xsd:sequence>
-   		</xsd:complexType>
+		</xsd:complexType>
 	</xsd:element>
 	<xsd:element name="Contact">
 		<xsd:complexType>
@@ -997,17 +999,13 @@
 			<xsd:element name="OnlyMandateLoginAllowed" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
 	</xsd:complexType>
-
-    <xsd:element name="Attributes" type="StorkAttribute"></xsd:element>
-
-    <xsd:element name="Qaa" type="QualityAuthenticationAssuranceLevelType"></xsd:element>
-
-    <xsd:complexType name="OAStorkAttribute">
-    	<xsd:sequence>
-    		<xsd:element name="mandatory" type="xsd:boolean"></xsd:element>
-    		<xsd:element name="name" type="xsd:string"></xsd:element>
-    	</xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:element name="OAAttributes" type="OAStorkAttribute"></xsd:element>
+	<xsd:element name="Attributes" type="StorkAttribute"/>
+	<xsd:element name="Qaa" type="QualityAuthenticationAssuranceLevelType"/>
+	<xsd:complexType name="OAStorkAttribute">
+		<xsd:sequence>
+			<xsd:element name="mandatory" type="xsd:boolean"/>
+			<xsd:element name="name" type="xsd:string"/>
+		</xsd:sequence>
+	</xsd:complexType>
+	<xsd:element name="OAAttributes" type="OAStorkAttribute"/>
 </xsd:schema>
-- 
cgit v1.2.3


From b905c43b4630d290026d03e744413b20f1b73551 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 11 Feb 2014 08:13:51 +0100
Subject: * add OA specific BKU selection template * add OA specific
 send-assertion template * add OA specific applet height and width
 configuration * add PVP2.x reload checkbox in PVP2.x OA configuration

* add new elements to MOA-ID configuration
---
 .../src/main/resources/config/moaid_config_2.0.xsd | 58 ++--------------------
 1 file changed, 4 insertions(+), 54 deletions(-)

(limited to 'id/server/moa-id-commons/src/main/resources')

diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
index 7944a7321..2461e1274 100644
--- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
+++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
@@ -160,36 +160,6 @@
 						</xsd:complexContent>
 					</xsd:complexType>
 				</xsd:element>
-				<xsd:element name="ProxyComponent_General" minOccurs="0">
-					<xsd:annotation>
-						<xsd:documentation>enthält Konfigurationsparameter der
-							Proxy-Komponente
-						</xsd:documentation>
-					</xsd:annotation>
-					<xsd:complexType>
-						<xsd:sequence>
-							<xsd:element name="AuthComponent">
-								<xsd:annotation>
-									<xsd:documentation>enthält Parameter für die Kommunikation zw.
-										Proxykomponente und Authenttisierungskomponente
-									</xsd:documentation>
-								</xsd:annotation>
-								<xsd:complexType>
-									<xsd:sequence>
-										<xsd:element name="ConnectionParameter_Proxy" type="ConnectionParameterClientAuthType" minOccurs="0">
-											<xsd:annotation>
-												<xsd:documentation>enthält Parameter für die SOAP-Verbindung
-													von der Proxy-Komponente zur Auth-Komponente (vgl.
-													AuthComponent/MOA-SP/ConnectionParameter)
-												</xsd:documentation>
-											</xsd:annotation>
-										</xsd:element>
-									</xsd:sequence>
-								</xsd:complexType>
-							</xsd:element>
-						</xsd:sequence>
-					</xsd:complexType>
-				</xsd:element>
 				<xsd:element name="OnlineApplication" type="OnlineApplication" maxOccurs="unbounded">
 					<xsd:annotation>
 						<xsd:documentation>enthält Parameter für die OA
@@ -463,6 +433,8 @@
 			<xsd:element name="Template" type="TemplateType" minOccurs="0" maxOccurs="3"/>
 			<xsd:element name="AditionalAuthBlockText" type="xsd:string" minOccurs="0"/>
 			<xsd:element name="BKUSelectionCustomization" type="BKUSelectionCustomizationType" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="BKUSelectionTemplate" type="TransformsInfoType" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="SendAssertionTemplate" type="TransformsInfoType" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:complexType name="TemplateType">
@@ -507,7 +479,6 @@
 			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
-	<xsd:complexType name="ProxyComponentType"/>
 	<xsd:complexType name="OnlineApplicationType">
 		<xsd:sequence>
 			<xsd:element name="isActive" type="xsd:boolean" default="false" minOccurs="1" maxOccurs="1"/>
@@ -557,29 +528,6 @@
 						maxOccurs="1"/ -->
 				</xsd:complexType>
 			</xsd:element>
-			<xsd:element name="ProxyComponent_OA" minOccurs="0">
-				<xsd:annotation>
-					<xsd:documentation>enthält Parameter über die OA, die die
-						Proxy-Komponente betreffen
-					</xsd:documentation>
-				</xsd:annotation>
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="ConnectionParameter" type="ConnectionParameterClientAuthType">
-							<xsd:annotation>
-								<xsd:documentation>enthält Parameter über die OA, die die
-									Proxy-Komponente betreffen
-								</xsd:documentation>
-							</xsd:annotation>
-						</xsd:element>
-					</xsd:sequence>
-					<xsd:attribute name="configFileURL" type="xsd:anyURI" use="optional"/>
-					<xsd:attribute name="sessionTimeOut" type="xsd:int" use="optional"/>
-					<xsd:attribute name="loginParameterResolverImpl" type="xsd:string" use="optional"/>
-					<xsd:attribute name="loginParameterResolverConfiguration" type="xsd:string" use="optional"/>
-					<xsd:attribute name="connectionBuilderImpl" type="xsd:string" use="optional"/>
-				</xsd:complexType>
-			</xsd:element>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:complexType name="ConnectionParameterServerAuthType">
@@ -995,6 +943,8 @@
 			<xsd:element name="ButtonBackGroundColorFocus" type="xsd:string" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="ButtonFontColor" type="xsd:string" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="AppletRedirectTarget" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="AppletHeight" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="AppletWidth" type="xsd:string" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="MandateLoginButton" type="xsd:boolean" default="true" minOccurs="0" maxOccurs="1"/>
 			<xsd:element name="OnlyMandateLoginAllowed" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/>
 		</xsd:sequence>
-- 
cgit v1.2.3


From f1d374bb66f3b48f2a14a8d550c4125c04dde7a8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 24 Feb 2014 11:40:49 +0100
Subject: * add default configuration values * add MOA-ID-Auth publicURLPreFix
 as mandatory configuration value * remove ReloadConfiguration serlet * change
 moa-id-lib to use publicURLPreFix * update repository

---
 id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd | 1 +
 1 file changed, 1 insertion(+)

(limited to 'id/server/moa-id-commons/src/main/resources')

diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
index 2461e1274..e6705dbb8 100644
--- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
+++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
@@ -857,6 +857,7 @@
 				<xsd:element name="AlternativeSourceID" type="xsd:string"/>
 				<xsd:element name="CertStoreDirectory" type="xsd:anyURI"/>
 				<xsd:element name="TrustManagerRevocationChecking" type="xsd:boolean" default="true"/>
+				<xsd:element name="PublicURLPreFix" type="xsd:string"/>
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
-- 
cgit v1.2.3