[java-opensaml2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/resources/templates/add-html-body-content....

noreply at shibboleth.net noreply at shibboleth.net
Fri Mar 8 14:51:27 EST 2013 

Author: scantor
Date: Fri Mar  8 14:51:26 2013
New Revision: 1628

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1628&view=rev
Log:
JOST-203: Head/body template injection for SAML binding templates

Added:
    branches/REL_2/src/main/resources/templates/add-html-body-content.vm   (with props)
    branches/REL_2/src/main/resources/templates/add-html-head-content.vm   (with props)
Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/resources/templates/saml1-post-binding.vm
    branches/REL_2/src/main/resources/templates/saml2-post-artifact-binding.vm
    branches/REL_2/src/main/resources/templates/saml2-post-binding.vm
    branches/REL_2/src/main/resources/templates/saml2-post-simplesign-binding.vm

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=1628&r1=1627&r2=1628&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Fri Mar  8 14:51:26 2013
@@ -15,7 +15,8 @@
 [JOST-198] - Configuration files for XMLObject providers often missing Type registrations
 [JOST-199] - SAML SOAP encoders should use the supplied outbound SOAP Envelope from the message context, if it exists 
 [JOST-200] - Reduce memory usage of unit tests
-[JOST-201] - SAML1 and 2 base message encoders have incorrect selection logic in getEndpointURL() 
+[JOST-201] - SAML1 and 2 base message encoders have incorrect selection logic in getEndpointURL()
+[JOST-203] - Head/body template injection for SAML binding templates
 
 Changes in Release 2.5.3
 =============================================

Modified: branches/REL_2/src/main/resources/templates/saml1-post-binding.vm
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/resources/templates/saml1-post-binding.vm?rev=1628&r1=1627&r2=1628&view=diff
==============================================================================
--- branches/REL_2/src/main/resources/templates/saml1-post-binding.vm (original)
+++ branches/REL_2/src/main/resources/templates/saml1-post-binding.vm Fri Mar  8 14:51:26 2013
@@ -3,10 +3,15 @@
 ##
 ## Velocity context may contain the following properties
 ## action - String - the action URL for the form
+## binding - String - the SAML binding type in use
 ## TARGET - String - the relay state for the message
 ## SAMLResponse - String - the Base64 encoded SAML Response
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+    <head>
+    #parse ( "/templates/add-html-head-content.vm" )
+    </head>
 
     <body onload="document.forms[0].submit()">
         <noscript>
@@ -29,6 +34,8 @@
                 </div>
             </noscript>
         </form>
+
+        #parse ( "/templates/add-html-body-content.vm" )
         
     </body>
 </html>

Modified: branches/REL_2/src/main/resources/templates/saml2-post-artifact-binding.vm
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/resources/templates/saml2-post-artifact-binding.vm?rev=1628&r1=1627&r2=1628&view=diff
==============================================================================
--- branches/REL_2/src/main/resources/templates/saml2-post-artifact-binding.vm (original)
+++ branches/REL_2/src/main/resources/templates/saml2-post-artifact-binding.vm Fri Mar  8 14:51:26 2013
@@ -3,6 +3,7 @@
 ##
 ## Velocity context may contain the following properties
 ## action - String - the action URL for the form
+## binding - String - the SAML binding type in use
 ## RelayState - String - the relay state for the message
 ## SAMLArt - String - SAML 2 artifact
 
@@ -10,7 +11,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-
+    <head>
+    #parse ( "/templates/add-html-head-content.vm" )
+    </head>
     <body onload="document.forms[0].submit()">
         <noscript>
             <p>
@@ -33,5 +36,6 @@
                 </div>
             </noscript>
         </form>
+        #parse ( "/templates/add-html-body-content.vm" )
     </body>
 </html>

Modified: branches/REL_2/src/main/resources/templates/saml2-post-binding.vm
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/resources/templates/saml2-post-binding.vm?rev=1628&r1=1627&r2=1628&view=diff
==============================================================================
--- branches/REL_2/src/main/resources/templates/saml2-post-binding.vm (original)
+++ branches/REL_2/src/main/resources/templates/saml2-post-binding.vm Fri Mar  8 14:51:26 2013
@@ -3,12 +3,15 @@
 ##
 ## Velocity context may contain the following properties
 ## action - String - the action URL for the form
+## binding - String - the SAML binding type in use
 ## RelayState - String - the relay state for the message
 ## SAMLRequest - String - the Base64 encoded SAML Request
 ## SAMLResponse - String - the Base64 encoded SAML Response
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-

[... 48 lines stripped ...]

More information about the commits mailing list