You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by js...@apache.org on 2002/06/18 10:31:02 UTC
cvs commit: jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml CopyOfTag.java CopyTag.java AttributeTag.java ElementTag.java XMLTagLibrary.java XPathExpression.java
jstrachan 2002/06/18 01:31:02
Modified: jelly/src/java/org/apache/commons/jelly/tags/xml
XMLTagLibrary.java XPathExpression.java
Added: jelly/src/java/org/apache/commons/jelly/tags/xml
CopyOfTag.java CopyTag.java AttributeTag.java
ElementTag.java
Log:
Added support for <element> <attribute> <copyOf> and <copy> tags. The <copy> tag is not quite finished yet but the others should be.
Need to write some JUnit test cases for these new tags.
Revision Changes Path
1.9 +9 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XMLTagLibrary.java
Index: XMLTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XMLTagLibrary.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLTagLibrary.java 7 Jun 2002 09:00:36 -0000 1.8
+++ XMLTagLibrary.java 18 Jun 2002 08:31:02 -0000 1.9
@@ -99,6 +99,10 @@
// extensions to JSTL
registerTag("expr", ExprTag.class);
+ registerTag("element", ElementTag.class);
+ registerTag("attribute", AttributeTag.class);
+ registerTag("copy", CopyTag.class);
+ registerTag("copyOf", CopyOfTag.class);
}
public Expression createExpression(
1.5 +6 -6 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XPathExpression.java
Index: XPathExpression.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/XPathExpression.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XPathExpression.java 17 May 2002 15:18:13 -0000 1.4
+++ XPathExpression.java 18 Jun 2002 08:31:02 -0000 1.5
@@ -105,7 +105,7 @@
Object value = context.getVariable(localName);
- //log.info( "Looking up XPath variable of name: " + localName + " value is: " + value );
+ //log.debug( "Looking up XPath variable of name: " + localName + " value is: " + value );
return value;
}
1.1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/CopyOfTag.java
Index: CopyOfTag.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ExprTag.java,v 1.8 2002/05/20 10:09:28 jstrachan Exp $
* $Revision: 1.8 $
* $Date: 2002/05/20 10:09:28 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 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", "Commons", 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 apache@apache.org.
*
* 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/>.
*
* $Id: ExprTag.java,v 1.8 2002/05/20 10:09:28 jstrachan Exp $
*/
package org.apache.commons.jelly.tags.xml;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.dom4j.Node;
import org.dom4j.io.SAXWriter;
import org.jaxen.XPath;
/** A tag which performs a copy-of operation like the XSLT tag
*
* @author James Strachan
*/
public class CopyOfTag extends XPathTagSupport {
/** The XPath expression to evaluate. */
private XPath select;
public CopyOfTag() {
}
// Tag interface
//-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws Exception {
Object xpathContext = getXPathContext();
if (select == null) {
throw new MissingAttributeException( "select" );
}
SAXWriter saxWriter = new SAXWriter(output, output);
List nodes = select.selectNodes(xpathContext);
for (Iterator iter = nodes.iterator(); iter.hasNext(); ) {
Object object = iter.next();
if ( object instanceof Node ) {
saxWriter.write( (Node) object );
}
else if (object != null ) {
output.write( object.toString() );
}
}
}
// Properties
//-------------------------------------------------------------------------
/** Sets the XPath expression to evaluate. */
public void setSelect(XPath select) {
this.select = select;
}
}
1.1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/CopyTag.java
Index: CopyTag.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ExprTag.java,v 1.8 2002/05/20 10:09:28 jstrachan Exp $
* $Revision: 1.8 $
* $Date: 2002/05/20 10:09:28 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 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", "Commons", 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 apache@apache.org.
*
* 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/>.
*
* $Id: ExprTag.java,v 1.8 2002/05/20 10:09:28 jstrachan Exp $
*/
package org.apache.commons.jelly.tags.xml;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.dom4j.Element;
import org.dom4j.Node;
import org.dom4j.io.SAXWriter;
import org.jaxen.XPath;
/**
* A tag which performs a copy operation like the XSLT tag,
* performing a shallow copy of the element and its attributes but no content.
*
* @author James Strachan
*/
public class CopyTag extends XPathTagSupport {
/** The XPath expression to evaluate. */
private XPath select;
public CopyTag() {
}
// Tag interface
//-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws Exception {
Object xpathContext = getXPathContext();
if (select == null) {
throw new MissingAttributeException("select");
}
SAXWriter saxWriter = new SAXWriter(output, output);
Object node = select.selectSingleNode(xpathContext);
if (node instanceof Element) {
Element element = (Element) node;
throw new JellyException( "Not implemented yet!" );
/**
### need to add these methods to dom4j
saxWriter.writeOpen(element);
saxWriter.writeClose(element);
*/
}
else if (node instanceof Node) {
saxWriter.write((Node) node);
}
else if (node != null) {
output.write(node.toString());
}
}
// Properties
//-------------------------------------------------------------------------
/** Sets the XPath expression to evaluate. */
public void setSelect(XPath select) {
this.select = select;
}
}
1.1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/AttributeTag.java
Index: AttributeTag.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ExprTag.java,v 1.8 2002/05/20 10:09:28 jstrachan Exp $
* $Revision: 1.8 $
* $Date: 2002/05/20 10:09:28 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 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", "Commons", 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 apache@apache.org.
*
* 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/>.
*
* $Id: ExprTag.java,v 1.8 2002/05/20 10:09:28 jstrachan Exp $
*/
package org.apache.commons.jelly.tags.xml;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
/** Adds an XML attribute to the parent element tag like
* the <code><xsl:attribute></code> tag.
*
* @author James Strachan
* @version $Revision: 1.1 $
*/
public class AttributeTag extends TagSupport {
/** the name of the attribute. */
private String name;
public AttributeTag() {
}
// Tag interface
//-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws Exception {
ElementTag tag = (ElementTag) findAncestorWithClass( ElementTag.class );
if ( tag == null ) {
throw new JellyException( "<attribute> tag must be enclosed inside an <element> tag" );
}
tag.setAttributeValue( getName(), getBodyText() );
}
// Properties
//-------------------------------------------------------------------------
/**
* @return the name of the attribute.
*/
public String getName() {
return name;
}
/**
* Sets the name of the attribute
*/
public void setName(String name) {
this.name = name;
}
}
1.1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ElementTag.java
Index: ElementTag.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/xml/ExprTag.java,v 1.8 2002/05/20 10:09:28 jstrachan Exp $
* $Revision: 1.8 $
* $Date: 2002/05/20 10:09:28 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 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", "Commons", 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 apache@apache.org.
*
* 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/>.
*
* $Id: ExprTag.java,v 1.8 2002/05/20 10:09:28 jstrachan Exp $
*/
package org.apache.commons.jelly.tags.xml;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
import org.xml.sax.Attributes;
import org.xml.sax.helpers.AttributesImpl;
/** A tag to produce an XML element which can contain other attributes
* or elements like the <code><xsl:element></code> tag.
*
* @author James Strachan
* @version $Revision: 1.1 $
*/
public class ElementTag extends TagSupport {
/** The namespace URI */
private String namespace;
/** The qualified name */
private String name;
/** The XML Attributes */
private AttributesImpl attributes = new AttributesImpl();
public ElementTag() {
}
public void setAttributeValue( String name, String value ) {
// ### we'll assume that all attributes are in no namespace!
// ### this is severely limiting!
// ### we should be namespace aware
int index = attributes.getIndex("", name);
if (index >= 0) {
attributes.removeAttribute(index);
}
// treat null values as no attribute
if (value != null) {
attributes.addAttribute("", name, name, "CDATA", value.toString());
}
}
// Tag interface
//-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws Exception {
String localName = null;
int idx = name.indexOf(':');
if (idx >= 0) {
localName = name.substring(idx + 1);
}
else {
localName = name;
}
output.startElement(namespace, localName, name, attributes);
getBody().run(context, output);
output.endElement(namespace, localName, name);
}
// Properties
//-------------------------------------------------------------------------
/**
* @return the qualified name of the element
*/
public String getName() {
return name;
}
/**
* Sets the qualified name of the element
*/
public void setName(String name) {
this.name = name;
}
/**
* @return the namespace URI of the element
*/
public String getURI() {
return namespace;
}
/**
* Sets the namespace URI of the element
*/
public void setURI(String namespace) {
this.namespace = namespace;
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>