Return-Path: 
 <commits-return-2513-apmail-velocity-commits-archive=velocity.apache.org@velocity.apache.org>
X-Original-To: apmail-velocity-commits-archive@minotaur.apache.org
Delivered-To: apmail-velocity-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C70D910B96
	for <apmail-velocity-commits-archive@minotaur.apache.org>;
 Fri, 23 Jan 2015 20:29:03 +0000 (UTC)
Received: (qmail 33053 invoked by uid 500); 23 Jan 2015 20:29:03 -0000
Delivered-To: apmail-velocity-commits-archive@velocity.apache.org
Received: (qmail 33015 invoked by uid 500); 23 Jan 2015 20:29:03 -0000
Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@velocity.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@velocity.apache.org>
List-Post: <mailto:commits@velocity.apache.org>
List-Id: <commits.velocity.apache.org>
Reply-To: dev@velocity.apache.org
Delivered-To: mailing list commits@velocity.apache.org
Received: (qmail 33005 invoked by uid 99); 23 Jan 2015 20:29:03 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Jan 2015 20:29:03 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 66C69AC010E;
	Fri, 23 Jan 2015 20:29:03 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1654368 -
 /velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
Date: Fri, 23 Jan 2015 20:29:03 -0000
To: commits@velocity.apache.org
From: sdumitriu@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150123202903.66C69AC010E@hades.apache.org>

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:wglass@forio.com">Will Glass-Husain </a>
  * @version $Id$
@@ -96,7 +93,6 @@ public abstract class EscapeReference im
         }
 
         if (matchRegExp == null)
-        //if (pattern == null)
         {
             return escape(value);
         }