[java-centralized-discovery COMMIT] in /branches/REL_1/src/main: java/edu/internet2/middleware/shibboleth/wayf/IdPSit...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Mar 13 12:22:55 2012
New Revision: 2214

URL: http://svn.shibboleth.net/view/java-centralized-discovery?rev=2214&view=rev
Log:
More cleanup of log messages.  Slightly change in escaping of generated hyperlinks (encode the whole thing, but do not do so doubly))
.

Modified:
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java
    branches/REL_1/src/main/webapp/wayf.jsp

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java?rev=2214&r1=2213&r2=2214&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/wayf/IdPSiteSet.java Tue Mar 13 12:22:55 2012
@@ -452,7 +452,7 @@
             throws ShibbolethConfigurationException {
         String spoolSpace = DatatypeHelper.safeTrimOrNullString(element.getAttribute("backingFile"));
         if (spoolSpace == null) {
-            throw new ShibbolethConfigurationException("backingFile must be specified for " + identifier);
+            throw new ShibbolethConfigurationException("BackingFile must be specified for " + identifier);
         }
 
         try {

Modified: branches/REL_1/src/main/webapp/wayf.jsp
URL: http://svn.shibboleth.net/view/java-centralized-discovery/branches/REL_1/src/main/webapp/wayf.jsp?rev=2214&r1=2213&r2=2214&view=diff
==============================================================================
--- branches/REL_1/src/main/webapp/wayf.jsp (original)
+++ branches/REL_1/src/main/webapp/wayf.jsp Tue Mar 13 12:22:55 2012
@@ -185,7 +185,6 @@
         <logic:iterate id="site" name="cookieList">
             <p  class="text">
               <logic:present name="entityID" scope="request">
-
                 <bean:define id="returnIDParam" name="returnIDParam"/>
                 <bean:define id="ei" name="entityID" />
                 <bean:define id="re" name="returnX"/>
@@ -200,7 +199,7 @@
                 <bean:define id="targ" name="target" />
                 <bean:define id="shire" name="shire" />
                 <bean:define id="pid" name="providerId" />
-                <a tabindex="10" href="<esapi:encodeForHTMLAttribute><bean:write name="requestURL" />?target=<%= java.net.URLEncoder.encode(targ.toString(),"utf-8") %>&shire=<%= java.net.URLEncoder.encode(shire.toString(),"utf-8") %>&providerId=<%= java.net.URLEncoder.encode(pid.toString(),"utf-8") %>&time=<esapi:encodeForHTMLAttribute><bean:write name="time" /></esapi:encodeForHTMLAttribute>&cache=perm&action=selection&origin=<%=java.net.URLEncoder.encode(((IdPSite)site).getName())%></esapi:encodeForHTMLAttribute> ">
+                <a tabindex="10" href="<esapi:encodeForHTMLAttribute><bean:write name="requestURL" />?target=<%= java.net.URLEncoder.encode(targ.toString(),"utf-8") %>&shire=<%= java.net.URLEncoder.encode(shire.toString(),"utf-8") %>&providerId=<%= java.net.URLEncoder.encode(pid.toString(),"utf-8") %>&time=<bean:write name="time" />&cache=perm&action=selection&origin=<%=java.net.URLEncoder.encode(((IdPSite)site).getName())%></esapi:encodeForHTMLAttribute> ">
                     <esapi:encodeForHTML><jsp:getProperty name="site" property="displayName" /></esapi:encodeForHTML>
                 </a>
               </logic:notPresent>