[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src: main/java/org/opensaml/saml/saml1/binding/encoding/HTTPPostE...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri May 31 13:46:42 2013
New Revision: 3349

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3349&view=rev
Log:
For SAML Velocity template-based encoders, default in the template ID from a public static variable. 

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPPostEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPArtifactEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostEncoder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostSimpleSignEncoder.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/binding/encoding/HTTPPostEncoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostEncoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPPostEncoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPPostEncoder.java?rev=3349&r1=3348&r2=3349&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPPostEncoder.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/binding/encoding/HTTPPostEncoder.java Fri May 31 13:46:42 2013
@@ -36,7 +36,6 @@
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.common.binding.SAMLBindingSupport;
 import org.opensaml.saml.common.xml.SAMLConstants;
-import org.opensaml.saml.saml1.core.ResponseAbstractType;
 import org.owasp.esapi.ESAPI;
 import org.owasp.esapi.Encoder;
 import org.slf4j.Logger;
@@ -46,6 +45,9 @@
  * SAML 1.X HTTP POST message encoder.
  */
 public class HTTPPostEncoder extends BaseSAML1MessageEncoder {
+    
+    /** Default template ID. */
+    public static final String DEFAULT_TEMPLATE_ID = "/templates/saml1-post-binding.vm";
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(HTTPPostEncoder.class);
@@ -56,6 +58,12 @@
     /** ID of the velocity template used when performing POST encoding. */
     private String velocityTemplateId;
     
+    /** Constructor. */
+    public HTTPPostEncoder() {
+        super();
+        setVelocityTemplateId(DEFAULT_TEMPLATE_ID);
+    }
+
     /** {@inheritDoc} */
     public String getBindingURI() {
         return SAMLConstants.SAML1_POST_BINDING_URI;
@@ -84,6 +92,8 @@
     /**
      * Get the Velocity template id.
      * 
+     * <p>Defaults to {@link #DEFAULT_TEMPLATE_ID}.</p>
+     * 
      * @return return the Velocity template id
      */
     public String getVelocityTemplateId() {
@@ -92,6 +102,8 @@
 
     /**
      * Set the Velocity template id.
+     * 
+     * <p>Defaults to {@link #DEFAULT_TEMPLATE_ID}.</p>
      * 
      * @param newVelocityTemplateId the new Velocity template id
      */

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPArtifactEncoder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPArtifactEncoder.java?rev=3349&r1=3348&r2=3349&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPArtifactEncoder.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/encoding/HTTPArtifactEncoder.java Fri May 31 13:46:42 2013
@@ -55,6 +55,9 @@
  * SAML 2 Artifact Binding encoder, support both HTTP GET and POST.
  */
 public class HTTPArtifactEncoder extends BaseSAML2MessageEncoder {
+    
+    /** Default template ID. */
+    public static final String DEFAULT_TEMPLATE_ID = "/templates/saml2-post-artifact-binding.vm";
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(HTTPArtifactEncoder.class);
@@ -74,17 +77,11 @@
     /** Default artifact type to use when encoding messages. */
     private byte[] defaultArtifactType;
 
-    /**
-     * Constructor.
-     * 
-     * @param engine velocity engine used to construct the POST form
-     * @param template ID of velocity template used to construct the POST form
-     * @param map artifact map used to store artifact/message bindings
-     */
-    public HTTPArtifactEncoder(VelocityEngine engine, String template, SAMLArtifactMap map) {
+    /** Constructor. */
+    public HTTPArtifactEncoder() {
         super();
-        postEncoding = false;
         defaultArtifactType = SAML2ArtifactType0004.TYPE_CODE;
+        setVelocityTemplateId(DEFAULT_TEMPLATE_ID);
     }
 
     /** {@inheritDoc} */
@@ -135,6 +132,8 @@
     /**
      * Get the Velocity template id.
      * 

[... 154 lines stripped ...]