velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r960033 - in /velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java: ./ org/apache/velocity/io/VelocityWriter.java org/apache/velocity/runtime/directive/Stop.java
Date Fri, 02 Jul 2010 15:39:52 GMT
Author: apetrelli
Date: Fri Jul  2 15:39:52 2010
New Revision: 960033

URL: http://svn.apache.org/viewvc?rev=960033&view=rev
Log:
Merge from 2.0 branch.
VelocityWriter should still be a Writer (fix from rev. 746539)

Modified:
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/   (props
changed)
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Stop.java
  (props changed)

Propchange: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul  2 15:39:52 2010
@@ -0,0 +1,2 @@
+/velocity/engine/branches/2.0_Exp/src/java:958513
+/velocity/engine/branches/2.0_Exp/velocity-engine-core/src/main/java:958513

Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java?rev=960033&r1=960032&r2=960033&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java
(original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java
Fri Jul  2 15:39:52 2010
@@ -31,7 +31,7 @@ import java.io.Writer;
  * @author Anil K. Vijendran
  * @version $Id$
  */
-public final class VelocityWriter implements Filter
+public final class VelocityWriter extends Writer implements Filter
 {
     /**
      * constant indicating that the Writer is not buffering output

Propchange: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/Stop.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul  2 15:39:52 2010
@@ -0,0 +1 @@
+/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/directive/Stop.java:958513



Mime
View raw message