dion 2003/08/18 21:25:55
Modified: src/java/org/apache/maven/jelly/tags/jeez
MavenJeezTagLibrary.java
Added: src/java/org/apache/maven/jelly/tags/jeez
JeezTagLibrary.java
Log:
Switch stable branch back to HEAD
Revision Changes Path
1.7 +15 -65
maven/src/java/org/apache/maven/jelly/tags/jeez/MavenJeezTagLibrary.java
Index: MavenJeezTagLibrary.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/jeez/MavenJeezTagLibrary.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MavenJeezTagLibrary.java 28 Jul 2003 04:02:57 -0000 1.6
+++ MavenJeezTagLibrary.java 19 Aug 2003 04:25:55 -0000 1.7
@@ -57,13 +57,8 @@
*/
import org.apache.commons.jelly.JellyException;
-import org.apache.commons.jelly.Tag;
-import org.apache.commons.jelly.TagLibrary;
-import org.apache.commons.jelly.impl.DynamicTagLibrary;
-import org.apache.commons.jelly.impl.TagFactory;
import org.apache.commons.jelly.impl.TagScript;
-import org.apache.commons.jelly.tags.ant.AntTagLibrary;
-import org.apache.maven.jelly.tags.werkz.MavenWerkzTagLibrary;
+import org.apache.maven.jelly.tags.werkz.LazyAttainGoalTag;
import org.xml.sax.Attributes;
/** Replacement for Jelly's <code>JeezTagLibrary</code> which uses
@@ -76,13 +71,11 @@
* @version $Id$
*/
public class MavenJeezTagLibrary
- extends DynamicTagLibrary
+ extends JeezTagLibrary
{
- /** jelly:werkz taglib. */
- private TagLibrary werkzTagLib = new MavenWerkzTagLibrary();
-
- /** jelly:ant taglib. */
- private AntTagLibrary antTagLib = new AntTagLibrary();
+ // ------------------------------------------------------------
+ // org.apache.commons.jelly.tags.jeez.JeezTagLibrary
+ // ------------------------------------------------------------
/** Create a <code>TagScript</code> based upon an element's
* name and attributes.
@@ -95,63 +88,20 @@
* @throws Exception If an error occurs while attempting to
* create the script.
*/
- public TagScript createTagScript(
- final String name,
- Attributes attrs
- ) throws JellyException
+
+ public TagScript createTagScript( String name, Attributes attrs )
+ throws JellyException
{
+ // Catch the special case of <attainGoal> and substitute
+ // in the lazy version that loads via the Pluginmanager.
- if ( name.equals( "tagdef" ) )
- {
- return new TagScript(
- new TagFactory()
- {
- public Tag createTag( String name, Attributes attributes )
- {
- return new TagDefTag( MavenJeezTagLibrary.this );
- }
- }
- );
- }
- if ( name.equals( "target" ) )
+ if ( name.equals( "attainGoal" ) )
{
- return new TagScript(
- new TagFactory()
- {
- public Tag createTag( String name, Attributes attributes )
- {
- return new TargetTag();
- }
- }
- );
+ return TagScript.newInstance( LazyAttainGoalTag.class );
}
- TagScript script = werkzTagLib.createTagScript( name, attrs );
- if ( script == null )
- {
- script = antTagLib.createCustomTagScript( name, attrs );
- if ( script == null )
- {
- return new TagScript(
- new TagFactory()
- {
- public Tag createTag( String name, Attributes attributes )
throws JellyException
- {
- // lets try create a dynamic tag first
- Tag tag = MavenJeezTagLibrary.this.createTag( name,
attributes );
- if ( tag != null )
- {
- return tag;
- }
- else
- {
- return antTagLib.createTag( name, attributes );
- }
- }
- }
- );
- }
- }
- return script;
+ // Otherwise, act like nothing is different.
+
+ return super.createTagScript( name, attrs );
}
}
1.5 +0 -0
maven/src/java/org/apache/maven/jelly/tags/jeez/JeezTagLibrary.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
