Author: cbrisson
Date: Mon Jun 17 11:18:03 2019
New Revision: 1861499
URL: http://svn.apache.org/viewvc?rev=1861499&view=rev
Log:
[engine][VELOCITY-917] Rename parser.name to parser.basename for clarity
Modified:
velocity/engine/branches/parser_experiments/velocity-custom-parser-example/pom.xml
velocity/engine/branches/parser_experiments/velocity-engine-core/pom.xml
velocity/engine/branches/parser_experiments/velocity-engine-core/src/main/parser/Parser.jjt
Modified:
velocity/engine/branches/parser_experiments/velocity-custom-parser-example/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/parser_experiments/velocity-custom-parser-example/pom.xml?rev=1861499&r1=1861498&r2=1861499&view=diff
==============================================================================
---
velocity/engine/branches/parser_experiments/velocity-custom-parser-example/pom.xml
(original)
+++
velocity/engine/branches/parser_experiments/velocity-custom-parser-example/pom.xml
Mon Jun 17 11:18:03 2019
@@ -38,7 +38,7 @@
The proposed custom parser replaces '#' with '@' and '@' with '%'
so that it's suitable to use with Markdown template files, for instance.
- The generated parser class is
org.apache.velocity.runtime.parser.${parser.name}Parser,
+ The generated parser class is
org.apache.velocity.runtime.parser.${parser.basename}Parser,
and must be specified at runtime using the Velocity property
parser.class:
parser.class = org.apache.velocity.runtime.parser.MyCustomParser
@@ -52,7 +52,7 @@
<!-- whether to display debug logs while parsing -->
<parser.debug>false</parser.debug>
<!-- parser basename -->
- <parser.name>Custom</parser.name>
+ <parser.basename>Custom</parser.basename>
<!-- character to substitute to '*' -->
<parser.char.asterisk>*</parser.char.asterisk>
<!-- character to substitute to '@' -->
@@ -196,7 +196,7 @@
<include>*.java</include>
</includes>
<excludes>
-
<exclude>*${parser.name}*.java</exclude>
+
<exclude>*${parser.basename}*.java</exclude>
</excludes>
</fileset>
<fileset>
@@ -205,7 +205,7 @@
<include>*.java</include>
</includes>
<excludes>
-
<exclude>*${parser.name}*.java</exclude>
+
<exclude>*${parser.basename}*.java</exclude>
</excludes>
</fileset>
</filesets>
Modified:
velocity/engine/branches/parser_experiments/velocity-engine-core/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/parser_experiments/velocity-engine-core/pom.xml?rev=1861499&r1=1861498&r2=1861499&view=diff
==============================================================================
--- velocity/engine/branches/parser_experiments/velocity-engine-core/pom.xml
(original)
+++ velocity/engine/branches/parser_experiments/velocity-engine-core/pom.xml
Mon Jun 17 11:18:03 2019
@@ -35,7 +35,7 @@
Instead, you should customize the velocity-custom-parser-example
module to fit your own needs.
-->
<parser.debug>false</parser.debug>
- <parser.name>Standard</parser.name>
+ <parser.basename>Standard</parser.basename>
<parser.char.asterisk>*</parser.char.asterisk>
<parser.char.at>@</parser.char.at>
<parser.char.dollar>$</parser.char.dollar>
Modified:
velocity/engine/branches/parser_experiments/velocity-engine-core/src/main/parser/Parser.jjt
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/parser_experiments/velocity-engine-core/src/main/parser/Parser.jjt?rev=1861499&r1=1861498&r2=1861499&view=diff
==============================================================================
---
velocity/engine/branches/parser_experiments/velocity-engine-core/src/main/parser/Parser.jjt
(original)
+++
velocity/engine/branches/parser_experiments/velocity-engine-core/src/main/parser/Parser.jjt
Mon Jun 17 11:18:03 2019
@@ -78,7 +78,7 @@ options
}
-PARSER_BEGIN(${parser.name}Parser)
+PARSER_BEGIN(${parser.basename}Parser)
package org.apache.velocity.runtime.parser;
import java.io.*;
@@ -108,7 +108,7 @@ import org.slf4j.Logger;
* @author <a href="[email protected]">Henning P. Schmiedehausen</a>
* @version $Id$
*/
-public class ${parser.name}Parser implements
org.apache.velocity.runtime.parser.Parser
+public class ${parser.basename}Parser implements
org.apache.velocity.runtime.parser.Parser
{
/**
* Parser debugging flag.
@@ -121,7 +121,7 @@ public class ${parser.name}Parser implem
{
try
{
- ${parser.name}Parser.class.getDeclaredMethod("trace_call",
String.class);
+ ${parser.basename}Parser.class.getDeclaredMethod("trace_call",
String.class);
debugParser = true;
}
catch(NoSuchMethodException nsfe)
@@ -180,7 +180,7 @@ public class ${parser.name}Parser implem
* object, we satisfy the requirement of an InputStream
* by using a newline character as an input stream.
*/
- public ${parser.name}Parser( RuntimeServices rs)
+ public ${parser.basename}Parser( RuntimeServices rs)
{
/*
* need to call the CTOR first thing.
@@ -549,7 +549,7 @@ public class ${parser.name}Parser implem
private char asterisk = '*';
}
-PARSER_END(${parser.name}Parser)
+PARSER_END(${parser.basename}Parser)
TOKEN_MGR_DECLS:
{
@@ -569,7 +569,7 @@ TOKEN_MGR_DECLS:
*/
public static void trace(String message)
{
- ${parser.name}Parser.trace(message);
+ ${parser.basename}Parser.trace(message);
}
/**
