Author: sdumitriu
Date: Fri Jan 23 20:29:02 2015
New Revision: 1654368
URL: http://svn.apache.org/r1654368
Log:
Fixed deprecated documentation; ORO is no longer used for regular expression
processing
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java?rev=1654368&r1=1654367&r2=1654368&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
Fri Jan 23 20:29:02 2015
@@ -42,14 +42,11 @@ import org.apache.velocity.util.StringUt
* (e.g. <code>$sql</code>, <code>$sql.toString(),</code>, etc).
*
* <PRE>
- * <CODE>eventhandler.escape.sql.match = /sql.*<!-- -->/
- * </CODE>
+ * <CODE>eventhandler.escape.sql.match = sql.*</CODE>
* </PRE>
- * <!-- note: ignore empty HTML comment above - breaks up star slash avoiding
javadoc end -->
*
- * Regular expressions should follow the "Perl5" format used by the ORO
regular expression
- * library. More info is at
- * <a
href="http://jakarta.apache.org/oro/api/org/apache/oro/text/perl/package-summary.html">http://jakarta.apache.org/oro/api/org/apache/oro/text/perl/package-summary.html</a>.
+ * Regular expressions should follow the format used by the Java language.
More info in the
+ * <a
href="http://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html">Pattern
class documentation</a>.
*
* @author <a href="mailto:[email protected]">Will Glass-Husain </a>
* @version $Id$
@@ -96,7 +93,6 @@ public abstract class EscapeReference im
}
if (matchRegExp == null)
- //if (pattern == null)
{
return escape(value);
}