diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
new file mode 100644
index 000000000..ed42a48d3
--- /dev/null
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
@@ -0,0 +1,899 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-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", "Ant", 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
+ * null
.
+ * @param attrs Attributes of the element being started.
+ * Will not be null
.
+ *
+ * @exception org.xml.sax.SAXParseException if this method is not overridden, or in
+ * case of error in an overridden version
+ */
+ public void onStartElement(String uri, String tag, String qname,
+ Attributes attrs,
+ AntXmlContext context)
+ throws SAXParseException
+ {
+ }
+
+ /**
+ * Handles the start of an element. This base implementation just
+ * throws an exception - you must override this method if you expect
+ * child elements.
+ *
+ * @param tag The name of the element being started.
+ * Will not be null
.
+ * @param attrs Attributes of the element being started.
+ * Will not be null
.
+ *
+ * @exception org.xml.sax.SAXParseException if this method is not overridden, or in
+ * case of error in an overridden version
+ */
+ public AntHandler onStartChild(String uri, String tag, String qname,
+ Attributes attrs,
+ AntXmlContext context)
+ throws SAXParseException
+ {
+ throw new SAXParseException("Unexpected element \"" + qname + " \"", context.locator);
+ }
+
+ public void onEndChild(String uri, String tag, String qname,
+ AntXmlContext context)
+ throws SAXParseException
+ {
+ }
+
+ /**
+ * Called when this element and all elements nested into it have been
+ * handled (i.e. at the ).
+ */
+ public void onEndElement(String uri, String tag, AntXmlContext context) {
+ }
+
+ /**
+ * Handles text within an element. This base implementation just
+ * throws an exception, you must override it if you expect content.
+ *
+ * @param buf A character array of the text within the element.
+ * Will not be null
.
+ * @param start The start element in the array.
+ * @param count The number of characters to read from the array.
+ *
+ * @exception org.xml.sax.SAXParseException if this method is not overridden, or in
+ * case of error in an overridden version
+ */
+ public void characters(char[] buf, int start, int count, AntXmlContext context)
+ throws SAXParseException
+ {
+ String s = new String(buf, start, count).trim();
+
+ if (s.length() > 0) {
+ throw new SAXParseException("Unexpected text \"" + s + "\"", context.locator);
+ }
+ }
+
+ /** Will be called every time a namespace is reached.
+ It'll verify if the ns was processed, and if not load the task definitions.
+ */
+ protected void checkNamespace( String uri ) {
+
+ }
+ }
+
+ /** Context information for the ant processing.
+ */
+ public static class AntXmlContext {
+ /** The project to configure. */
+ public Project project;
+
+ /** The configuration file to parse. */
+ public File buildFile;
+
+ /**
+ * Parent directory of the build file. Used for resolving entities
+ * and setting the project's base directory.
+ */
+ public File buildFileParent;
+
+ /** Name of the current project */
+ public String currentProjectName;
+
+ /**
+ * Locator for the configuration file parser.
+ * Used for giving locations of errors etc.
+ */
+ public Locator locator;
+
+ // Do we need those ?
+ public ProjectHelper2 helper;
+
+ org.xml.sax.XMLReader parser;
+
+ /**
+ * Target that all other targets will depend upon implicitly.
+ *
+ *
This holds all tasks and data type definitions that have + * been placed outside of targets.
+ */ + public Target implicitTarget = new Target(); + + /** Current target ( no need for a stack as the processing model + allows only one level of target ) */ + public Target currentTarget=null; + + /** The stack of RuntimeConfigurable2 wrapping the + objects. + */ + public Vector wStack=new Vector(); + + public Hashtable namespaces=new Hashtable(); + + // Import stuff + public boolean ignoreProjectTag=false; + public Hashtable importedFiles = new Hashtable(); + public int importlevel = 0; + + public AntXmlContext(Project project, ProjectHelper2 helper) { + this.project=project; + implicitTarget.setName(""); + this.helper=helper; + } + + public Project getProject() { + return project; + } + + public RuntimeConfigurable currentWrapper() { + if( wStack.size() < 1 ) return null; + return (RuntimeConfigurable)wStack.elementAt( wStack.size() - 1 ); + } + + public RuntimeConfigurable parentWrapper() { + if( wStack.size() < 2 ) return null; + return (RuntimeConfigurable)wStack.elementAt( wStack.size() - 2 ); + } + + public void pushWrapper( RuntimeConfigurable wrapper ) { + wStack.addElement(wrapper); + } + + public void popWrapper() { + if( wStack.size() > 0 ) + wStack.removeElementAt( wStack.size() - 1 ); + } + + public Vector getWrapperStack() { + return wStack; + } + + /** + * Scans an attribute list for theid
attribute and
+ * stores a reference to the target object in the project if an
+ * id is found.
+ *
+ * This method was moved out of the configure method to allow
+ * it to be executed at parse time.
+ *
+ * @see #configure(java.lang.Object,org.xml.sax.AttributeList,org.apache.tools.ant.Project)
+ */
+ public void configureId(Object element, Attributes attr) {
+ String id = attr.getValue("id");
+ if (id != null) {
+ project.addReference(id, element);
+ }
+ }
+
+ }
+
+ /**
+ * Handler for ant processing. Uses a stack of AntHandlers to
+ * implement each element ( the original parser used a recursive behavior,
+ * with the implicit execution stack )
+ */
+ public static class RootHandler extends DefaultHandler {
+ private Stack antHandlers=new Stack();
+ private AntHandler currentHandler=null;
+ private AntXmlContext context;
+
+ public RootHandler(AntXmlContext context) {
+ currentHandler=ProjectHelper2.mainHandler;
+ antHandlers.push( currentHandler );
+ this.context=context;
+ }
+
+ /**
+ * Resolves file: URIs relative to the build file.
+ *
+ * @param publicId The public identifer, or null
+ * if none is available. Ignored in this
+ * implementation.
+ * @param systemId The system identifier provided in the XML
+ * document. Will not be null
.
+ */
+ public InputSource resolveEntity(String publicId,
+ String systemId) {
+
+ context.getProject().log("resolving systemId: " +
+ systemId, Project.MSG_VERBOSE);
+
+ if (systemId.startsWith("file:")) {
+ String path = fu.fromURI(systemId);
+
+ File file = new File(path);
+ if (!file.isAbsolute()) {
+ file = fu.resolveFile(context.buildFileParent, path);
+ }
+ try {
+ InputSource inputSource =
+ new InputSource(new FileInputStream(file));
+ inputSource.setSystemId(fu.toURI(file.getAbsolutePath()));
+ return inputSource;
+ } catch (FileNotFoundException fne) {
+ context.project.log(file.getAbsolutePath() +
+ " could not be found", Project.MSG_WARN);
+ }
+
+ }
+ // use default if not file or file not found
+ return null;
+ }
+
+ /**
+ * Handles the start of a project element. A project handler is created
+ * and initialised with the element name and attributes.
+ *
+ * @param tag The name of the element being started.
+ * Will not be null
.
+ * @param attrs Attributes of the element being started.
+ * Will not be null
.
+ *
+ * @exception org.xml.sax.SAXParseException if the tag given is not
+ * "project"
+ */
+ public void startElement(String uri, String tag, String qname, Attributes attrs)
+ throws SAXParseException
+ {
+ AntHandler next=currentHandler.onStartChild(uri, tag, qname, attrs, context);
+ antHandlers.push( currentHandler );
+ currentHandler=next;
+ currentHandler.onStartElement( uri, tag, qname, attrs, context );
+ }
+
+ /**
+ * Sets the locator in the project helper for future reference.
+ *
+ * @param locator The locator used by the parser.
+ * Will not be null
.
+ */
+ public void setDocumentLocator(Locator locator) {
+ context.locator = locator;
+ }
+
+ /**
+ * Handles the end of an element. Any required clean-up is performed
+ * by the onEndElement() method and then the original handler is restored to
+ * the parser.
+ *
+ * @param name The name of the element which is ending.
+ * Will not be null
.
+ *
+ * @exception org.xml.sax.SAXException in case of error (not thrown in
+ * this implementation)
+ *
+ */
+ public void endElement(String uri, String name, String qName) throws SAXException {
+ currentHandler.onEndElement(uri, name, context);
+ AntHandler prev=(AntHandler)antHandlers.pop();
+ currentHandler=prev;
+ if( currentHandler!=null )
+ currentHandler.onEndChild( uri, name, qName, context );
+ }
+
+ public void characters(char[] buf, int start, int count)
+ throws SAXParseException
+ {
+ currentHandler.characters( buf, start, count, context );
+ }
+ }
+
+ public static class MainHandler extends AntHandler {
+
+ public AntHandler onStartChild(String uri, String name, String qname,
+ Attributes attrs,
+ AntXmlContext context)
+ throws SAXParseException
+ {
+ if (qname.equals("project")) {
+ return ProjectHelper2.projectHandler;
+ } else {
+// if( context.importlevel > 0 ) {
+// // we are in an imported file. Allow top-level "default"
,
+ * "name"
, "id"
and "basedir"
.
+ *
+ * @param tag Name of the element which caused this handler
+ * to be created. Should not be null
.
+ * Ignored in this implementation.
+ * @param attrs Attributes of the element which caused this
+ * handler to be created. Must not be null
.
+ *
+ * @exception org.xml.sax.SAXParseException if an unexpected attribute is
+ * encountered or if the "default"
attribute
+ * is missing.
+ */
+ public void onStartElement(String uri, String tag, String qname,
+ Attributes attrs,
+ AntXmlContext context)
+ throws SAXParseException
+ {
+ String id = null;
+ String baseDir = null;
+
+ Project project=context.getProject();
+
+ for (int i = 0; i < attrs.getLength(); i++) {
+ String key = attrs.getQName(i);
+ String value = attrs.getValue(i);
+
+ if (key.equals("default")) {
+ if ( value != null && !value.equals("")) {
+ if( !context.ignoreProjectTag )
+ project.setDefaultTarget(value);
+ }
+ } else if (key.equals("name")) {
+ if (value != null) {
+ context.currentProjectName=value;
+
+ if( !context.ignoreProjectTag ) {
+ project.setName(value);
+ project.addReference(value, project);
+ }
+ }
+ } else if (key.equals("id")) {
+ if (value != null) {
+ // What's the difference between id and name ?
+ if( !context.ignoreProjectTag ) {
+ project.addReference(value, project);
+ }
+ }
+ } else if (key.equals("basedir")) {
+ if( !context.ignoreProjectTag )
+ baseDir = value;
+ } else {
+ // XXX ignore attributes in a different NS ( maybe store them ? )
+ throw new SAXParseException("Unexpected attribute \"" + attrs.getQName(i) + "\"", context.locator);
+ }
+ }
+
+ if( context.ignoreProjectTag ) {
+ // no further processing
+ return;
+ }
+ // set explicitely before starting ?
+ if (project.getProperty("basedir") != null) {
+ project.setBasedir(project.getProperty("basedir"));
+ } else {
+ // Default for baseDir is the location of the build file.
+ if (baseDir == null) {
+ project.setBasedir(context.buildFileParent.getAbsolutePath());
+ } else {
+ // check whether the user has specified an absolute path
+ if ((new File(baseDir)).isAbsolute()) {
+ project.setBasedir(baseDir);
+ } else {
+ project.setBaseDir(project.resolveFile(baseDir,
+ context.buildFileParent));
+ }
+ }
+ }
+
+ project.addTarget("", context.implicitTarget);
+ context.currentTarget=context.implicitTarget;
+ }
+
+ /**
+ * Handles the start of a top-level element within the project. An
+ * appropriate handler is created and initialised with the details
+ * of the element.
+ *
+ * @param tag The name of the element being started.
+ * Will not be null
.
+ * @param attrs Attributes of the element being started.
+ * Will not be null
.
+ *
+ * @exception org.xml.sax.SAXParseException if the tag given is not
+ * "taskdef"
, "typedef"
,
+ * "property"
, "target"
+ * or a data type definition
+ */
+ public AntHandler onStartChild(String uri, String name, String qname,
+ Attributes attrs,
+ AntXmlContext context)
+ throws SAXParseException
+ {
+ if (qname.equals("target")) {
+ return ProjectHelper2.targetHandler;
+ } else {
+ return ProjectHelper2.elementHandler;
+ }
+ }
+
+ }
+
+ /**
+ * Handler for "target" elements.
+ */
+ public static class TargetHandler extends AntHandler {
+
+ /**
+ * Initialisation routine called after handler creation
+ * with the element name and attributes. The attributes which
+ * this handler can deal with are: "name"
,
+ * "depends"
, "if"
,
+ * "unless"
, "id"
and
+ * "description"
.
+ *
+ * @param tag Name of the element which caused this handler
+ * to be created. Should not be null
.
+ * Ignored in this implementation.
+ * @param attrs Attributes of the element which caused this
+ * handler to be created. Must not be null
.
+ *
+ * @exception org.xml.sax.SAXParseException if an unexpected attribute is encountered
+ * or if the "name"
attribute is missing.
+ */
+ public void onStartElement(String uri, String tag, String qname,
+ Attributes attrs,
+ AntXmlContext context)
+ throws SAXParseException
+ {
+ String name = null;
+ String depends = "";
+
+ Project project=context.getProject();
+ Target target = new Target();
+ context.currentTarget=target;
+
+ for (int i = 0; i < attrs.getLength(); i++) {
+ String key = attrs.getQName(i);
+ String value = attrs.getValue(i);
+
+ if (key.equals("name")) {
+ name = value;
+ if( "".equals( name ) )
+ throw new BuildException("name attribute must not be empty");
+ } else if (key.equals("depends")) {
+ depends = value;
+ } else if (key.equals("if")) {
+ target.setIf(value);
+ } else if (key.equals("unless")) {
+ target.setUnless(value);
+ } else if (key.equals("id")) {
+ if (value != null && !value.equals("")) {
+ context.getProject().addReference(value, target);
+ }
+ } else if (key.equals("description")) {
+ target.setDescription(value);
+ } else {
+ throw new SAXParseException("Unexpected attribute \"" + key + "\"", context.locator);
+ }
+ }
+
+ if (name == null) {
+ throw new SAXParseException("target element appears without a name attribute",
+ context.locator);
+ }
+
+ Hashtable currentTargets = project.getTargets();
+
+ // If the name has already beend defined ( import for example )
+ if(currentTargets.containsKey(name)) {
+ // Alter the name.
+ if( context.currentProjectName != null ) {
+ String newName=context.currentProjectName + "." + name;
+ project.log("Already defined in main or a previous import, define "
+ + name + " as " + newName,
+ Project.MSG_VERBOSE);
+ name=newName;
+ } else {
+ project.log("Already defined in main or a previous import, ignore "
+ + name,
+ Project.MSG_VERBOSE);
+ name=null;
+ }
+ }
+
+ if( name != null ) {
+ target.setName(name);
+ project.addOrReplaceTarget(name, target);
+ }
+
+ // take care of dependencies
+ if (depends.length() > 0) {
+ target.setDepends(depends);
+ }
+ }
+
+ /**
+ * Handles the start of an element within a target.
+ *
+ * @param tag The name of the element being started.
+ * Will not be null
.
+ * @param attrs Attributes of the element being started.
+ * Will not be null
.
+ *
+ * @exception org.xml.sax.SAXParseException if an error occurs when initialising
+ * the appropriate child handler
+ */
+ public AntHandler onStartChild(String uri, String name, String qname,
+ Attributes attrs,
+ AntXmlContext context)
+ throws SAXParseException
+ {
+ return ProjectHelper2.elementHandler;
+ }
+ public void onEndElement(String uri, String tag, AntXmlContext context) {
+ context.currentTarget=context.implicitTarget;
+ }
+ }
+
+ /**
+ * Handler for all project elements ( tasks, data types )
+ */
+ public static class ElementHandler extends AntHandler {
+
+ /**
+ * Constructor.
+ */
+ public ElementHandler() {
+ }
+
+ /**
+ * Initialisation routine called after handler creation
+ * with the element name and attributes. This configures
+ * the element with its attributes and sets it up with
+ * its parent container (if any). Nested elements are then
+ * added later as the parser encounters them.
+ *
+ * @param tag Name of the element which caused this handler
+ * to be created. Must not be null
.
+ *
+ * @param attrs Attributes of the element which caused this
+ * handler to be created. Must not be null
.
+ *
+ * @exception org.xml.sax.SAXParseException in case of error (not thrown in
+ * this implementation)
+ */
+ public void onStartElement(String uri, String tag, String qname,
+ Attributes attrs,
+ AntXmlContext context)
+ throws SAXParseException
+ {
+ RuntimeConfigurable parentWrapper=context.currentWrapper();
+ RuntimeConfigurable wrapper=null;
+
+ /* UnknownElement is used for tasks and data types - with
+ delayed eval */
+ UnknownElement task= new UnknownElement(qname);
+ task.setProject(context.getProject());
+ //XXX task.setTaskType(qname);
+
+ task.setTaskName(qname);
+
+ Location location=new Location(context.locator.getSystemId(),
+ context.locator.getLineNumber(),
+ context.locator.getColumnNumber());
+ task.setLocation(location);
+ task.setOwningTarget(context.currentTarget);
+
+ context.configureId(task, attrs);
+
+ Object parent=null;
+ if( parentWrapper!=null ) {
+ parent=parentWrapper.getProxy();
+ }
+
+ if( parent != null ) {
+ // Nested element
+ ((UnknownElement)parent).addChild( task );
+ } else {
+ // Task included in a target ( including the default one ).
+ context.currentTarget.addTask( task );
+ }
+
+ // container.addTask(task);
+ // This is a nop in UE: task.init();
+
+ wrapper=new RuntimeConfigurable( task, task.getTaskName());
+ wrapper.setAttributes2(attrs);
+
+ if (parentWrapper != null) {
+ parentWrapper.addChild(wrapper);
+ }
+
+ context.pushWrapper( wrapper );
+ }
+
+ /**
+ * Adds text to the task, using the wrapper
+ *
+ * @param buf A character array of the text within the element.
+ * Will not be null
.
+ * @param start The start element in the array.
+ * @param count The number of characters to read from the array.
+ *
+ * @exception org.xml.sax.SAXParseException if the element doesn't support text
+ *
+ * @see org.apache.tools.ant.ProjectHelper#addText(org.apache.tools.ant.Project,java.lang.Object,char[],int,int)
+ */
+ public void characters(char[] buf, int start, int count,
+ AntXmlContext context)
+ throws SAXParseException
+ {
+ RuntimeConfigurable wrapper=context.currentWrapper();
+ wrapper.addText(buf, start, count);
+ }
+
+ /**
+ * Handles the start of an element within a target. Task containers
+ * will always use another task handler, and all other tasks
+ * will always use a nested element handler.
+ *
+ * @param tag The name of the element being started.
+ * Will not be null
.
+ * @param attrs Attributes of the element being started.
+ * Will not be null
.
+ *
+ * @exception org.xml.sax.SAXParseException if an error occurs when initialising
+ * the appropriate child handler
+ */
+ public AntHandler onStartChild(String uri, String tag, String qname,
+ Attributes attrs,
+ AntXmlContext context)
+ throws SAXParseException
+ {
+ // this element
+ RuntimeConfigurable wrapper=context.currentWrapper();
+
+ Object element=wrapper.getProxy();
+// return ProjectHelper2.nestedElementHandler;
+ return ProjectHelper2.elementHandler;
+ }
+
+ public void onEndElement(String uri, String tag, AntXmlContext context) {
+ context.popWrapper();
+ }
+
+ public void onEndChild(String uri, String tag, String qname,
+ AntXmlContext context)
+ throws SAXParseException
+ {
+ }
+ }
+}