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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Aug 31 14:32:40 2011
New Revision: 3065

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3065&view=rev
Log:
Rev POM up to 2.3.3-SNAPSHOT
https://issues.shibboleth.net/jira/browse/SIDP-514 Alt text for IdP Logos is not esapiEncoder.encodeForHTMLAttribute 
https://issues.shibboleth.net/jira/browse/SIDP-513 idpui taglib could look for more languages matches

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/pom.xml
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceDescriptionTag.java
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceInformationURLTag.java
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceLogoTag.java
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServicePrivacyURLTag.java
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceTagSupport.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=3065&r1=3064&r2=3065&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Wed Aug 31 14:32:40 2011
@@ -1,3 +1,8 @@
+Changes in Release 2.3.4
+=============================================
+[SIDP-513] idpui taglib could look for more languages matches
+[SIDP-514] Alt text for IdP Logos is not esapiEncoder.encodeForHTMLAttribute
+
 Changes in Release 2.3.3
 =============================================
 [SIDP-504] - Alt text generate for logo has mismatched quoting

Modified: branches/REL_2/pom.xml
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/pom.xml?rev=3065&r1=3064&r2=3065&view=diff
==============================================================================
--- branches/REL_2/pom.xml (original)
+++ branches/REL_2/pom.xml Wed Aug 31 14:32:40 2011
@@ -12,7 +12,7 @@
 
     <groupId>edu.internet2.middleware</groupId>
     <artifactId>shibboleth-identityprovider</artifactId>
-    <version>2.3.3</version>
+    <version>2.3.4-SNAPSHOT</version>
 
     <!-- We bundle as a jar here, the installer creates the WAR -->
     <packaging>jar</packaging>

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceDescriptionTag.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceDescriptionTag.java?rev=3065&r1=3064&r2=3065&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceDescriptionTag.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/ui/ServiceDescriptionTag.java Wed Aug 31 14:32:40 2011
@@ -41,51 +41,54 @@
  * 
  */
 public class ServiceDescriptionTag extends ServiceTagSupport {
-    
+
     /** required by checkstyle. */
     private static final long serialVersionUID = -2000941439055969537L;
+
     /** Class logger. */
     private static Logger log = LoggerFactory.getLogger(ServiceDescriptionTag.class);
 
-    /** 
+    /**
      * look at &lt;Uiinfo&gt; if there and if so look for appropriate description.
+     * 
+     * @param lang - which language to look up
      * @return null or an appropriate description
      */
-    private String getDescriptionFromUIInfo() {
-        String lang = getBrowserLanguage();
+    private String getDescriptionFromUIInfo(String lang) {
+        if (getSPUIInfo() != null && getSPUIInfo().getDescriptions() != null) {
 
-        if (getSPUIInfo() != null && getSPUIInfo().getDescriptions() != null) {
-            for (Description desc:getSPUIInfo().getDescriptions()) {
-                if (log.isDebugEnabled()){
+            for (Description desc : getSPUIInfo().getDescriptions()) {
+                if (log.isDebugEnabled()) {
                     log.debug("Found description in UIInfo, language=" + desc.getXMLLang());
                 }
                 if (desc.getXMLLang().equals(lang)) {
                     //
                     // Found it
                     //
-                    if (log.isDebugEnabled()){
+                    if (log.isDebugEnabled()) {
                         log.debug("returning description from UIInfo " + desc.getName().getLocalString());
                     }
                     return desc.getName().getLocalString();
                 }
             }
-            if (log.isDebugEnabled()){
+            if (log.isDebugEnabled()) {
                 log.debug("No valid description in UIInfo");
-            }            
+            }
         }
         return null;
     }
-    
+
     /**
      * look for an &ltAttributeConsumeService&gt and if its there look for an appropriate description.
+     * 
+     * @param lang - which language to look up
      * @return null or an appropriate description
      */

[... 1005 lines stripped ...]