jon 00/11/26 17:06:59
Modified: src/java/org/apache/velocity/anakia AnakiaTask.java
Added: src/java/org/apache/velocity/anakia Escape.java
Log:
added a $escape context object
Revision Changes Path
1.10 +2 -1
jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaTask.java
Index: AnakiaTask.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/anakia/AnakiaTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AnakiaTask.java 2000/11/26 06:52:22 1.9
+++ AnakiaTask.java 2000/11/27 01:06:59 1.10
@@ -86,7 +86,7 @@
<a href="http://jakarta.apache.org/velocity/anakia.html">Website</a>.
@author <a href="[EMAIL PROTECTED]">Jon S. Stevens</a>
- @version $Id: AnakiaTask.java,v 1.9 2000/11/26 06:52:22 jon Exp $
+ @version $Id: AnakiaTask.java,v 1.10 2000/11/27 01:06:59 jon Exp $
*/
public class AnakiaTask extends MatchingTask
{
@@ -303,6 +303,7 @@
context.put ("relativePath", getRelativePath(xmlFile));
context.put ("treeWalk", new TreeWalker());
context.put ("xpath", new XPathTool() );
+ context.put ("escape", new Escape() );
// only put this into the context if it exists.
if (projectDocument != null)
1.1 jakarta-velocity/src/java/org/apache/velocity/anakia/Escape.java
Index: Escape.java
===================================================================
package org.apache.velocity.anakia;
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
/**
This class is for escaping CDATA sections. The code was
"borrowed" from the JDOM code. I also added in escaping
of the " -> &quot; character.
@author <a href="[EMAIL PROTECTED]">Jon S. Stevens</a>
@version $Id: Escape.java,v 1.1 2000/11/27 01:06:59 jon Exp $
*/
public class Escape
{
/**
empty constructor
*/
public Escape()
{
// left blank on purpose
}
/**
Do the escaping.
*/
public static final String getText(String st)
{
StringBuffer buff = new StringBuffer();
char[] block = st.toCharArray();
String stEntity = null;
int i, last;
for (i=0, last=0; i < block.length; i++)
{
switch(block[i])
{
case '<' :
stEntity = "<";
break;
case '>' :
stEntity = ">";
break;
case '&' :
stEntity = "&";
break;
case '"' :
stEntity = """;
break;
default :
/* no-op */ ;
}
if (stEntity != null)
{
buff.append(block, last, i - last);
buff.append(stEntity);
stEntity = null;
last = i + 1;
}
}
if(last < block.length)
{
buff.append(block, last, i - last);
}
return buff.toString();
}
}
