[java-identity-provider COMMIT] in /trunk/idp-ui/src: main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.j...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Aug  6 05:12:15 2014
New Revision: 6399

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6399&view=rev
Log:
IDP-245 Start to test The smart context.  Confirm the bug fix for SIDP-589

Added:
    trunk/idp-ui/src/test/java/net/
    trunk/idp-ui/src/test/java/net/shibboleth/
    trunk/idp-ui/src/test/java/net/shibboleth/idp/
    trunk/idp-ui/src/test/java/net/shibboleth/idp/ui/
    trunk/idp-ui/src/test/java/net/shibboleth/idp/ui/context/
    trunk/idp-ui/src/test/java/net/shibboleth/idp/ui/context/RelyingPartyUIContextTest.java   (with props)
Modified:
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
    trunk/idp-ui/src/test/resources/net/shibboleth/idp/ui/beans.xml
    trunk/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata.xml

Modified: trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java?rev=6399&r1=6398&r2=6399&view=diff
==============================================================================
--- trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java (original)
+++ trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java Wed Aug  6 05:12:15 2014
@@ -331,7 +331,7 @@
         } else if (type.equals(ContactPersonTypeEnumeration.TECHNICAL.toString())) {
             return ContactPersonTypeEnumeration.TECHNICAL;
         } else {
-            log.warn("parameter provided to contactType:" + type + " is invalid");
+            log.warn("parameter provided to contactType: " + type + " is invalid");
             return ContactPersonTypeEnumeration.SUPPORT;
         }
     }

Modified: trunk/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata.xml?rev=6399&r1=6398&r2=6399&view=diff
==============================================================================
--- trunk/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata.xml (original)
+++ trunk/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata.xml Wed Aug  6 05:12:15 2014
@@ -1,40 +1,54 @@
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
-	xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
+<EntityDescriptor entityID="https://sp.example.org"
+	xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd
    urn:oasis:names:tc:SAML:metadata:ui http://docs.oasis-open.org/security/saml/Post2.0/sstc-saml-metadata-ui/v1.0/cs01/xsd/sstc-saml-metadata-ui-v1.0.xsd">
-	<EntityDescriptor entityID="https://sp.example.org">
-		<SPSSODescriptor
-			protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol"
-			AuthnRequestsSigned="false">
-			<Extensions>
-				<mdui:UIInfo>
-					<mdui:DisplayName xml:lang="en">TEST SP (display Name)</mdui:DisplayName>
-					<mdui:Description xml:lang="en">TEST SP (description)</mdui:Description>
-					<mdui:Description xml:lang="fr">TEST SP (en francais dans la texte)</mdui:Description>
+	<SPSSODescriptor
+		protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol"
+		AuthnRequestsSigned="false">
+		<Extensions>
+			<mdui:UIInfo>
+				<mdui:DisplayName xml:lang="en">TEST SP (display Name)</mdui:DisplayName>
+				<mdui:Description xml:lang="en">TEST SP (description)</mdui:Description>
+				<mdui:Description xml:lang="fr">TEST SP (en francais
+					dans la texte)</mdui:Description>
 
-					<mdui:InformationURL xml:lang="en">https://www.example.org</mdui:InformationURL>
-					<mdui:PrivacyStatementURL xml:lang="en">https://www.example.org/privacy</mdui:PrivacyStatementURL>
-					<mdui:Logo height="65" width="150">https://shibboleth.net/images/shibboleth.png</mdui:Logo>
-				</mdui:UIInfo>
-			</Extensions>
+				<mdui:InformationURL xml:lang="en">https://www.example.org</mdui:InformationURL>
+				<mdui:PrivacyStatementURL xml:lang="en">https://www.example.org/privacy</mdui:PrivacyStatementURL>
+				<mdui:Logo height="65" width="150">https://shibboleth.net/images/shibboleth.png</mdui:Logo>
+			</mdui:UIInfo>
+		</Extensions>
 
-			<AssertionConsumerService
-				Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://localhost:8443/sp/SAML1/Artifact/ACS"
-				index="11" />
+	</SPSSODescriptor>
+	<Organization>
+		<OrganizationName xml:lang="en">TSC</OrganizationName>
+		<OrganizationDisplayName xml:lang="en">The Shibboleth Consortium</OrganizationDisplayName>

[... 45 lines stripped ...]