[java-centralized-discovery COMMIT] in /branches/REL_1: doc/RELEASE-NOTES.txt pom.xml src/main/java/edu/internet2/mid...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Nov 15 10:44:04 2011
New Revision: 2201

URL: http://svn.shibboleth.net/view/java-centralized-discovery?rev=2201&view=rev
Log:
https://issues.shibboleth.net/jira/browse/SDSJ-102 Do not show unusable IdPS in WAYF mode.

Modified:
    branches/REL_1/doc/RELEASE-NOTES.txt
    branches/REL_1/pom.xml
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSite.java
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java

Modified: branches/REL_1/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/doc/RELEASE-NOTES.txt?rev=2201&r1=2200&r2=2201&view=diff
==============================================================================
--- branches/REL_1/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_1/doc/RELEASE-NOTES.txt Tue Nov 15 10:44:04 2011
@@ -1,3 +1,8 @@
+Changes in Release 1.1.4
+=============================================
+The precise Cases changed are:
+[SDSJ-102] Do not show non usable IdPs when in WAYF mode
+
 Changes in Release 1.1.3
 =============================================
 The precise Cases changed are.

Modified: branches/REL_1/pom.xml
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/pom.xml?rev=2201&r1=2200&r2=2201&view=diff
==============================================================================
--- branches/REL_1/pom.xml (original)
+++ branches/REL_1/pom.xml Tue Nov 15 10:44:04 2011
@@ -12,7 +12,7 @@
 
     <groupId>edu.internet2.middleware</groupId>
     <artifactId>shibboleth-discovery-service</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
     <!-- We bundle as a jar here, the installer creates the WAR -->
     <packaging>jar</packaging>
 

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java?rev=2201&r1=2200&r2=2201&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/DiscoveryServiceHandler.java Tue Nov 15 10:44:04 2011
@@ -616,7 +616,7 @@
                         search = new TreeSet<IdPSite>(comparator);
                     }
 
-                    Map<String, IdPSite> theseSites = metadataProvider.getIdPSites(searchName, config, search);
+                    Map<String, IdPSite> theseSites = metadataProvider.getIdPSites(searchName, !twoZeroProtocol, config, search);
 
                     // Consult the plugins
                     for (int i = 0; i < thePlugins.size(); i++) {

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSite.java
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSite.java?rev=2201&r1=2200&r2=2201&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSite.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSite.java Tue Nov 15 10:44:04 2011
@@ -180,15 +180,23 @@
         }
         return result;
     }
-
-    /**
-     * When a user has selected an IdP, this provides the address to which we redirect.
+    
+    /**
+     * Get URL for Shibboleth SSO endpoint. 
+     * When a user has selected an IdP, or prior to displaying the entity
+     * this provides the address to which we will redirect or null if we cannot
+     * @param theEntity the entity in question
      * @return http address for the IdP this represents.  
      */
-    public String getAddressForWAYF() {
-        List<SingleSignOnService> ssoList;
-        
-        ssoList = entity.getIDPSSODescriptor(XMLConstants.SHIB_NS).getSingleSignOnServices();
+
+    protected static String getAddressForWAYF(EntityDescriptor theEntity) {
+        IDPSSODescriptor idp = theEntity.getIDPSSODescriptor(XMLConstants.SHIB_NS);
+        
+        if (null == idp) {
+            return null;
+        }
+        
+        List<SingleSignOnService> ssoList =idp.getSingleSignOnServices();
         
         for (SingleSignOnService signOnService: ssoList) {
             if (XMLConstants.IDP_SSO_BINDING.equals(signOnService.getBinding())) {
@@ -196,6 +204,17 @@
             }
         }
         return null;
+        
+    }
+
+    /**
+     * Get URL for Shibboleth SSO endpoint. 
+     * When a user has selected an IdP, this provides the address to which we will redirect or null if we cannot
+     * @return http address for the IdP this represents.  
+     */
+    public String getAddressForWAYF() {
+        

[... 65 lines stripped ...]