[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: Thu Aug 14 07:32:22 2014
New Revision: 6422

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6422&view=rev
Log:
IDP-245 Make the taglib apis use the RelyingPartyUIContext

Modified:
    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/main/java/net/shibboleth/idp/ui/taglib/OrganizationDisplayNameTag.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/OrganizationNameTag.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/OrganizationURLTag.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceContactTag.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceDescriptionTag.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceInformationURLTag.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceLogoTag.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServicePrivacyURLTag.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceTagSupport.java

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=6422&r1=6421&r2=6422&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 Thu Aug 14 07:32:22 2014
@@ -386,7 +386,7 @@
      * @param contactType what type to look up.
      * @return the {@link ContactPerson} or null.
      */
-    @Nullable protected ContactPerson getContactPerson(ContactPersonTypeEnumeration contactType) {
+    @Nullable public ContactPerson getContactPerson(ContactPersonTypeEnumeration contactType) {
         if (null == getRPEntityDescriptor()) {
             return null;
         }

Modified: trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/SetRPUIInformation.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/SetRPUIInformation.java?rev=6422&r1=6421&r2=6422&view=diff
==============================================================================
--- trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/SetRPUIInformation.java (original)
+++ trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/SetRPUIInformation.java Thu Aug 14 07:32:22 2014
@@ -100,7 +100,7 @@
      * 
      * @return Returns the strategy.
      */
-    public Function<ProfileRequestContext, RelyingPartyUIContext> gsetRPUIContextCreateStrategy() {
+    public Function<ProfileRequestContext, RelyingPartyUIContext> getRPUIContextCreateStrategy() {
         return rpUIContextCreateStrategy;
     }
 

Modified: trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/OrganizationDisplayNameTag.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/OrganizationDisplayNameTag.java?rev=6422&r1=6421&r2=6422&view=diff
==============================================================================
--- trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/OrganizationDisplayNameTag.java (original)
+++ trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/OrganizationDisplayNameTag.java Thu Aug 14 07:32:22 2014
@@ -26,8 +26,6 @@
 
 import net.shibboleth.utilities.java.support.codec.HTMLEncoder;
 
-import org.opensaml.saml.saml2.metadata.Organization;
-import org.opensaml.saml.saml2.metadata.OrganizationDisplayName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,31 +44,10 @@
      * @return null or an appropriate string
      */
     @Nullable private String getOrganizationDisplayName() {
-        final Organization org = getSPOrganization();
-        if (org != null && org.getDisplayNames() != null) {
-            for (final String lang : getBrowserLanguages()) {
-
-                for (final OrganizationDisplayName name : org.getDisplayNames()) {
-                    if (name.getXMLLang() == null) {
-                        continue;
-                    } else {
-                        log.debug("Found OrganizationDisplayName in Organization, language={}",
-                                name.getXMLLang());
-                    }
-                    
-                    if (name.getXMLLang().equals(lang)) {
-                        //
-                        // Found it
-                        //
-                        log.debug("returning OrganizationDisplayName from Organization, {}",
-                                name.getValue());
-                        return name.getValue();
-                    }
-                }
-            }
-            log.debug("No relevant OrganizationDisplayName in Organization");

[... 1041 lines stripped ...]