[java-identity-provider COMMIT] in /trunk: idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceTagSupport.java i...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Sep  9 13:52:54 2014
New Revision: 6518

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6518&view=rev
Log:
Better Taglib support for logout.

Allow all of the taglibs to have another attribute 'uiContext'.  If this is null or
the attribute is not supplied then the default Function is called.

Typical use might be

<idpui:serviceName uiContext="<%=rpUiContext%>"/>

Modified:
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceTagSupport.java
    trunk/idp-war/src/main/webapp/WEB-INF/idpui.tld

Modified: trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceTagSupport.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceTagSupport.java?rev=6518&r1=6517&r2=6518&view=diff
==============================================================================
--- trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceTagSupport.java (original)
+++ trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceTagSupport.java Tue Sep  9 13:52:54 2014
@@ -66,6 +66,15 @@
 
     /** Cached RelyingPartyUIContext. */
     @Nullable private RelyingPartyUIContext relyingPartyUIContext;
+
+    /**
+     * Sets the {@link RelyingPartyUIContext}.
+     *
+     * @param value what to set
+     */
+    public void setUiContext(@Nullable final RelyingPartyUIContext value) {
+        relyingPartyUIContext = value;
+    }
 
     /**
      * Set the Css class to use.

Modified: trunk/idp-war/src/main/webapp/WEB-INF/idpui.tld
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/idpui.tld?rev=6518&r1=6517&r2=6518&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/idpui.tld (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/idpui.tld Tue Sep  9 13:52:54 2014
@@ -17,6 +17,12 @@
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
     </attribute>
+    <attribute>
+      <name>uiContext</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>net.shibboleth.idp.ui.context.RelyingPartyUIContext</type>
+    </attribute>
   </tag>
   
   <tag>
@@ -24,6 +30,12 @@
     <name>serviceDescription</name>
     <tag-class>net.shibboleth.idp.ui.taglib.ServiceDescriptionTag</tag-class>
     <body-content>scriptless</body-content>
+    <attribute>
+      <name>uiContext</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>net.shibboleth.idp.ui.context.RelyingPartyUIContext</type>
+    </attribute>
   </tag>
   
   <tag>
@@ -56,6 +68,12 @@
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
     </attribute>
+    <attribute>
+      <name>uiContext</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>net.shibboleth.idp.ui.context.RelyingPartyUIContext</type>
+    </attribute>
   </tag>
   
   <tag>
@@ -83,6 +101,12 @@
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
     </attribute>
+    <attribute>
+      <name>uiContext</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>net.shibboleth.idp.ui.context.RelyingPartyUIContext</type>
+    </attribute>
   </tag>
   
   <tag>
@@ -110,6 +134,12 @@
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
     </attribute>
+    <attribute>
+      <name>uiContext</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>net.shibboleth.idp.ui.context.RelyingPartyUIContext</type>
+    </attribute>
   </tag>
   
   <tag>
@@ -157,6 +187,12 @@
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
     </attribute>
+    <attribute>
+      <name>uiContext</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>net.shibboleth.idp.ui.context.RelyingPartyUIContext</type>
+    </attribute>
   </tag>
 
   <tag>
@@ -164,6 +200,12 @@
     <name>organizationName</name>
     <tag-class>net.shibboleth.idp.ui.taglib.OrganizationNameTag</tag-class>
     <body-content>scriptless</body-content>
+    <attribute>
+      <name>uiContext</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>net.shibboleth.idp.ui.context.RelyingPartyUIContext</type>
+    </attribute>
   </tag>
 
   <tag>
@@ -171,6 +213,12 @@
     <name>organizationDisplayName</name>
     <tag-class>net.shibboleth.idp.ui.taglib.OrganizationDisplayNameTag</tag-class>
     <body-content>scriptless</body-content>
+    <attribute>
+      <name>uiContext</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>net.shibboleth.idp.ui.context.RelyingPartyUIContext</type>
+    </attribute>
   </tag>
 
   <tag>
@@ -198,6 +246,12 @@
       <required>false</required>
       <rtexprvalue>true</rtexprvalue>
     </attribute>

[... 10 lines stripped ...]