change mdui taglib prefix to idpui
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Mon, 2 May 2011 13:56:03 +0000 (13:56 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Mon, 2 May 2011 13:56:03 +0000 (13:56 +0000)
reduce level of logging of login context store/retrieve messages

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@3021 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/main/java/edu/internet2/middleware/shibboleth/idp/util/HttpServletHelper.java
src/main/webapp/WEB-INF/idpui.tld [moved from src/main/webapp/WEB-INF/mduitaglib.tld with 95% similarity]
src/main/webapp/error.jsp
src/main/webapp/login.jsp

index a3b657f..7803a5b 100644 (file)
@@ -329,13 +329,13 @@ public class HttpServletHelper {
         }
 
         String partition = getContextParam(context, LOGIN_CTX_PARTITION_CTX_PARAM, DEFAULT_LOGIN_CTX_PARITION);
-        log.debug("Looking up LoginContext with key {} from StorageService parition: {}", loginContextKey, partition);
+        log.trace("Looking up LoginContext with key {} from StorageService parition: {}", loginContextKey, partition);
         LoginContextEntry entry = (LoginContextEntry) storageService.get(partition, loginContextKey);
         if (entry != null) {
             if (entry.isExpired()) {
                 log.debug("LoginContext found but it was expired");
             } else {
-                log.debug("Retrieved LoginContext with key {} from StorageService parition: {}", loginContextKey,
+                log.trace("Retrieved LoginContext with key {} from StorageService parition: {}", loginContextKey,
                         partition);
                 return entry.getLoginContext();
             }
similarity index 95%
rename from src/main/webapp/WEB-INF/mduitaglib.tld
rename to src/main/webapp/WEB-INF/idpui.tld
index cf12a11..6f5a318 100644 (file)
@@ -4,8 +4,8 @@
     version="2.0">\r
     \r
   <tlib-version>1.0</tlib-version>\r
-  <short-name>mdui</short-name>\r
-  <uri>urn:mace:shibboleth:2.0:idp:mdui</uri>\r
+  <short-name>idpui</short-name>\r
+  <uri>urn:mace:shibboleth:2.0:idp:ui</uri>\r
   \r
   <tag>\r
     <description>Service Name - some user friendly descriptionrmation about the relying party</description>\r
index 45c9fa9..6d59eba 100644 (file)
@@ -1,5 +1,5 @@
 <%@page import="edu.internet2.middleware.shibboleth.common.profile.AbstractErrorHandler"%>
-<%@ taglib uri="urn:mace:shibboleth:2.0:idp:mdui" prefix="mdui" %>
+<%@ taglib uri="urn:mace:shibboleth:2.0:idp:ui" prefix="idpui" %>
 
 <html>
 <body>
@@ -19,7 +19,7 @@
        </p>
         <p>
            If you think you were sent here in error,
-           please contact <mdui:serviceContact>technical support</mdui:serviceContact>
+           please contact <idpui:serviceContact>technical support</idpui:serviceContact>
         </p>       
        <% 
        Throwable error = (Throwable) request.getAttribute(AbstractErrorHandler.ERROR_KEY);
index 8eb4c81..d85620c 100644 (file)
@@ -1,4 +1,4 @@
-<%@ taglib uri="urn:mace:shibboleth:2.0:idp:mdui" prefix="mdui" %>\r
+<%@ taglib uri="urn:mace:shibboleth:2.0:idp:ui" prefix="idpui" %>\r
 <html>\r
   <link rel="stylesheet" type="text/css" href="<%= request.getContextPath()%>/login.css"/>\r
   <head>\r
        </div>\r
        <div class="rightpane">\r
          <div class="content">\r
-           <div id="spName"><mdui:serviceName/></div>\r
+           <div id="spName"><idpui:serviceName/></div>\r
            <!-- pick the logo.  If its between 64 & max width/height display it\r
                 If its too high but OK wide clip by height\r
                 If its too wide clip by width.\r
                 We should not clip by height and width since that skews the image.  Too high an image will just show the top.\r
             -->\r
-           <mdui:serviceLogo  minWidth="64" minHeight="64" maxWidth="350" maxHeight="147" cssId="splogo">\r
-              <mdui:serviceLogo  minWidth="64" minHeight="64" maxWidth="350" cssId="clippedsplogoY">\r
-                  <mdui:serviceLogo  minWidth="64" minHeight="64" cssId="clippedsplogoX"/>\r
-              </mdui:serviceLogo>\r
-           </mdui:serviceLogo>\r
+           <idpui:serviceLogo  minWidth="64" minHeight="64" maxWidth="350" maxHeight="147" cssId="splogo">\r
+              <idpui:serviceLogo  minWidth="64" minHeight="64" maxWidth="350" cssId="clippedsplogoY">\r
+                  <idpui:serviceLogo  minWidth="64" minHeight="64" cssId="clippedsplogoX"/>\r
+              </idpui:serviceLogo>\r
+           </idpui:serviceLogo>\r
            <div id="spDescription">\r
-             <mdui:serviceDescription>You have asked to login to <mdui:serviceName/></mdui:serviceDescription>\r
+             <idpui:serviceDescription>You have asked to login to <idpui:serviceName/></idpui:serviceDescription>\r
            </div>\r
          </div>\r
       </div>\r