"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 SAXParseException if an unexpected attribute is
- * encountered or if the "default" attribute
- * is missing.
- */
- public void execute() throws BuildException
- {
- if (file == null) {
- throw new BuildException("import element appears without a file attribute");
- }
-
- ProjectHelperImpl2.AntXmlContext context;
- context=(ProjectHelperImpl2.AntXmlContext)project.getReference("ant.parsing.context");
-
- context.importlevel++;
-
- project.log("importlevel: "+(context.importlevel-1)+" -> "+(context.importlevel),
- Project.MSG_DEBUG);
- project.log("Importing file "+file+" from "+
- context.buildFile.getAbsolutePath(),
- Project.MSG_VERBOSE);
-
- // Paths are relative to the build file they're imported from,
- // *not* the current directory (same as entity includes).
- File importedFile = new File(file);
- if (!importedFile.isAbsolute()) {
- importedFile = new File(context.buildFileParent, file);
- }
- if (!importedFile.exists()) {
- throw new BuildException("Cannot find "+file+" imported from "+
- context.buildFile.getAbsolutePath());
- }
-
- // Add parent build file to the map to avoid cycles...
- String parentFilename = getPath(context.buildFile);
- if (!context.importedFiles.containsKey(parentFilename)) {
- context.importedFiles.put(parentFilename, context.buildFile);
- }
-
- // Make sure we import the file only once
- String importedFilename = getPath(importedFile);
- if (context.importedFiles.containsKey(importedFilename)) {
- project.log("\nSkipped already imported file:\n "+importedFilename+"\n",
- Project.MSG_WARN);
- context.importlevel--;
- project.log("importlevel: "+context.importlevel+" <- "+
- (context.importlevel+1) ,Project.MSG_DEBUG);
- return;
- } else {
- context.importedFiles.put(importedFilename, importedFile);
- }
-
- context.ignoreProjectTag=true;
- context.helper.parse(project, importedFile, new ProjectHelperImpl2.RootHandler(context));
-
- context.importlevel--;
- project.log("importlevel: "+context.importlevel+" <- "+
- (context.importlevel+1) ,Project.MSG_DEBUG);
- }
-
- private static String getPath(File file) {
- try {
- return file.getCanonicalPath();
- }
- catch (IOException e) {
- return file.getAbsolutePath();
- }
- }
-}
diff --git a/proposal/sandbox/embed/ProjectHelperImpl2.java b/proposal/sandbox/embed/ProjectHelperImpl2.java
deleted file mode 100644
index bbc7ea58a..000000000
--- a/proposal/sandbox/embed/ProjectHelperImpl2.java
+++ /dev/null
@@ -1,1013 +0,0 @@
-/*
- * 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 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 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 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);
- }
- }
- }
-
- /** Context information for the ant processing.
- */
- public static class AntXmlContext {
- /** The project to configure. */
- private 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.
- */
- Locator locator;
-
- // Do we need those ?
- public ProjectHelperImpl2 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.
- */ - 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. - */ - Vector wStack=new Vector(); - - // Import stuff - public boolean ignoreProjectTag=false; - public static Hashtable importedFiles = new Hashtable(); - public static int importlevel = 0; - - public AntXmlContext(Project project, ProjectHelperImpl2 helper) { - this.project=project; - implicitTarget.setName(""); - this.helper=helper; - } - - public Project getProject() { - return project; - } - - public RuntimeConfigurable2 currentWrapper() { - if( wStack.size() < 1 ) return null; - return (RuntimeConfigurable2)wStack.elementAt( wStack.size() - 1 ); - } - - public RuntimeConfigurable2 parentWrapper() { - if( wStack.size() < 2 ) return null; - return (RuntimeConfigurable2)wStack.elementAt( wStack.size() - 2 ); - } - - public void pushWrapper( RuntimeConfigurable2 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(Object,AttributeList,Project)
- */
- 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 {
- Stack antHandlers=new Stack();
- AntHandler currentHandler=null;
- AntXmlContext context;
-
- public RootHandler(AntXmlContext context) {
- currentHandler=ProjectHelperImpl2.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 = systemId.substring(5);
- int index = path.indexOf("file:");
-
- // we only have to handle these for backward compatibility
- // since they are in the FAQ.
- while (index != -1) {
- path = path.substring(0, index) + path.substring(index + 5);
- index = path.indexOf("file:");
- }
-
- String entitySystemId = path;
- index = path.indexOf("%23");
- // convert these to #
- while (index != -1) {
- path = path.substring(0, index) + "#" + path.substring(index + 3);
- index = path.indexOf("%23");
- }
-
- File file = new File(path);
- if (!file.isAbsolute()) {
- file = new File(context.buildFileParent, path);
- }
-
- try {
- InputSource inputSource = new InputSource(new FileInputStream(file));
- inputSource.setSystemId("file:" + entitySystemId);
- return inputSource;
- } catch (FileNotFoundException fne) {
- context.getProject().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 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 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 ProjectHelperImpl2.projectHandler;
- } else {
- throw new SAXParseException("Unexpected element \"" + qname + "\" " + name, context.locator);
- }
- }
- }
-
- /**
- * Handler for the top level "project" element.
- */
- public static class ProjectHandler extends AntHandler {
-
- /**
- * Initialisation routine called after handler creation
- * with the element name and attributes. The attributes which
- * this handler can deal with are: "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 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 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 ProjectHelperImpl2.targetHandler;
- } else {
- return ProjectHelperImpl2.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 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);
- }
-
-
- project.log("Targets are now: "+ currentTargets ,
- Project.MSG_VERBOSE);
-
- // 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 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 ProjectHelperImpl2.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 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
- {
- RuntimeConfigurable2 parentWrapper=context.currentWrapper();
- RuntimeConfigurable2 wrapper=null;
-
- if (context.getProject().getDataTypeDefinitions().get(qname) != null) {
- try {
- Object element = context.getProject().createDataType(qname);
- if (element == null) {
- // can it happen ? We just checked that the type exists
- throw new BuildException("Unknown data type "+qname);
- }
-
- wrapper = new RuntimeConfigurable2(element, qname);
- wrapper.setAttributes2(attrs);
- context.currentTarget.addDataType(wrapper);
- } catch (BuildException exc) {
- throw new SAXParseException(exc.getMessage(), context.locator, exc);
- }
- } else {
- Task task=null;
- try {
- task = context.getProject().createTask(qname);
- } catch (BuildException e) {
- // swallow here, will be thrown again in
- // UnknownElement.maybeConfigure if the problem persists.
- }
-
- if (task == null) {
- task = new UnknownElement(qname);
- task.setProject(context.getProject());
- //XXX task.setTaskType(qname);
- task.setTaskName(qname);
- }
-
- task.setLocation(new Location(context.locator.getSystemId(),
- context.locator.getLineNumber(),
- context.locator.getColumnNumber()));
- context.configureId(task, attrs);
-
- task.setOwningTarget(context.currentTarget);
-
- Object parent=null;
- if( parentWrapper!=null ) {
- parent=parentWrapper.getProxy();
- }
-
- if( parent instanceof TaskContainer ) {
- // Task included in a TaskContainer
- ((TaskContainer)parent).addTask( task );
- } else {
- // Task included in a target ( including the default one ).
- context.currentTarget.addTask( task );
- }
- // container.addTask(task);
- task.init();
-
- wrapper=new RuntimeConfigurable2(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 SAXParseException if the element doesn't support text
- *
- * @see ProjectHelper#addText(Project,Object,char[],int,int)
- */
- public void characters(char[] buf, int start, int count,
- AntXmlContext context)
- throws SAXParseException
- {
- RuntimeConfigurable2 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 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
- RuntimeConfigurable2 wrapper=context.currentWrapper();
-
- Object element=wrapper.getProxy();
- if (element instanceof TaskContainer) {
- // task can contain other tasks - no other nested elements possible
- return ProjectHelperImpl2.elementHandler;
- }
- else {
- return ProjectHelperImpl2.nestedElementHandler;
- }
- }
-
- public void onEndElement(String uri, String tag, AntXmlContext context) {
- context.popWrapper();
- }
-
- public void onEndChild(String uri, String tag, String qname,
- AntXmlContext context)
- throws SAXParseException
- {
- }
- }
-
- /**
- * Handler for all nested properties. Same as ElementHandler, except that
- * it doesn't deal with DataTypes and doesn't support TaskContainer.
- *
- * This is the original behavior - I just made few changes to avoid duplicated
- * code.
- */
- public static class NestedElementHandler extends ElementHandler {
- /**
- * Constructor.
- */
- public NestedElementHandler() {
- }
-
- /**
- * 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 SAXParseException in case of error, such as a
- * BuildException being thrown during configuration.
- */
- public void onStartElement(String uri, String propType, String qname,
- Attributes attrs,
- AntXmlContext context)
- throws SAXParseException
- {
- RuntimeConfigurable2 parentWrapper=context.currentWrapper();
- RuntimeConfigurable2 wrapper=null;
- try {
- Object element;
- Object parent=parentWrapper.getProxy();
- if (parent instanceof TaskAdapter) {
- parent = ((TaskAdapter) parent).getProxy();
- }
-
- String elementName = qname.toLowerCase(Locale.US);
- if (parent instanceof UnknownElement) {
- UnknownElement uc = new UnknownElement(elementName);
- uc.setProject(context.getProject());
- ((UnknownElement) parent).addChild(uc);
- element = uc;
- } else {
- Class parentClass = parent.getClass();
- IntrospectionHelper ih =
- IntrospectionHelper.getHelper(parentClass);
- element = ih.createElement(context.getProject(), parent, elementName);
- }
-
- context.configureId(element, attrs);
-
- wrapper = new RuntimeConfigurable2(element, qname);
- wrapper.setAttributes2(attrs);
- parentWrapper.addChild(wrapper);
- } catch (BuildException exc) {
- throw new SAXParseException(exc.getMessage(), context.locator, exc);
- }
- context.pushWrapper( wrapper );
- }
- }
-}
diff --git a/proposal/sandbox/embed/PropertyHelper.java b/proposal/sandbox/embed/PropertyHelper.java
deleted file mode 100644
index 47d0e7f46..000000000
--- a/proposal/sandbox/embed/PropertyHelper.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * 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 elementTag The tag name generating this element.
- * Should not be null.
- */
- public RuntimeConfigurable2(Object proxy, String elementTag) {
- super( proxy, elementTag );
- wrappedObject = proxy;
- this.elementTag = elementTag;
- if( proxy instanceof Task )
- ((Task)proxy).setRuntimeConfigurableWrapper( this );
- }
-
- /**
- * Sets the element to configure. This is used when the real type of
- * an element isn't known at the time of wrapper creation.
- *
- * @param proxy The element to configure. Must not be null.
- */
- public void setProxy(Object proxy) {
- wrappedObject = proxy;
- }
-
- public Object getProxy() {
- return wrappedObject;
- }
-
- /**
- * Sets the attributes for the wrapped element.
- *
- * @param attributes List of attributes defined in the XML for this
- * element. May be null.
- * @deprecated It shouldn't be called by anyone except ProjectHelper
- */
- public void setAttributes(AttributeList attributes) {
- // this.attributes = new AttributeListImpl(attributes);
- }
-
- public void setAttributes2(Attributes attributes) {
- this.attributes=new AttributesImpl( attributes );
- }
-
- /**
- * Returns the list of attributes for the wrapped element.
- *
- * @return An AttributeList representing the attributes defined in the
- * XML for this element. May be null.
- * @deprecated only for bkwd compatibility
- */
- public AttributeList getAttributes() {
- return sax1Attributes( attributes );
- }
-
- public Attributes getAttributes2() {
- return attributes;
- }
-
- public static AttributeList sax1Attributes( Attributes sax2Att ) {
- AttributeListImpl sax1Att=new AttributeListImpl();
- int length = sax2Att.getLength();
- if (length > 0) {
- for (int i = 0; i < length; i++) {
- // System.out.println("Attributes: " + sax2Att.getQName(i) + " " +
- // sax2Att.getValue(i));
- sax1Att.addAttribute( sax2Att.getQName(i),
- sax2Att.getType(i),
- sax2Att.getValue(i));
- }
- }
- return sax1Att;
- }
-
- /**
- * Adds a child element to the wrapped element.
- *
- * @param child The child element wrapper to add to this one.
- * Must not be null.
- */
- public void addChild(RuntimeConfigurable child) {
- children.addElement(child);
- }
-
- /**
- * Returns the child wrapper at the specified position within the list.
- *
- * @param index The index of the child to return.
- *
- * @return The child wrapper at position index within the
- * list.
- */
- public RuntimeConfigurable getChild(int index) {
- return (RuntimeConfigurable) children.elementAt(index);
- }
-
- /**
- * Adds characters from #PCDATA areas to the wrapped element.
- *
- * @param data Text to add to the wrapped element.
- * Should not be null.
- */
- public void addText(String data) {
- characters.append(data);
- }
-
- /**
- * Adds characters from #PCDATA areas to the wrapped element.
- *
- * @param buf A character array of the text within the element.
- * Must not be null.
- * @param start The start element in the array.
- * @param count The number of characters to read from the array.
- *
- */
- public void addText(char[] buf, int start, int count) {
- addText(new String(buf, start, count));
- }
-
- /**
- * Returns the tag name of the wrapped element.
- *
- * @return The tag name of the wrapped element. This is unlikely
- * to be null, but may be.
- */
- public String getElementTag() {
- return elementTag;
- }
-
- /**
- * Configures the wrapped element and all its children.
- * The attributes and text for the wrapped element are configured,
- * and then each child is configured and added. Each time the
- * wrapper is configured, the attributes and text for it are
- * reset.
- *
- * If the element has an id attribute, a reference
- * is added to the project as well.
- *
- * @param p The project containing the wrapped element.
- * Must not be null.
- *
- * @exception BuildException if the configuration fails, for instance due
- * to invalid attributes or children, or text being added to
- * an element which doesn't accept it.
- */
- public void maybeConfigure(Project p) throws BuildException {
- String id = null;
-
- if (attributes != null) {
- PropertyHelper ph=PropertyHelper.getPropertyHelper(p);
- ph.configure(wrappedObject, attributes, p);
- id = attributes.getValue("id");
- attributes = null;
- }
-
- if (characters.length() != 0) {
- ProjectHelper.addText(p, wrappedObject, characters.toString());
- characters.setLength(0);
- }
- Enumeration enum = children.elements();
- while (enum.hasMoreElements()) {
- RuntimeConfigurable2 child
- = (RuntimeConfigurable2) enum.nextElement();
- if (child.wrappedObject instanceof Task) {
- Task childTask = (Task) child.wrappedObject;
- childTask.setRuntimeConfigurableWrapper(child);
- childTask.maybeConfigure();
- } else {
- child.maybeConfigure(p);
- }
- ProjectHelper.storeChild(p, wrappedObject, child.wrappedObject,
- child.getElementTag().toLowerCase(Locale.US));
- }
-
- if (id != null) {
- p.addReference(id, wrappedObject);
- }
- }
-}
diff --git a/proposal/sandbox/embed/SystemPath.java b/proposal/sandbox/embed/SystemPath.java
deleted file mode 100644
index 0426f48a6..000000000
--- a/proposal/sandbox/embed/SystemPath.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * 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
- *
- * <path id="ant.deps" > - * <fileset ... /> - * </path> - * - * <systemPath pathRef="ant.deps" /> - * - * <junit ... /> - *- * - * This requires that ant-sax2.jar is included in ant/lib. - * - * It has a single property, a reference to a <path> containing all - * the jars that you need. It'll automatically reload optional.jar - * tasks in a different (non-delegating) loader. - * - * @author Costin Manolache - */ -public class SystemPath extends DataType { - public static final String SYSTEM_LOADER_REF="ant.system.loader"; - - public SystemPath() { - } - - /** Specify which path will be used. - */ - public void setPathRef( Reference pathRef ) throws BuildException { - Path path=(Path)pathRef.getReferencedObject(project); - - initSystemLoader(path); - - } - - /** Will prepare the class loader to allow dynamic modifications - * of the classpath. Optional tasks are loaded in a different loader. - */ - private void initSystemLoader(Path path) { - try { - if( project.getReference( SYSTEM_LOADER_REF ) != null ) - return; // already done that. - - // reverse loader - AntClassLoader acl=new AntClassLoader( this.getClass().getClassLoader(), true ); - acl.addLoaderPackageRoot( "org.apache.tools.ant.taskdefs.optional"); - project.addReference( SYSTEM_LOADER_REF, acl ); - - - String list[]=path.list(); - for( int i=0; i