[java-opensaml2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/DefaultBootstrap.java sr...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed May  2 00:31:59 2012
New Revision: 1573

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1573&view=rev
Log:
JOST-187: Velocity initialization code uses an invalid key for the configuration properties set

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/org/opensaml/DefaultBootstrap.java
    branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java
    branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPPostEncoderTest.java
    branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java
    branches/REL_2/src/test/java/org/opensaml/saml2/binding/security/SAML2HTTPPostSimpleSignSecurityPolicyRuleTest.java

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=1573&r1=1572&r2=1573&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Wed May  2 00:31:59 2012
@@ -1,6 +1,7 @@
 Changes in Release 2.5.4
 =============================================
 [JOST-185] - Defaultbootstrap does not initialize the providers from the WS-Trust and WS-Policy schemas in openws
+[JOST-187] - Velocity initialization code uses an invalid key for the configuration properties set
 
 Changes in Release 2.5.3
 =============================================

Modified: branches/REL_2/src/main/java/org/opensaml/DefaultBootstrap.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/DefaultBootstrap.java?rev=1573&r1=1572&r2=1573&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/DefaultBootstrap.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/DefaultBootstrap.java Wed May  2 00:31:59 2012
@@ -173,7 +173,7 @@
             log.debug("Initializing Velocity template engine");
             Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
                     "org.apache.velocity.runtime.log.NullLogChute");
-            Velocity.setProperty(RuntimeConstants.ENCODING_DEFAULT, "UTF-8");
+            Velocity.setProperty(RuntimeConstants.INPUT_ENCODING, "UTF-8");
             Velocity.setProperty(RuntimeConstants.OUTPUT_ENCODING, "UTF-8");
             Velocity.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
             Velocity.setProperty("classpath.resource.loader.class",

Modified: branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java?rev=1573&r1=1572&r2=1573&view=diff
==============================================================================
--- branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java (original)
+++ branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java Wed May  2 00:31:59 2012
@@ -44,7 +44,7 @@
         super.setUp();
 
         velocityEngine = new VelocityEngine();
-        velocityEngine.setProperty(RuntimeConstants.ENCODING_DEFAULT, "UTF-8");
+        velocityEngine.setProperty(RuntimeConstants.INPUT_ENCODING, "UTF-8");
         velocityEngine.setProperty(RuntimeConstants.OUTPUT_ENCODING, "UTF-8");
         velocityEngine.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
         velocityEngine.setProperty("classpath.resource.loader.class",

Modified: branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPPostEncoderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPPostEncoderTest.java?rev=1573&r1=1572&r2=1573&view=diff
==============================================================================
--- branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPPostEncoderTest.java (original)
+++ branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPPostEncoderTest.java Wed May  2 00:31:59 2012
@@ -47,7 +47,7 @@
         super.setUp();
 
         velocityEngine = new VelocityEngine();
-        velocityEngine.setProperty(RuntimeConstants.ENCODING_DEFAULT, "UTF-8");
+        velocityEngine.setProperty(RuntimeConstants.INPUT_ENCODING, "UTF-8");
         velocityEngine.setProperty(RuntimeConstants.OUTPUT_ENCODING, "UTF-8");
         velocityEngine.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
         velocityEngine.setProperty("classpath.resource.loader.class",

Modified: branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java?rev=1573&r1=1572&r2=1573&view=diff

[... 29 lines stripped ...]