click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r1055833 - in /click/trunk/click: build/build.properties build/click-nodeps.pom documentation/docs/developer-guide/building.html documentation/docs/roadmap-changes.html framework/src/org/apache/click/service/VelocityTemplateService.java
Date Thu, 06 Jan 2011 11:30:00 GMT
Author: sabob
Date: Thu Jan  6 11:30:00 2011
New Revision: 1055833

URL: http://svn.apache.org/viewvc?rev=1055833&view=rev
Log:
upgraded to Velocity 1.7. CLK-748

Modified:
    click/trunk/click/build/build.properties
    click/trunk/click/build/click-nodeps.pom
    click/trunk/click/documentation/docs/developer-guide/building.html
    click/trunk/click/documentation/docs/roadmap-changes.html
    click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java

Modified: click/trunk/click/build/build.properties
URL: http://svn.apache.org/viewvc/click/trunk/click/build/build.properties?rev=1055833&r1=1055832&r2=1055833&view=diff
==============================================================================
--- click/trunk/click/build/build.properties (original)
+++ click/trunk/click/build/build.properties Thu Jan  6 11:30:00 2011
@@ -54,7 +54,7 @@ log4j.version=1.2.16
 ognl.version=2.6.9
 servlet-api.version=2.3
 spring.version=2.5.6
-velocity.version=1.6.4
+velocity.version=1.7
 
 # The Click Examples third-party library versions
 ashwood.version=2.0

Modified: click/trunk/click/build/click-nodeps.pom
URL: http://svn.apache.org/viewvc/click/trunk/click/build/click-nodeps.pom?rev=1055833&r1=1055832&r2=1055833&view=diff
==============================================================================
--- click/trunk/click/build/click-nodeps.pom (original)
+++ click/trunk/click/build/click-nodeps.pom Thu Jan  6 11:30:00 2011
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.6.4</version>
+      <version>1.7</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: click/trunk/click/documentation/docs/developer-guide/building.html
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/docs/developer-guide/building.html?rev=1055833&r1=1055832&r2=1055833&view=diff
==============================================================================
--- click/trunk/click/documentation/docs/developer-guide/building.html (original)
+++ click/trunk/click/documentation/docs/developer-guide/building.html Thu Jan  6 11:30:00
2011
@@ -225,8 +225,8 @@ The Click framework has the following ru
 </tr>
 <tr>
   <td>Velocity Engine</td>
-  <td>1.6.4</td>
-  <td>velocity-1.6.4.jar<span class="red">*</span></td>
+  <td>1.7</td>
+  <td>velocity-1.7.jar<span class="red">*</span></td>
   <td><a target="_blank" href="http://velocity.apache.org/">Apache Velocity</a></td>
   <td>Velocity Templating Framework</td>
 </tr>

Modified: click/trunk/click/documentation/docs/roadmap-changes.html
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/docs/roadmap-changes.html?rev=1055833&r1=1055832&r2=1055833&view=diff
==============================================================================
--- click/trunk/click/documentation/docs/roadmap-changes.html (original)
+++ click/trunk/click/documentation/docs/roadmap-changes.html Thu Jan  6 11:30:00 2011
@@ -362,6 +362,9 @@ Fixed table headers that used incorrect 
               [<a target="_blank" href="https://issues.apache.org/jira/browse/CLK-717">CLK-717</a>].
           </li>
           <li class="change">
+          Updated Velocity library to version 1.7 [<a target="_blank" href="https://issues.apache.org/jira/browse/CLK-748">CLK-748</a>].
+      </li>
+          <li class="change">
               Update to the latest version for some of the JARs dependencies: log4j-1.2.16,
freemarker-2.3.16,
               commons-codec-1.4, and commons-lang-2.5.
           </li>

Modified: click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java?rev=1055833&r1=1055832&r2=1055833&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java
(original)
+++ click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java
Thu Jan  6 11:30:00 2011
@@ -537,9 +537,6 @@ public class VelocityTemplateService imp
 
             template.merge(velocityContext, velocityWriter);
 
-        } catch (IOException ioe) {
-            throw ioe;
-
         } catch (ParseErrorException pee) {
             TemplateException te = new TemplateException(pee,
                                                          pee.getTemplateName(),
@@ -592,31 +589,6 @@ public class VelocityTemplateService imp
 
             throw te;
 
-        } catch (TemplateParseException tpe) {
-            TemplateException te = new TemplateException(tpe,
-                                                         tpe.getTemplateName(),
-                                                         tpe.getLineNumber(),
-                                                         tpe.getColumnNumber());
-
-            // Exception occurred merging template and model. It is possible
-            // that some output has already been written, so we will append the
-            // error report to the previous output.
-            ErrorReport errorReport =
-                new ErrorReport(te,
-                                ((page != null) ? page.getClass() : null),
-                                configService.isProductionMode(),
-                                Context.getThreadLocalContext().getRequest(),
-                                configService.getServletContext());
-
-            if (velocityWriter == null) {
-                velocityWriter =
-                    new VelocityWriter(writer, WRITER_BUFFER_SIZE, true);
-            }
-
-            velocityWriter.write(errorReport.toString());
-
-            throw te;
-
         } catch (Exception error) {
             TemplateException te = new TemplateException(error);
 



Mime
View raw message