[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/views/login.vm idp-ui/src/main/java/net/shibbo...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Aug 13 12:13:52 2014
New Revision: 6419

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6419&view=rev
Log:
IDP-245 Add Logo and wire into login page.

Modified:
    trunk/idp-conf/src/main/resources/views/login.vm
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/SetRPUIInformation.java
    trunk/idp-ui/src/test/java/net/shibboleth/idp/ui/context/RelyingPartyUIContextTest.java
    trunk/idp-ui/src/test/resources/net/shibboleth/idp/ui/example-metadata.xml

Modified: trunk/idp-conf/src/main/resources/views/login.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/login.vm?rev=6419&r1=6418&r2=6419&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/login.vm (original)
+++ trunk/idp-conf/src/main/resources/views/login.vm Wed Aug 13 12:13:52 2014
@@ -81,8 +81,11 @@
               //      https://wiki.shibboleth.net/confluence/display/SHIB2/IdPAuthUserPassLoginPage
               //
               //    Example:
-              $rpUIContext.getLogo();
             -->
+            #set ($logo = $rpUIContext.getLogo())
+            #if ($logo)
+                <img src= "$encoder.encodeForHTMLAttribute($logo)" alt="logo for $rpUIContext.getServiceName("")"/>
+            #end
 			$rpUIContext.getServiceDescription("")
 			          
 

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=6419&r1=6418&r2=6419&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 13 12:13:52 2014
@@ -25,6 +25,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -33,6 +34,7 @@
 import org.opensaml.saml.ext.saml2mdui.Description;
 import org.opensaml.saml.ext.saml2mdui.DisplayName;
 import org.opensaml.saml.ext.saml2mdui.InformationURL;
+import org.opensaml.saml.ext.saml2mdui.Logo;
 import org.opensaml.saml.ext.saml2mdui.PrivacyStatementURL;
 import org.opensaml.saml.ext.saml2mdui.UIInfo;
 import org.opensaml.saml.saml2.metadata.AttributeConsumingService;
@@ -70,7 +72,7 @@
     @Nullable private UIInfo rpUIInfo;
 
     /** The languages that this browser wants to know about. */
-    @Nonnull private List<String> browserLanguages;
+    @Nonnull @NonnullElements private List<String> browserLanguages;
 
     /**
      * Get the {@link EntityDescriptor}.
@@ -150,8 +152,8 @@
      * 
      * @param languages the languages to set.
      */
-    public void setBrowserLanguages(@Nonnull final List<String> languages) {
-        browserLanguages = Constraint.isNotNull(languages, "Language List mustr be non null");
+    public void setBrowserLanguages(@Nonnull @NonnullElements final List<String> languages) {
+        browserLanguages = Constraint.isNotNull(languages, "Language List must be non null");
     }
 
     /**
@@ -159,7 +161,7 @@
      * 
      * @return the languages.
      */
-    @Nonnull protected List<String> getBrowserLanguages() {
+    @Nonnull @NonnullElements protected List<String> getBrowserLanguages() {
         return browserLanguages;
     }
 
@@ -201,11 +203,10 @@
      * Police a url found for a logo.
      * 
      * @param url the url to look at
-     * @param defaultValue what to return if the test fails
      * @return the input or the default as appropriate
      */
-    protected String policyURLLogo(@Nullable final String url, @Nullable final String defaultValue) {
-        return policeURL(url, Arrays.asList("http", "https", "data"), defaultValue);
+    protected String policeURLLogo(@Nullable final String url) {
+        return policeURL(url, Arrays.asList("http", "https", "data"), null);
     }
 
     /**
@@ -215,7 +216,7 @@
      * @param defaultValue what to return if the test fails
      * @return the input or the default as appropriate
      */
-    protected String policyURLNonLogo(@Nullable final String url, @Nullable final String defaultValue) {
+    protected String policeURLNonLogo(@Nullable final String url, @Nullable final String defaultValue) {
         return policeURL(url, Arrays.asList("http", "https", "mailto"), defaultValue);
     }
 
@@ -541,7 +542,7 @@
 
                 if (url.getXMLLang().equals(lang)) {

[... 322 lines stripped ...]