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/14 06:04:12 UTC
cvs commit: jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz JellyBuildListener.java ProjectTag.java
werken 2002/06/13 21:04:12
Modified: jelly/src/java/org/apache/commons/jelly/tags/werkz
JellyBuildListener.java ProjectTag.java
Added: jelly/src/java/org/apache/commons/jelly/tags/jeez
JeezTagLibrary.java
Log:
Added the jelly:jeez taglib, which aggregates jelly:core, jelly:werkz
and jelly:ant, in a friendly way.
Revision Changes Path
1.1 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jeez/JeezTagLibrary.java
Index: JeezTagLibrary.java
===================================================================
/*
* $Header: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/jeez/JeezTagLibrary.java,v 1.1 2002/06/14 04:04:12 werken Exp $
* $Revision: 1.1 $
* $Date: 2002/06/14 04:04:12 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2001 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/>.
*
*/
package org.apache.commons.jelly.tags.jeez;
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.impl.TagScript;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.tags.werkz.WerkzTagLibrary;
import org.apache.commons.jelly.tags.ant.AntTagLibrary;
import org.apache.commons.jelly.tags.core.CoreTagLibrary;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.xml.sax.Attributes;
/** Convenience taglib that puts jelly:core, jelly:werkz and jelly:ant
* into a single namespace.
*
* @author <a href="mailto:bob@eng.werken.com">bob mcwhirter</a>
* @version $Revision: 1.1 $
*/
public class JeezTagLibrary extends TagLibrary {
/** The Log to which logging calls will be made. */
private Log log = LogFactory.getLog(JeezTagLibrary.class);
/** jelly:core taglib. */
private TagLibrary coreTagLib;
/** jelly:werkz taglib. */
private TagLibrary werkzTagLib;
/** jelly:ant taglib. */
private TagLibrary antTagLib;
/** Construct.
*
* @param antProject The ant Project.
*/
public JeezTagLibrary(org.apache.tools.ant.Project antProject) {
this.coreTagLib = new CoreTagLibrary();
this.antTagLib = new AntTagLibrary( antProject );
this.werkzTagLib = new WerkzTagLibrary();
}
public TagScript createTagScript(String name,
Attributes attrs) throws Exception
{
TagScript script = this.coreTagLib.createTagScript( name, attrs );
if ( script == null ) {
script = this.werkzTagLib.createTagScript( name, attrs );
if ( script == null ) {
script = this.antTagLib.createTagScript( name, attrs );
}
}
return script;
}
}
1.2 +0 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/JellyBuildListener.java
Index: JellyBuildListener.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/JellyBuildListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JellyBuildListener.java 12 Jun 2002 22:01:07 -0000 1.1
+++ JellyBuildListener.java 14 Jun 2002 04:04:12 -0000 1.2
@@ -22,11 +22,9 @@
}
public void buildFinished(BuildEvent event) {
-
}
public void buildStarted(BuildEvent event) {
-
}
public void messageLogged(BuildEvent event) {
1.8 +3 -2 jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/ProjectTag.java
Index: ProjectTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/werkz/ProjectTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProjectTag.java 12 Jun 2002 22:01:07 -0000 1.7
+++ ProjectTag.java 14 Jun 2002 04:04:12 -0000 1.8
@@ -112,9 +112,10 @@
// force project to be lazily constructed
getProject();
- AntTagLibrary ant = (AntTagLibrary) context.getTagLibrary( "jelly:ant" );
+ // AntTagLibrary ant = (AntTagLibrary) context.getTagLibrary( "jelly:ant" );
- org.apache.tools.ant.Project antProject = ant.getProject();
+ org.apache.tools.ant.Project antProject =
+ (org.apache.tools.ant.Project) context.findVariable( "org.apache.commons.jelly.ant.Project" );
antProject.getBuildListeners().clear();
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>