Author: cbrisson
Date: Sat Nov 6 21:45:35 2010
New Revision: 1032162
URL: http://svn.apache.org/viewvc?rev=1032162&view=rev
Log:
merge + update changelog (phew... I hope 2.x becomes trunk very soon...)
Modified:
velocity/engine/branches/2.0_Exp/ (props changed)
velocity/engine/branches/2.0_Exp/src/changes/changes.xml
velocity/engine/branches/2.0_Exp/velocity-engine-commons-logging/src/main/java/
(props changed)
velocity/engine/branches/2.0_Exp/velocity-engine-commons-logging/src/test/
(props changed)
velocity/engine/branches/2.0_Exp/velocity-engine-core/src/test/java/
(props changed)
velocity/engine/branches/2.0_Exp/velocity-engine-log4j/src/main/java/
(props changed)
velocity/engine/branches/2.0_Exp/velocity-engine-servlet/src/main/java/
(props changed)
Propchange: velocity/engine/branches/2.0_Exp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 6 21:45:35 2010
@@ -1,2 +1,2 @@
/velocity/engine/branches/2.0_Exp:958513,991637-995742
-/velocity/engine/trunk:992133
+/velocity/engine/trunk:992133,1032159
Modified: velocity/engine/branches/2.0_Exp/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/changes/changes.xml?rev=1032162&r1=1032161&r2=1032162&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/changes/changes.xml (original)
+++ velocity/engine/branches/2.0_Exp/src/changes/changes.xml Sat Nov 6
21:45:35 2010
@@ -26,6 +26,11 @@
<body>
<release version="2.0" date="In Subversion">
+ <action type="fix" dev="cbrisson" issue="VELOCITY-785" due-to="Jarkko
Viinamäki">
+ Fixed quotes escaping so that doubling single quotes only works when
enclosing quotes are single quotes
+ (and same behaviour for double quotes)
+ </action>
+
<action type="fix" dev="nbubna" issue="VELOCITY-751">
Removed all remaining "throws Exception" clauses and the now useless
ExceptionUtils class.
</action>
@@ -73,6 +78,11 @@
</release>
<release version="1.7" date="In Subversion">
+ <action type="fix" dev="cbrisson" issue="VELOCITY-785" due-to="Jarkko
Viinamäki">
+ Fixed quotes escaping so that doubling single quotes only works when
enclosing quotes are single quotes
+ (and same behaviour for double quotes)
+ </action>
+
<action type="add" dev="nbubna">
Add access to template and directive debugging info via $/scope/.info.
</action>
Propchange:
velocity/engine/branches/2.0_Exp/velocity-engine-commons-logging/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 6 21:45:35 2010
@@ -1,3 +1,3 @@
/velocity/engine/branches/2.0_Exp/src/java:991637-995742
/velocity/engine/branches/2.0_Exp/velocity-engine-commons-logging/src/main/java:958513,991637-995742
-/velocity/engine/trunk/velocity-engine-commons-logging/src/main/java:992133
+/velocity/engine/trunk/velocity-engine-commons-logging/src/main/java:992133,1032159
Propchange:
velocity/engine/branches/2.0_Exp/velocity-engine-commons-logging/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 6 21:45:35 2010
@@ -1,3 +1,3 @@
/velocity/engine/branches/2.0_Exp/src/test:991639-992140
/velocity/engine/branches/2.0_Exp/velocity-engine-commons-logging/src/test:958513,991637-995742
-/velocity/engine/trunk/velocity-engine-commons-logging/src/test:992133
+/velocity/engine/trunk/velocity-engine-commons-logging/src/test:992133,1032159
Propchange: velocity/engine/branches/2.0_Exp/velocity-engine-core/src/test/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 6 21:45:35 2010
@@ -1,4 +1,4 @@
/velocity/engine/branches/2.0_Exp/src/test:991639-992140
/velocity/engine/branches/2.0_Exp/velocity-engine-core/src/test/java:958513,991637-995742
/velocity/engine/trunk/src/test:1032134
-/velocity/engine/trunk/velocity-engine-core/src/test/java:992133
+/velocity/engine/trunk/velocity-engine-core/src/test/java:992133,1032159
Propchange:
velocity/engine/branches/2.0_Exp/velocity-engine-log4j/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 6 21:45:35 2010
@@ -1,3 +1,3 @@
/velocity/engine/branches/2.0_Exp/src/java:991637-995742
/velocity/engine/branches/2.0_Exp/velocity-engine-log4j/src/main/java:958513,991637-995742
-/velocity/engine/trunk/velocity-engine-log4j/src/main/java:992133
+/velocity/engine/trunk/velocity-engine-log4j/src/main/java:992133,1032159
Propchange:
velocity/engine/branches/2.0_Exp/velocity-engine-servlet/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 6 21:45:35 2010
@@ -1,3 +1,3 @@
/velocity/engine/branches/2.0_Exp/src/java:991637-995742
/velocity/engine/branches/2.0_Exp/velocity-engine-servlet/src/main/java:958513,991637-995742
-/velocity/engine/trunk/velocity-engine-servlet/src/main/java:992133
+/velocity/engine/trunk/velocity-engine-servlet/src/main/java:992133,1032159
