[java-shib-idp2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth/i...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar  5 23:12:12 2013
New Revision: 3148

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3148&view=rev
Log:
SIDP-569:  Make Organization elements via taglib available to login page

Added:
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/OrganizationDisplayNameTag.java   (with props)
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/OrganizationNameTag.java   (with props)
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/OrganizationURLTag.java   (with props)
Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceTagSupport.java
    branches/REL_2/src/main/webapp/WEB-INF/idpui.tld

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=3148&r1=3147&r2=3148&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Tue Mar  5 23:12:12 2013
@@ -9,6 +9,7 @@
 [SIDP-563] - IdP-only SAML logout profile handler
 [SIDP-564] - Happy Eyeballs support for IdP session cookie address checking
 [SIDP-567] - Login Context key entropy can be improved
+[SIDP=569] -  Make Organization elements via taglib available to login page
 [SIDP-570] - Customize ServiceName tag output for unknown SPs
 [SIDP-572] - Test on Red Hat's openjdk 1.7
 

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceTagSupport.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceTagSupport.java?rev=3148&r1=3147&r2=3148&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceTagSupport.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceTagSupport.java Tue Mar  5 23:12:12 2013
@@ -32,6 +32,7 @@
 import org.opensaml.saml2.metadata.AttributeConsumingService;
 import org.opensaml.saml2.metadata.EntityDescriptor;
 import org.opensaml.saml2.metadata.LocalizedString;
+import org.opensaml.saml2.metadata.Organization;
 import org.opensaml.saml2.metadata.RoleDescriptor;
 import org.opensaml.saml2.metadata.SPSSODescriptor;
 import org.opensaml.saml2.metadata.ServiceName;
@@ -215,6 +216,29 @@
         return null;
     }
 
+    /**
+     * Traverse the SP's EntityDescriptor and pick out the Organization.
+     * 
+     * @return the Organization for the SP
+     */
+    protected Organization getSPOrganization() {
+        EntityDescriptor spEntity = getSPEntityDescriptor();
+        if (null == spEntity) {
+            //
+            // all done
+            //
+            return null;
+        }
+
+        for (RoleDescriptor role : spEntity.getRoleDescriptors(SPSSODescriptor.DEFAULT_ELEMENT_NAME)) {
+            if (role.getOrganization() != null) {
+                return role.getOrganization();
+            }
+        }
+        
+        return spEntity.getOrganization();
+    }    
+    
     /**
      * Pluck the language from the browser.
      * 
@@ -376,4 +400,4 @@
         return getNameFromEntityId();
     }
 
-}
+}

Modified: branches/REL_2/src/main/webapp/WEB-INF/idpui.tld
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/webapp/WEB-INF/idpui.tld?rev=3148&r1=3147&r2=3148&view=diff
==============================================================================
--- branches/REL_2/src/main/webapp/WEB-INF/idpui.tld (original)
+++ branches/REL_2/src/main/webapp/WEB-INF/idpui.tld Tue Mar  5 23:12:12 2013
@@ -158,5 +158,46 @@
       <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  
+
+  <tag>
+    <description>Service Organization Name - directly from the metadata if present</description>
+    <name>organizationURL</name>
+    <tag-class>edu.internet2.middleware.shibboleth.idp.ui.OrganizationNameTag</tag-class>
+    <body-content>scriptless</body-content>
+  </tag>
+
+  <tag>
+    <description>Service Organization Display Name - directly from the metadata if present</description>
+    <name>organizationURL</name>
+    <tag-class>edu.internet2.middleware.shibboleth.idp.ui.OrganizationDisplayNameTag</tag-class>
+    <body-content>scriptless</body-content>
+  </tag>
+
+  <tag>
+    <description>Service Organization URL - directly from the metadata if present</description>
+    <name>organizationURL</name>
+    <tag-class>edu.internet2.middleware.shibboleth.idp.ui.OrganizationURLTag</tag-class>
+    <body-content>scriptless</body-content>
+    <attribute>
+      <name>linkText</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>cssId</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>

[... 13 lines stripped ...]