Author: nbubna
Date: Mon Jan 11 19:36:31 2010
New Revision: 898028
URL: http://svn.apache.org/viewvc?rev=898028&view=rev
Log:
VELOCITY-617 deprecate WebMacro and mark ORO optional
Modified:
velocity/engine/trunk/pom.xml
velocity/engine/trunk/src/java/org/apache/velocity/convert/WebMacro.java
velocity/engine/trunk/xdocs/docs/developer-guide.xml
Modified: velocity/engine/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/pom.xml?rev=898028&r1=898027&r2=898028&view=diff
==============================================================================
--- velocity/engine/trunk/pom.xml (original)
+++ velocity/engine/trunk/pom.xml Mon Jan 11 19:36:31 2010
@@ -156,6 +156,7 @@
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>jdom</groupId>
Modified:
velocity/engine/trunk/src/java/org/apache/velocity/convert/WebMacro.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/convert/WebMacro.java?rev=898028&r1=898027&r2=898028&view=diff
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/convert/WebMacro.java
(original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/convert/WebMacro.java
Mon Jan 11 19:36:31 2010
@@ -28,16 +28,12 @@
import org.apache.tools.ant.DirectoryScanner;
/**
- * This class will convert a WebMacro template to
- * a Velocity template. Uses the ORO Regexp package to do the
- * rewrites. Note, it isn't 100% perfect, but will definitely get
- * you about 99.99% of the way to a converted system. Please
- * see the website documentation for more information on how to use
- * this class.
+ * This is deprecated without replacement.
*
* @author <a href="mailto:[email protected]";>Jason van Zyl</a>
* @author <a href="mailto:[email protected]";>Daniel Rall</a>
* @version $Id$
+ * @deprecated Obsolete and outdated.
*/
public class WebMacro
{
Modified: velocity/engine/trunk/xdocs/docs/developer-guide.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/docs/developer-guide.xml?rev=898028&r1=898027&r2=898028&view=diff
==============================================================================
--- velocity/engine/trunk/xdocs/docs/developer-guide.xml (original)
+++ velocity/engine/trunk/xdocs/docs/developer-guide.xml Mon Jan 11 19:36:31
2010
@@ -213,7 +213,8 @@
<a href="http://jakarta.apache.org/oro/index.html";><b>Jakarta ORO</b></a>
- optional. Needed when using the
<code>org.apache.velocity.convert.WebMacro</code> template conversion
- utility.
+ utility or
<code>org.apache.velocity.app.event.implement.EscapeReference</code>
+ ReferenceInsertionEventHandler.
</li>
</ul>
