svn commit: r306811 - in /jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser: Parser.java Parser.jj Parser.jjt

[nbubna]

Author: nbubna
Date: Thu Oct  6 10:14:58 2005
New Revision: 306811

URL: http://svn.apache.org/viewcvs?rev=306811&view=rev
Log:
ensure that Parser.java uses the new internal logging api

Modified:
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java?rev=306811&r1=306810&r2=306811&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
 Thu Oct  6 10:14:58 2005
@@ -109,12 +109,12 @@
              *  thrown by the Macro class when something is amiss in the
              *  Macro specification
              */
-            rsvc.error ("Parser Error:  #macro() : " + templateName + " : " + 
StringUtils.stackTrace(mee));
+            rsvc.getLog().error("Parser Error: #macro() : " + templateName, 
mee);
             throw new ParseException(mee.getMessage());
         }
         catch (ParseException pe)
         {
-            rsvc.error ("Parser Exception: " + templateName + " : " + 
StringUtils.stackTrace(pe));
+            rsvc.getLog().error("Parser Exception: " + templateName, pe);
             throw new ParseException (pe.currentToken,
                 pe.expectedTokenSequences, pe.tokenImage);
         }
@@ -124,7 +124,7 @@
         }
         catch (Exception e)
         {
-            rsvc.error ("Parser Error: " + templateName + " : " + 
StringUtils.stackTrace(e));
+            rsvc.getLog().error("Parser Error: " + templateName, e);
         }
 
         currentTemplateName = "";

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj?rev=306811&r1=306810&r2=306811&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jj
 Thu Oct  6 10:14:58 2005
@@ -1,4 +1,4 @@
-/[EMAIL PROTECTED](jjtree) Generated By:JJTree: Do not edit this line. 
C:/Documents and Settings/wglass/My 
Documents/GAWE/velocity/trunk/src/java/org/apache/velocity/runtime/parser\Parser.jj
 */
+/[EMAIL PROTECTED](jjtree) Generated By:JJTree: Do not edit this line. 
C:/java/apache/velocity/src/java/org/apache/velocity/runtime/parser\Parser.jj */
 /[EMAIL PROTECTED]//*
  * Copyright 2000-2004 The Apache Software Foundation.
  *
@@ -164,12 +164,12 @@
              *  thrown by the Macro class when something is amiss in the
              *  Macro specification
              */
-            rsvc.error ("Parser Error:  #macro() : " + templateName + " : " + 
StringUtils.stackTrace(mee));
+            rsvc.getLog().error("Parser Error: #macro() : " + templateName, 
mee);
             throw new ParseException(mee.getMessage());
         }
         catch (ParseException pe)
         {
-            rsvc.error ("Parser Exception: " + templateName + " : " + 
StringUtils.stackTrace(pe));
+            rsvc.getLog().error("Parser Exception: " + templateName, pe);
             throw new ParseException (pe.currentToken,
                 pe.expectedTokenSequences, pe.tokenImage);
         }
@@ -179,7 +179,7 @@
         }
         catch (Exception e)
         {
-            rsvc.error ("Parser Error: " + templateName + " : " + 
StringUtils.stackTrace(e));
+            rsvc.getLog().error("Parser Error: " + templateName, e);
         }
 
         currentTemplateName = "";

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt?rev=306811&r1=306810&r2=306811&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.jjt
 Thu Oct  6 10:14:58 2005
@@ -185,12 +185,12 @@
              *  thrown by the Macro class when something is amiss in the
              *  Macro specification
              */
-            rsvc.error ("Parser Error:  #macro() : " + templateName + " : " + 
StringUtils.stackTrace(mee));
+            rsvc.getLog().error("Parser Error: #macro() : " + templateName, 
mee);
             throw new ParseException(mee.getMessage());
         }
         catch (ParseException pe)
         {
-            rsvc.error ("Parser Exception: " + templateName + " : " + 
StringUtils.stackTrace(pe));
+            rsvc.getLog().error("Parser Exception: " + templateName, pe);
             throw new ParseException (pe.currentToken,
                 pe.expectedTokenSequences, pe.tokenImage);
         }
@@ -200,7 +200,7 @@
         }
         catch (Exception e)
         {
-            rsvc.error ("Parser Error: " + templateName + " : " + 
StringUtils.stackTrace(e));
+            rsvc.getLog().error("Parser Error: " + templateName, e);
         }
 
         currentTemplateName = "";



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]