You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by we...@apache.org on 2002/06/05 20:03:38 UTC
cvs commit: jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core ImportTag.java CoreTagLibrary.java
werken 2002/06/05 11:03:38
Modified: jelly/src/java/org/apache/commons/jelly/tags/core
CoreTagLibrary.java
Added: jelly/src/java/org/apache/commons/jelly/tags/core
ImportTag.java
Log:
Added <jelly:import uri="location"/> which is semantically
equivalent to <jelly:include uri="location" inherit="false" export="true"/>
Like <include>, <import> allows the configuration of the 'inherit'
attribute, which defaults to false.
Revision Changes Path
1.10 +6 -5 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/CoreTagLibrary.java
Index: CoreTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/CoreTagLibrary.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CoreTagLibrary.java 23 May 2002 23:33:35 -0000 1.9
+++ CoreTagLibrary.java 5 Jun 2002 18:03:38 -0000 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/CoreTagLibrary.java,v 1.9 2002/05/23 23:33:35 jstrachan Exp $
- * $Revision: 1.9 $
- * $Date: 2002/05/23 23:33:35 $
+ * $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/CoreTagLibrary.java,v 1.10 2002/06/05 18:03:38 werken Exp $
+ * $Revision: 1.10 $
+ * $Date: 2002/06/05 18:03:38 $
*
* ====================================================================
*
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- * $Id: CoreTagLibrary.java,v 1.9 2002/05/23 23:33:35 jstrachan Exp $
+ * $Id: CoreTagLibrary.java,v 1.10 2002/06/05 18:03:38 werken Exp $
*/
package org.apache.commons.jelly.tags.core;
@@ -75,7 +75,7 @@
/** Describes the Taglib. This class could be generated by XDoclet
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class CoreTagLibrary extends TagLibrary {
@@ -93,6 +93,7 @@
registerTag("otherwise", OtherwiseTag.class);
// other tags
registerTag("include", IncludeTag.class);
+ registerTag("import", ImportTag.class);
// extensions to JSTL
registerTag("expr", ExprTag.class);
1.1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ImportTag.java
Index: ImportTag.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/core/ImportTag.java,v 1.1 2002/06/05 18:03:38 werken Exp $
* $Revision: 1.1 $
* $Date: 2002/06/05 18:03:38 $
*
* ====================================================================
*
* 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: ImportTag.java,v 1.1 2002/06/05 18:03:38 werken Exp $
*/
package org.apache.commons.jelly.tags.core;
import java.net.URL;
import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
/** Imports another script.
*
* <p>
* By default, the imported script does not have access to
* the parent script's variable context. This behaviour
* may be modified using the <code>inherit</code> attribute.
* </p>
*
* @author <a href="mailto:bob@eng.werken.com">bob mcwhirter</a>
* @version $Revision: 1.1 $
*/
public class ImportTag extends TagSupport {
private String uri;
private boolean shouldInherit;
public ImportTag() {
this.shouldInherit = false;
}
public void setInherit(String inherit) {
if ( "true".equals( inherit ) ) {
this.shouldInherit = true;
}
}
public boolean getInherit() {
return this.shouldInherit;
}
// Tag interface
//-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws Exception {
if (uri == null) {
throw new MissingAttributeException( "uri" );
}
// we need to create a new JellyContext of the URI
// take off the script name from the URL
context.runScript(uri, output, true, getInherit() );
}
// Properties
//-------------------------------------------------------------------------
/** Sets the URI (relative URI or absolute URL) for the script to evaluate. */
public void setUri(String uri) {
this.uri = uri;
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>