[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 18:38:37 2013
New Revision: 3145

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3145&view=rev
Log:
SIDP-570: Customize ServiceName tag output for unknown SPs

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceNameTag.java

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=3145&r1=3144&r2=3145&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Tue Mar  5 18:38:37 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-570] - Customize ServiceName tag output for unknown SPs
 [SIDP-572] - Test on Red Hat's openjdk 1.7
 
 Changes in Release 2.3.8

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceNameTag.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceNameTag.java?rev=3145&r1=3144&r2=3145&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceNameTag.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceNameTag.java Tue Mar  5 18:38:37 2013
@@ -48,6 +48,18 @@
     /** what to emit if the jsp has nothing. */
     private static final String DEFAULT_VALUE = "Unspecified Service Provider";
 
+    /** Bean storage for default value. */
+    private String defaultValue;
+
+    /**
+     * Bean setter.
+     * 
+     * @param value what to set
+     */
+    public void setDefaultValue(String value) {
+        defaultValue = value;
+    }
+    
     @Override
     public int doStartTag() throws JspException {
        
@@ -62,14 +74,14 @@
                 BodyContent bc = getBodyContent();
                 boolean written = false;
                 if (null != bc) {
-                    JspWriter ew= bc.getEnclosingWriter();
+                    JspWriter ew = bc.getEnclosingWriter();
                     if (ew != null) {
                         bc.writeOut(ew);
                         written = true;
                     }
                 }
                 if (!written) {
-                    pageContext.getOut().print(DEFAULT_VALUE);
+                    pageContext.getOut().print(defaultValue != null ? defaultValue : DEFAULT_VALUE);
                 }
             } else {
                 pageContext.getOut().print(serviceName);