-This is a brief, albeit rambling description of Mutant.
-Mutant has many experimental ideas which may or may not prove useful.
-I'll try to describe what is there and let anyone who is interested
-comment. Mutant is still immature. You'll notice that there is, at this
-time, just one task, a hacked version of the echo task, which I have
-been using to test out ideas. Most tasks would end up being pretty
-similar to their Ant 1.x version.
-
-
-OK, let me start with some of the motivating requirements. There are of
-coure many Ant2 requirements but I want to focus on these two for now.
-Mutant does also address many of the other Ant2 requirements.
-
-
-I'll use the terms Ant and mutant somewhat interchangeably - just
-habit, not an assumption of any sort.
-
-
-One of the things which is pretty difficult in Ant 1.x is the
-management of classpaths and classloaders. For example, today the
-antlr task requires the antlr classes in the classpath used to start
-ant. I'm talking here about the classpath built up in the ant.bat/ant
-script launchers. At the same time, the checkstyle task
-which uses antlr won't run if the antlr classes are in the classpath
-because then those classes cannot "see" the classes in the taskdef's
-classpath.
-
-
-Another requirement I have is extensibility. In Ant 1.x this is
-difficult because whenever a new type is created, each task which
-needs to support this type must be changed to provide the new addXXX
-method. The ejbjar task is on example of this problem with its concept of vendor
-specific tools. The zip/jar task, with its support for different types
-of fileset, is another. The addition of the classfileset to Ant requires
-a change to the zip task.
-
-Mutant defines a classloader hierarchy somewhat similar to that used
-in Tomcat 4. Tasks join into this hierarchy at a particular point to
-ensure they have visibility of the necessary interface classes and no
-visibility of the Ant core itself. There is nothing particularly novel
-about this approach, but tasks are able to request certain additional resources
-as we will see later.
-
-
-Mutant starts with two jars. One is the start.jar which contains just
-one class, Main.java which establishes the initial configuration and
-then runs the appropriate front end command line class. If a different
-front end was desired, a different launch class, in its own jar, would
-be used. This would perhaps configure the classloader hierarchy somewhat
-differently and start the approriate GUI front end class.
-
-
-The second jar, init.jar, provides a number of initialisation utilities. These
-are used by Main.java to setup Ant and would also be used by any other front end
-to configure Ant. The important class here is the
-InitConfig which communicates the state of Ant at startup into the the core of
-Ant when it starts up. Main determines the location of ANT_HOME based on the
-location of the start classes and then populates the InitConfig with both
-classloaders and information about the location of various jars and config
-files.
-
-
-At the top of the classloader hierarchy
-are the bootstrap and system classloaders. I won't really
-distinguish between these in mutant. Combined they provide the JDK
-classes, plus the classes from the init and start jars. One objective is
-to keep the footprint of the init and start jars small so they do not
-require any external classes, which may then become visible lower in the
-hierarchy. Main does not explicitly create these loaders, of course, but
-just adds a reference to the init config as system class loader
-
-
-The next jar is for the common area. This provides interface definitions
-and utility classes for use by both the core and by tasks/types etc. It
-is loaded from ANT_HOME/lib/common/*.jar. Typically this is just
-lib/common/common.jar but any other jars in here are loaded. This
-pattern is used in the construction of all of the classloaders.
-
-
-Next up is the core loader. It includes the lib/antcore/antcore.jar plus
-any others including the XML parser jars. Mutant's core does not assume that
-the project model will come from an XML description but XML facilities
-are needed in the core for reading in Ant library defs and config files.
-The parser jar locations are also stored in the init config. This lets
-the jars be added to any Ant library that wants to use Ant's XML parser
-rather than providing its own. Similarly tools.jar's location is
-determined automatically and added to the config for use by tasks which
-request it. I'll go into more detail when discussing the antlib processing.
-
-
-The final jar that is loaded is the jar for the frontend - cli.jar. This
-is not passed in init config since these classes are not visible to the
-core and are not needed by it. So the hierarchy is
-
-Task classloaders generally will come in at common, hiding the core classes, front
-end and XML parser classes from tasks.
-
-
-Once Main has setup the initConfig, it creates the front end commandline
-class and launches mutant proper, passing it the command line args and
-the init config.
-
-
-A GUI would typically replace start.jar and the cli.jar with its own
-versions which manage model construction from GUI processes rather than
-from XML files. It may be possible to move some of Main.java's
-processing into init.jar if it is useful to other front ends. I haven't
-looked at that balance.
-
-The front end is responsible for coordinating execution of Ant. It
-manages command line arguments, builds a model of the Project to be
-evaluated and coordinates the execution services of the core. cli.jar
-contains not only the front-end code but also the XML parsing code for
-building a project model from an XML description. Other front ends may
-choose to build project models in different ways. Commandline is pretty
-similar to Ant 1.x's Main.java - it handles arguments, building loggers,
-listeners, defines, etc - actually I haven't fully implemented
-command line defines in
-mutant yet but it would be similar to Ant 1.x.
-
-
-Commandline then moves to building a project model from the XML
-representation. I have just expanded the approach in Ant 1's
-ProjectHelper for XML parsing, moving away from a stack of inner classes.
-The classes in the front end XML parsing use some XML utility base
-classes from the core.
-
-
-The XML parsing handles two elements at parse time. One is the <ref>
-element which is used for project references - that is relationships
-between project files. The referenced project is parsed as well. The
-second is the <include> element which includes either another complete
-project or a project <fragment> directly into the project. All the other
-elements are used to build a project model which is later processed in
-the core.
-
-
-The project model itself is organized like this
-
-
-
-
A project contains
-
-
named references to other projects
-
targets
-
build elements (tasks, type instances)
-
-
-
A target contains
-
-
build elements (tasks, type instances)
-
-
-
-
A build element contains
-
-
build elements (nested elements)
-
-
-
-
-So, for now the project model contains top level tasks and type
-instances. I'm still thinking about those and property scoping
-especially in the face of project refs and property overrides. Anyway,
-the running of these tasks is currently disabled.
-
-
-Once the model is built, the commandline creates an execution manager
-instance, passing it the initConfig built by Main.jar. It adds build
-listeners and then starts the build using the services of the
-ExecutionManager.
-
-Before we get into execution proper, I'll deal with the structure of an
-ant library and how it works. An antlibrary is a jar file with a library
-descriptor located in META-INF/antlib.xml. This defines what
-typedefs/taskdefs/converters the library makes available to Ant. The
-classes or at least some of the classes for the library will normally be
-available in the jar. The descriptor looks like this (I'll provide two
-examples here)
-
-the "libid" attribute is used to globally identify a library. It is used
-in Ant to pick which tasks you want to make available to a build file.
-As the number of tasks available goes up, this is used to prevent name
-collisions, etc. The name is constructed similarly to a Java package name -
-i.e Reverse DNS order.
-
-
-The "home" attribute is a bit of fluff unused by mutant to allow tools
-to manage libraries and update them etc. More thought could go into
-this.
-
-
-"reqxml" allows a library to say that it wants to use Ant's XML parser
-classes. Note that these will be coming from the library's classloader
-so they will not, in fact, be the same runtime classes as used in Ant's core,
-but it saves tasks packaging their own XML parsers.
-
-
-"reqtools" allows a library to specify that it uses classes from Sun's
-tools.jar file. Again, if tools.jar is available it will be added to the
-list of classes in the library's classloader
-
-
-"extends" allows for a single "inheritance" style relationship between
-libraries. I'm not sure how useful this may be yet but it seems
-important for accessing common custom types. It basically translates
-into the class loader for this library using the one identified in
-extends as its parent.
-
-
-"isolate" specifies that each task created from this libary comes from
-its own classloader. This can be used with tasks derived from Java
-applications which have static initialisers. This used to be an issue
-with the Anakia task, for example. Similarly it could be used to ensure that
-tool.jar classes are unloaded to stop memory leaks. Again this is
-experimental so may not prove ultimately useful.
-
-
-The <typedef> in the example creates a <thread> type. That is just a bit of fun which
-I'll use in an example later. It does show the typedefing of a type from
-outside the ant library however.
-
-
-<taskdef> is pretty obvious. It identifies a taskname with a class from
-the library. The import task, which I have not yet implemented will
-allow this name to be aliased - something like
-
-Tasks are not made available automatically. The build file must state
-which tasks it wants to use using an <import> task. This is similar to
-Java's import statement. Similarly classes whose ids start with "ant."
-are fully imported at the start of execution.
-
-When mutant starts execution, it reads in a config file. Actually it
-attempts to read two files, one from $ANT_HOME/conf/antconfig.xml and
-another from $HOME/.ant/antconfig.xml. Others could be added even
-specified in the command line. These config files are used to provide
-two things - libpaths and task dirs.
-
-
-Taskdirs are locations to search for additional ant libraries. As people
-bundle Ant tasks and types with their products, it will not be practical
-to bundle all this into ANT_HOME/lib. These additional dirs are scanned
-for ant libraries. All .zip/.jar/.tsk files which contain the
-META-INF/antlib.xml file will be processed.
-
-
-Sometimes, of course, the tasks and the libraries upon which they depend
-are not produced by the same people. It is not feasible to go in and
-edit manifests to connect the ant library with its required support
-jars, so the libpath element in the config file is used to specify
-additional paths to be added to a library's classloader. An example
-config would be
-
-Obviously other information can be added to the config - standard
-property values, compiler prefs, etc. I haven't done that yet. User
-level config override system level configs.
-
-
-So, when a ant library creates a classloader, it will take a number of
-URLS. One is the task library itself, the XML parser classes if
-requested, the tools.jar if requested, and any additional libraries
-specified in the <antconfig>. The parent loader is the common loader
-from the initconfig. unless this library is an extending library.
-
-Execution of a build is provided by the core through two key classes.
-One if the ExecutionManager and the other is the ExecutionFrame. An
-execution frame is created for each project in the project model
-hierarchy. It represents the execution state of the project - data
-values, imported tasks, typedefs, taskdefs, etc.
-
-
-The ExecutionManager begins by reading configs, searching for ant
-libraries, configuring and appending any additional paths, etc. It then
-creates a root ExecutionFrame which represents the root project. when a
-build is commenced, the project model is validated and then passed to
-the ExecutionFrame.
-
-
-the ExecutionFrame is the main execution class. When it is created it
-imports all ant libraries with ids that start with ant.*. All others are
-available but must be explicitly imported with <import> tasks. When the
-project is passed in, ExecutionFrames are created for any referenced
-projects. This builds an ExecutionFrame hierarchy which parallels the
-project hierarchy. Each <ref> uses a name to identify the referenced
-project. All property and target references use these reference names to
-identify the particular frame that hold the data. As an example, look at
-this build file
-
-Notice the depends reference to the test2 target in the test.ant project
-file. I am still using the ":" as a separator for refs. It doesn't
-collide with XML namespaces so that should be OK.
-
-
-Execution proceeds by determining the targets in the various frames
-which need to be executed. The appropriate frame is requested to execute
-the target's tasks and type instances. The imports for the frame are
-consulted to determine what is the approrpiate library and class from
-that library. A classloader is fetched, the class is instantiated,
-introspected and then configured from the corresponding part of the
-project model. Ant 1.x's IntrospectionHelper has been split into two -
-the ClassIntrospector and the Reflector. When the task is being
-configured, the context classloader is set. Similarly it is set when the
-task is being executed. Types are handled similarly. When a type in
-instantiated or a task executed, and they support the appropriate
-interface, they will be passed a context through which they can access
-the services of the core. Currently the context is an interface although
-I have wondered if an abstract class may be better to handle expansion
-of the services available over time.
-
-Introspection is not a lot different from Ant 1.x. After some thought I
-have dropped the createXXX method to allow for polymorphic type support, discussed
-below. setXXX methods, coupled with an approriate string to
-type converter are used for attributes. addXXX methods are used for
-nested elements. All of the value setting has been moved to a Reflector
-object. Object creation for addXXX methods is no longer provided in the
-reflector class, just the storage of the value. This allows support for
-add methods defined in terms of interfaces. For example, the hacked Echo
-task I am using has this definition
-
-So when mutant encounteres a nested element it does the following checks
-
-
-Is the value specified by reference?
-
-
-<run ant:refid="test"/>
-
-
-Is it specified by as a polymorphic type?
-
-
-<run ant:type="thread"/>
-
-
-or is it just a normal run o' the mill nested element, which is
-instantiated by a zero arg constructor.
-
-
-Note the use of the ant namespace for the metadata. In essence the
-nested element name <run> identifies the add method to be used, while
-the refId or type elements specify the actual instance or type to be
-used. The ant:type identifies an Ant datatype to be instantiated. If
-neither is specified, the type that is expected by the identified
-method, addRun in this case, is used to create an instance. In this case
-that would fail.
-
-
-Polymorphism, coupled with typedefs is one way, and a good way IMHO, of
-solving the extensibility of tasks such as ejbjar.
-
-
-OK, that is about the size of it. Let me finish with two complete build
-files and the result of running mutant on them.
-
-test2:
- [echo] Adding runnable of type java.lang.Thread
- [echo] hello2
- [echo] Adding runnable of type java.lang.Thread
- [echo] hello3
-
-test:
- [echo] hello
-
-BUILD SUCCESSFUL
-
-Total time: 0 seconds
-
-
-
-Lets change the <run> definition to
-
-
-<run/> in test.ant and the result becomes
-
-
-
-test2:
- [echo] Adding runnable of type java.lang.Thread
- [echo] hello2
-
-BUILD FAILED
-
-/home/conor/dev/mutant/test/test.ant:10:
-No element can be created for nested element <run>.
-Please provide a value by reference or specify the value type
-
-This page describes the major features in Mutant which are significantly
-different from those of Ant1. These are covered from a user perspective. Other
-pages describe the differences from the perspectives of a task developer and an
-Ant core developer.
-
-When Mutant is installed, the most immediately obvious difference will be in the
-directory layout, particularly the lib directory. Where Ant1's lib directory
-contained ant.jar, optional.jar and the bundled XML jars, Mutant's lib directory
-contain a number of subdirectories.
-
-
-In the root directory, there are a number of jars. These jars are the startup
-jars
-
-
-
-
-
- init.jar
-
-
-
-
- a set of low level utility routines required at startup
-
-
-
-
-
-
- start.jar
-
-
-
-
- the Mutant launcher class
-
-
-
-
-
-
- ant.jar
-
-
-
-
- old Ant1 entry point
-
-
-
-
-
-The subdirectories have the following functions
-
-
-
-
-
- parser
-
-
-
-
- The XML parser jars. This is not available to task libraries unless
-they explicitly indicate that it is required.
-
-
-
-
-
-
- antcore
-
-
-
-
- Mutant's core classes. These classes are not available to
-tasks.
-
-
-
-
-
-
- common
-
-
-
-
- classes which are available to both the core and all task
-libraries.
-
-
-
-
-
-
- syslibs/antlibs
-
-
-
-
- Task libraries. The distinction between the two is
-discussed below.
-
-
-
-
-
-
- frontend
-
-
-
-
- Ant Frontends. Different frontends may be plugged in by placing
-jars here.
-
-
-
-
-
-The directory a jar is in will control the visibility of the jar's classes and
-resources. This is closely related to the classloader hiearchy used by
-Mutant.
-
-Mutant supports the concept of Ant Libraries. These are collections of
-components (tasks and types) and their supporting classes packaged into a
-Jar. In Mutant each library has a globally unique identifier. This identifier
-uses the same conventions as Java package naming - i.e. a reverse DNS name.
-
-
The jar does not need to be exclusively for Ant. For example, it may be the
-jar for a tool which wishes to provide some Ant tasks for using the tool. It
-could be the main jar of an appication server that bundles Ant tasks for
-deployment. The jar does not even need to be installed in Mutant's antlib
-directory - Mutant can be configured to look in jars in other locations for Ant
-Libraries.
-Whatever the jar contains and wherever it is located, Mutant looks for an XML
-based descriptor in the jar at META-INF/antlib.xml. This XML file describes the
-components in the jar that will be available to Mutant.
-
-As a user you generally won't need to worry about this decriptor. The library
-developer will have developed it to describe their library. Mutant uses the
-descriptor to understand what Ant related components the library provides.
-
-Library management in Mutant is split into two phases - a loading phase and an
-import phase. The loading phase is where Mutant loads the antlib.xml descriptor
-from the library. After loading, Mutant knows where the library is located and
-what components it provides. In general Mutant will not make the components
-available to build scripts automatically. A build script needs to notify Mutant
-what components it is using from each library. This is known as importing.
-
-
Mutant loads libraries from two locations within the Mutant directory
-structure when Mutant starts up - the lib/syslibs and lib/antlibs directories.
-The distinction between these two locations is explained in the configuration
-discussion below. All jars in these directories will be search for library
-descriptors. All libraries providing descriptors will be available for importing
-into builds
-
In addition to the automatically loaded libraries, it is possible to
-explicitly request additional libraries to be loaded using the
-<loadlib> task. Individual libraries may be loaded or a set
-of libraries loaded from a directory. Libraries may also be loaded from remote
-locations by specifying a URL. The loadlib task can request that all components
-in the loaded library also be imported at the time of loading. Examples of the
-loadlib task follow
-
-
-
-
-
-
-
-
-
-
- <!-- load a library from a specific file and import all components -->
- <loadlib file="/opt/tools/toollib.jar" importall="true"/>
-
- <!-- load all libraries from a directory -->
- <loadlib dir="/opt/appserver/lib/"/>
-
- <!-- load libraries from a remote server -->
- <loadlib url="http://jakarta.apache.org/ant/testtasks.jar"/>
-
-
-
-
-
-
-
-
-
-
-
-In general the loading of libraries from absolute locations would be a
-configuration task. These would be specified in the Mutant configuration file
-and would not be used in a build file. The loading of project libraries from
-relative locations may be something that you would see in a build file.
-
-Mutant is designed to allow tasks to be defined simply by dropping a jar in a
-directory or configuring Mutant to look in particular places for jars. This will
-allow tasks and types developed by many different developers to be used. With
-many developers developing tasks, however, inevitably some tasks will end up
-with the same name.
-
-
-This is very similar to the situation faced by Java with Java class names.
-Many Java classes have the same name. When a Java programmer uses a class they
-must import that class with an import statement. This tells the Java compiler
-which particular class is being referenced by the classname. Effectively the
-import statement creates a mapping from a name used in the Java source file and
-a class in the global package namespace.
-
-
-Mutant provides an import task to specify, in a manner similar to Java's import
-statement, which components are being used. When a component is imported the
-library is identified by its unique id. By default the component is imported
-into the frame using the name it is known by within the library. When this would
-conflict with a name that has already been imported, the import task allows the
-component to be given a new name, or alias, by which it will be referenced. It
-is also possible to import all the components in a library. The folowing example
-shows the various methods by which the import task can be used to import
-components.
-
-
-
-
-
-
-
-
-
-
-
- <!-- import the runtool task from the com.foo.tools library -->
- <import libraryId="com.foo.tools" name="runtool"/>
-
- <!-- import the runtool task from the com.bar.tools library and
- alias it since the runtool is already defined -->
- <import libraryId="com.bar.tools" name="runtool" alias="runbartool"/>
-
- <!-- import all of the tasks from the com.fubar.tools library -->
- <import libraryId="com.fubar.tools"/>
-
-
-
-
-
-
-
-
-
-
-
-By using library identifiers, import operations are not tied to a particular
-library location. The separation of the loading and importing into separate
-phases allows environment-dependent locations to be specified as configuration
-information and location independent importing to be specified in the build
-file. This is similar to the case of Java imports. Java classes are imported by
-their global name without needing to known where the classfile is that contains
-that class. That information is provided externally in the CLASSPATH variable.
-
-Many libraries will have dependencies on external jars. For example, a task
-might make use of regular-expression libraries such as jakarta-regexp or a task
-may provide a wrapper around some external tool. In these cases the task will
-usually need to have the required classes available in the classloader from
-which the task itself was loaded. It is possible to avoid these direct
-dependencies using techniques such as reflection and explicitly loading the
-required classes through additional classloaders but the code is often harder to
-write and understand.
-
-
It is not always possible or desirable to bundle the required classes in the
-task's jar nor is it desirable that the system classpath contains the required
-classes. In fact it is often preferable to run Mutant with an empty classpath.
-Buildfiles which do not assume that the system classpath contains particular
-classes are generally more portable. Mutant provides a task,
-<libpath>, to allow additional paths to be assodicated with a
-library. As with the loadlib task, the libpath task may be used to associate a
-single file, all jars in a directory or remote jars with a library.
The above example associates all the jars in
-/home/conor/jakarta-ant/lib/optional/ with the library whose unique id is
-ant.ant1compat. A path must be associated with a library before any components
-are imported from the library. Mutant associates the paths with the library and
-at the time a component is requested from the library, Mutant will form the
-classloader that will be used. The additional paths are added to the definition
-of the classloader. Once a component is loaded, further paths will not have any
-effect. For this reason, and since the additonal paths are likely to be absolute
-paths, the <libpath> task is normally used in Mutant's
-configuration phase.
-Mutant will automatically import all components of any library whose unique
-identifier begins with "ant." when the ;library is loaded. This is
-mainly a convenience to provide a minimum set of tasks with which to construct
-build files.
-
The include mechanism can be used to include a complete project file or as
-shown in the example, a fragment. When including a project, any attributes on
-the included <project> element are ignored and the contents
-of the project inserted into the including project. In all cases the included
-files must be a well formed XML file containing a root element.
-
-
-
-
-
-
-
-
-
-
-
-
-
This area of Mutant is subject to change.
-
-
At present include elements are processed at parse-time. As such they can
-only occur at the top-level of the build file. They cannot occur in a target.
-The use of the namespace to qualify the include element is intended to convey
-the fact that this is not part of the build structure.
-
-
An alternative approach would be to define include as a regular task. When an
-include is processed, the top-level tasks of the included project would be
-executed immediately and the targets added to the current project
-structure.
-Mutant allows build file writers to reference properties and targets in other
-projects by creating a project reference. Project references are introduced
-using the ref task.
-
-
-
-
-
-
-
-
-
-
-
- <!-- create a reference to the main build -->
- <ref project="main.xml" name="main"/>
-
- <ref project="test.xml" name="test">
- <property name=build.dir" value="build/test"/>
- </ref>
-
-
-
-
-
-
-
-
-
-
-
-The above example creates two project references - one to the build in main.xml
-and one to the build in test.xml. When a reference is created, it must be given
-a label. This label will be used to refer to items within the referenced
-project (see below). Note that the ref task is a regular task and the reference
-is only created when the ref task is executed. A ref task may be placed at the
-top level of a build to effectively create static references. Alternatively a
-reference may be created dynamically by putting the ref task in a target.
-
-The label given to a project reference is used when accessing items within the
-project. So, to access the build.dir property in the project referenced by the
-main label, you would use main:build.dir. Similarly the compile target would be
-referred to as main:compile. Since the referenced projects may also create their
-own project references, labels may be concatenated to access items at arbitrary
-depths. For example, if main.xml referenced another project under the label
-"sub", a property debug could be referenced as main:sub:debug. The
-following example shows various items in the referenced project being used.
-
-
-
-
-
-
-
-
-
-
-
- <!-- Specify the build.dir in the main project prior to the reference
- being created -->
- <property name="main:build.dir" value="build/main"/>
-
- <!-- create the reference to the main build -->
- <ref project="main.xml" name="main"/>
-
- <!-- create the reference to the test build -->
- <ref project="test.xml" name="test">
- <property name="build.dir" value="build/test"/>
- </ref>
-
- <!-- our main target calls the fubar target in the main build -->
- <target name="main">
- <antcall target="main:fubar"/>
- </target>
-
- <!-- Our alt target depends on the fubar target in the main build -->
- <target name="alt" depends="main:fubar">
- <echo message="main's debug flag is ${main:debug}"/>
- </target>
-
-
-
-
-
-
-
-
-
-
-
-When a project is referenced, the top level tasks of the referenced project are
-run to allow the project to initialize itself. Mutant allows the referring
-build to set a property in a referenced project before the reference is
-created. When the reference is eventually created these properties are set
-before initialization occurs. In normal Ant fashion, these overriding
-properties take precedence. In particular properties in the referenced projects
-may be set from the command line as this example shows
-
-
-
-
-
-
-
-
-
-
-
- mutant -Dmain:build.dir=temp
-
-
-
-
-
-
-
-
-
-
-
-The example above shows a target in the referenced project being used as a
-dependency and also as a target in an antcall. Since refs are dynamic, Mutant
-will only evaluate such dependencies when required. If the alt target were
-never to be run, the dependency on main:fubar would never be checked.
-
-
-The import task allows components defined in a referenced project to be brought
-into the main build. For example, the following will bring the definition of
-tool from the test project in the build. The imported component may also be
-aliased to a new name.
-
-
-
-
-
-
-
-
-
-
-
- <!-- import a task definition from another project -->
- <import ref="test:tool"/>
-
-As discussed above Mutant provides a number of tasks to manage libraries and
-it is appropriate to run many of these tasks as part of a user or system-wide
-configuration rather than incorporating them into the build file. Mutant
-provides a configuration system to support running these tasks at an appropriate
-time. A Mutant configuration file looks as follows
-
-The antconfig element is the root element of the configuration file. It supports
-three attributes
-
-
-
-
-
- allow-unset-properties
-
-
-
-
- controls whether Mutant will fail a build which
-refers to a property which has not been set. This defaults to the Ant1 behaviour
-(true)
-
-
-
-
-
-
- allow-remote-library
-
-
-
-
- controls whether Mutant uses components defined in remote libraries
-
-
-
-
-
-
- allow-remote-project
-
-
-
-
- controls whether Mutant can run a project or reference a project which is
-located remotely.
-
-
-
-
-
-The configuration provides two collections of configuration tasks, global-tasks
-and project-tasks. Global-tasks are run once and are run in the context of the
-main project - i.e. the build file identified on the command line (defaults to
-build.xml/build.ant), whilst project-tasks are run as part of the initialization
-of every project including referenced projects and antcall projects. Looking at
-the above example, the global-tasks associate a path with the ant.ant1compat
-library while the per-project tasks import the antopt.monitor library into every
-project that Mutant processes.
-
-
-The tasks that can be run in the configuration phase are regular tasks but not
-all tasks are automatically available. This is the difference between the
-syslibs and antlibs directories. The global tasks are run after the syslibs
-libraries have been loaded but prior to the antlibs libraries being loaded. The
-syslibs library tasks are therefore available in the configuration phase. This
-arrangement is to allow the configuration tasks to setup library paths for the
-libraries contained in the antlibs directory, especially libraries in the Ant
-namespace which are automatically imported at the time they are loaded.
-
-
-If it is required to use tasks from libraries installed in the antlibs
-directory, the configuration tasks may explicitly load the library and import
-the required tasks. The following example shows the loading and use of the echo
-task in the configuration tasks. Note that the ant.home property has been set at
-the time the configuration tasks are started.
-
-When Mutant starts up it will load configurations from two locations - The file
-.ant/conf/antconfig.xml in the user's home directory and the file
-conf/antconfig.xml in the Mutant home directory. In addition, config files can
-be specified on the command line using a -config argument. This allows project
-specific configurations to be used.
-
-Mutant allows any task or datatype to be placed outside of a target. All such
-components are processed when the project is initialized and before any targets
-are processed. In fact Mutant does not require that a project contain any
-targets. In this case the only operations performed are the top level tasks at
-project initialization. The following shows a simple example
-
-
-
-
-
-
-
-
-
-
-
-<project>
- <echo message="Welcome to Mutant"/>
-</project>
-
-Normally when a task supports a nested element, Ant automatically determines the
-type of the nested element and creates an instance of this type. This instance is
-then configured and passed to the task. Mutant extends this scheme by allowing
-a build file writer to specify the type of nested element to use rather than
-relying on the core to determine it. Mutant will process attributes and further
-nested elements based on the specified type. For example:
-
-In this example the nested element is actually a classfileset which supports the
-<root> nested element. The actual type is specified using the notation from
-XML Schema. Mutant predclares the XML Schema namespace under the xsi prefix. You
-may explicitly declare this in the build file's XML and use a different prefix
-if you wish. For example, this is equivalent to the above
-
In Ant1, the default build file name is build.xml. In Mutant, the default
-build file is build.ant. If build.xnt cannot be found, Mutant will then look for
-build.xml. This allows you to support both Ant1 and Ant2 users. The build.xml
-file can contain an Ant1 build file. The build.ant file can include or reference
-this build and make use of Mutant's capabilities such as library management,
-library path settings, etc.
-
-This page describes the key goals that have shaped the development of
-Mutant.
-
-
-The first section identifies a set of issues with Ant1 that have cropped up as
-Ant1 has evolved. The design implications of each issue are then summarized as a
-Mutant requirement. I do not want to suggest that these problems are unsolvable
-within the Ant1 design. Already I believe we have seen the Ant2 proposals
-influencing people trying to extend Ant1. These issues may be solvable, although at
-the risk of backward compatability impacts or further complication of the Ant1
-codebase.
-
-
-The second section covers a set of additional requirements that have emerged as
-the whole concept of Ant2 has developed. Many of these came from the discussions
-on the Ant-Dev mailing list.
-
-
-The realisation of these requirements as they impact a user is on the
-next page. Th implications for task developers and
-Ant developers are discussed in the following sections.
-
-The interface between the Ant core and tasks is not controlled. It
-allows tasks almost complete access to the internal data structures of the
-core. This is poor encapsulation. Whilst most tasks do not need and do not
-use this access, its existence nonetheless prevents changes being made to
-the core without raising concerns about impacting backward compatability.
-
-
-The uncontrolled nature of the task-core interface also makes it difficult
-to reuse tasks and types in a different context without almost completely
-duplicating the Ant core
-
-
-
-
-
-
-
-
-
-
-
-
-
-A tightly defined interface between the core and the components (tasks and
-types) will allow the core implementation to be changed without the risk
-of impacting tasks. It will also allow components to be reused in other
-contexts.
-
-Ant1 does not provide strong support for embedding Ant in other systems,
-particularly a GUI or IDE. The development of Antidote highlighted this
-difficultly. Antidote was forced to perform its own XML parsing so it could
-build its own model of the build. There is no communication medium for a GUI to
-communicate with the core. Without this capability any GUI will be limited to
-simply editing the XML representation of the build.
-
-
-
-
-
-
-
-
-
-
-
-
-
-The definition of a project model, a Java-based object-model of a build
-description would decouple Ant from the XML representation. This allows
-other representations to be used. Such an object model also forms the basis
-for communications between systems which want to embed Ant. An IDE could
-manipulate this project object model directly and pass to the core for
-processing without needing to convert to and from an external
-representations such as XML.
-
-The original implementation of Ant1 performed all task configuration at the
-time the XML description of the build was parsed (parse-time). This approach
-could not handle dynamically created tasks very well since in some
-instances the type of the task to be configured was not known at parse-time.
-This limitation was overcome with the introduction of the UnknownElement and
-RuntimeConfigurable classes. While these work well, they are confusing and at
-times surprising to most Ant developers. Also some operations still occur at
-parse-time, notably creation of nested elements of known types. This could be
-overcome by going to a fully dynamic model but the fear of backward
-incompatability constrains this change from occuring.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Execution-time configuration of tasks allows for the latest information to be
-used for configuration. It is also necessary to support the concept of the
-project model. The project model cannot contain execution-time information as it
-does in Ant1
-
-
-
-The decoupling of the parsing and exection phases, communicating through the
-medium of the project model will allow the core to be modularized. The parsing
-and execution phases can be separated and one replaced without impacting the
-other.
-
-In Ant1, a task, once configured, may be used more than once - i.e. its
-execute method may be called more than once. This occurs when the Ant
-command line specifies the evaluation of two targets. If those targets have
-overlapping dependencies, the tasks in those overlapping dependencies will
-be executed twice. This arrangement requires task writers to preserve the
-state configured by Ant during the execution of the task so that the next
-execution has the correct configuration.
-
-
-Many task writers are not aware of this requirement. Frequently the task's
-state is changed during the execution method, which can lead to mysterious
-falures during subsequent executions. This need to preserve the configuration
-state makes writing tasks much harder.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Once a task is configured, it should be executed once. If the execution of
-multiple targets is required, a new task instance should be created and
-configured from the same project model. If reuse of task instances is desired
-each instance must be reinitialized and reconfigured before use.
-
-Ant1 has a set of well-known tasks (and types). A well-known task is one
-for which a mapping between the taskname and its implementing class is
-predefined in Ant. This mapping is provided by the two defaults.properties
-files in Ant's code. These well-known tasks do not need to be taskdef'd to
-make them available in a build file. Conversely tasks which are not in this
-list need to be explicitly taskdef'd.
-
-
-Note that this distinction is not the same as the core/optional
-distinction found in Ant1. An Ant1 core task is notionally supported by Ant
-without requiring any additional external libraries - it just requires the
-classes available in the 1.1 JDK, in Ant and in the libraries Ant uses such
-as the XML parser. An optional task is a task which requires JDK 1.2+
-features or the support of an external library, such as jakarta-regexp.
-
-
-The problem with this system is that there is no namespace management. If a
-new task is added to Ant, it may invalidate buildfiles which are already
-using that taskname via a taskdef. Actually the taskdef may continue to work or
-it may not - it will depend on the nested elements that the task definitions
-support (see above discussion of regarding cofiguration at parse-time)
-
-
-
-
-
-
-
-
-
-
-
-
-
-Tasks need to be deployed in libraries by either placing them in well known
-directories of an Ant install or by telling Ant where to look for them. Removing
-the central management of defined task names allows tasks libraries to be
-developed and maintained independently of Ant much more easily.
-
-
-
-Once centralised management of the task namespace is removed, there is,
-however, the possibility of name collision. A mechanism is required to allow a
-build file writer to select which particular tasks are assigned to which
-tasknames.
-
-In Ant1 certain tasks may appear outside of any target. This is implemented as a
-set of hardcoded conditions in the XML parsing phase. The execution and
-configuration of these tasks does not involve the use of RuntimeConfigurable and
-UnknownElement.
-
-
-This hardcoding is not very inituitive. It is confusing to users who do not
-know why only some tasks may be run outside of a target. Also as the list of
-tasks that may be useful as a top-level task grows, further special cases must
-be added to the code making the code harder to maintain.
-
-
-
-
-
-
-
-
-
-
-
-
-
-The number of special names should be kept to a minimum. Special cases should
-be avoided as they are not inituitive.
-
-Probably the greatest issue facing Ant1 today involves the management of the
-classpath and the associated visibility of classes. Most optional tasks in Ant1
-require the supporting classes for the task to be available on the system
-classpath. For example, the JUnit task is only usable if the JUnit jar is on
-the classpath. If it is not, Ant will complain about being unable to create the
-junit task.
-
-
-The usual solution when a user runs into this problem is to put the required jar
-into the ANT_HOME/lib directory. This just adds the required jar to the system
-classpath prior to starting Ant albeit without requiring the user to explicitly
-set the classpath.
-
-
-There are a number of issues with this approach. The classes on the
-classpath share the same classloader as Ant's classes and Ant's support
-libraries - particularly the XML parser. If a task wishes to use a specific XML
-parser, it may conflict with Ant's own parser. If two tasks require different
-versions of a supporting jar, these will conflict.
-
-
-Many tasks make use of factory objects (dynamic class instantiation, dynamic
-resource loading, etc). When the factory is in the system classpath it will not
-be able to load resources available in a taskdef'd task's custom classpath due
-to the delegating nature of classloaders. Such errors can be very confusing to
-users. More recent code is likely to attempt use of a context classloader but
-this is not set by Ant1 currently.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Do not require jars to be added to ANT_HOME/lib to enable tasks. Allow users to
-specify the location of support jars on a per-library basis.
-
-The earliest versions Ant1 did not explicitly support any datatypes. The only
-datatype, property, was actually created as a side-effect of running the
-<property> task. If it were to be implemented today, property
-would probably be known as a string datatype, perhaps associated with a
-<load-properties> task. This is also the reason property
-is one of those tasks which is allowed to exist outside of a target.
-
-
As Ant1 evolved new types such as <path> and
-<fileset> were added. The concept of datatypes has continued
-to evolve to the point where users can now define new datatypes. It would be
-expected that in addition to new types there will be many sub-types created,
-such as new types of fileset. Ant1, however, does not strongly support such type
-extensibility. When a subtype is created by extending an existing type, Ant1
-requires it to be either used by reference or all tasks which accept the base
-type need to be modified to support the new type. Use by reference is not always
-possible. It will depend on whether the base type has been coded to support
-references.
-
-
-
-
-
-
-
-
-
-
-
-
-Support polymorphic behaviour, allowing a build file to pass a subtype to a
-task which is defined to accept the base type. Allow task interfaces to be
-defined in terms of interfaces.
-
-
-
-Move reference processing to the core to make it more regular removing the
-burden of type developers to explicitly support references.
-
-In Ant1 the Project object takes on too many roles including all of the
-following:
-
-
-
Holds the project model built when parsing the build file
-
Holds the run-time state of the build through the properties and current
-task definitions
-
Provides context for task execution. All tasks have a reference to their
-project instance and use it to access core functions
-
Provides the implementation of common task operations
-
Build event management
-
Message logging
-
Global filter definitions
-
Java Version
-
Property replacement
-
Message Levels
-
Utility functions such as boolean conversion and path translation
-
Integration point for embedding Ant
-
-
As a class, Project is not cohesive. Reuse of the Ant core functionality is
-difficulty as all of these concerns bring in many other support classes.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Separate the various roles of Project into more cohesive classes.
-
-In addition to the issues which arise from Ant1 limitations, there are a number
-of requirements which have emerged in the mailing list discussions about Ant2.
-This isn't a complete list - just the ones I picked up for Mutant.
-
In Ant1 the only way to reuse build file definitions is to use the
-<ant> task. While useful, it is relatively coarse-grained. It
-can also be tedious if you are trying to extend an existing project definition -
-that is, adding new targets while retaining a user's ability to access the
-existing targets.
-
-In addition to the extension of projects, it should be possible to compose
-projects creating dependencies between the targets of the different projects,
-and to access the data and definitions of one project by a controlling project
-
-
-
-
-
-
-
-
-
-
-
-
-
-Allow a project to extend and control other projects
-
-While it has always been accepted that there will be come backward compatibility
-breaks in moving from Ant1 to Ant2, these should be minimized. If the changeover
-from Ant1 to Ant2 is difficult, it may never happen. On the other hand, the
-openness of the Ant1 interface means that some tasks will not work as expected -
-the most difficult being the <script> task.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Achieve a practical level of compatability without degrading the integrity of
-the core's interfaces. A practical level of compatability is intentionally a
-vague measure but it would require the majority of projects in Gump to be built
-without noticeable differences from Ant1
-
-In Ant1 configuration of Ant is achieved either through the execution of OS
-dependent scripts by the launcher scripts or though properties files which have
-the limited capability to set properties.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Provide an XML based configuration system with rich capabilities to configure
-the operation of Ant.
-
-In Ant1 there are many things which are common to a group of tasks but adding
-the capability to each task is repetitive and tedious. An example would be the
-failonerror attribute which controls whether a task will cause the build to stop
-when it fails. This started on just one task but has since been added to many
-other tasks as users want more fine control over when their builds stop. Aspects
-have been discussed as a mechanism for providing a single implementation of a
-concept or control that can then be applied to tasks independently.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Investigate the use of an Aspect approach to provide common functionality
-across tasks with a single implementation
-
-These pages describe the design and implementation of Mutant.
-
-
-For some time, there has been the concept of Ant 2.0. a rearchitecting of
-Ant designed to address the shortcomings in the design of Ant 1.x, while
-drawing the experience gained in that development. This rearchitecting
-would most likely be accompanied by at least some break in backward
-compatability. Over time Ant 2.0 has come to be known as Ant2 and the current
-Ant codebase is generally known as Ant1.
-
-
-Mutant is my proposal, a revolution, for Ant2. Actually, I consider it more
-an evolution of the design and implementation used for Ant1, but in Jakarta
-parlance, being a separate codebase, it is termed a revolution.
-
-
-There is no special significance in the name Mutant. I chose it because, as
-a word, it is an extension of the word Ant and it also signifies a change
-from the previous generation
-
-Mutant is not the only proposed revolution for Ant2. Peter Donald has
-developed another known as
-Myrmidon
-which presents a different view of how Ant2 could be realized. Other
-people hold the view that Ant1 can continue to evolve and that there
-is no need for rearchitecture of its codebase. I recommend you
-investigate all these points of view.
-
-
-As I write this, no decision has been taken as to which codebase will be
-adopted for Ant2. It may not be Mutant and it could even be some entirely
-new proposal. These pages do not compare and contrast Mutant with these
-other proposals or points of view, at least not explicitly. They are just
-intended to describe how Mutant is designed and implemented and why it is the
-way it is.
-
-Mutant is not even an alpha release. While it is relatively stable, it is
-subject to change. There are no backward compatability guarantees for any of
-the classes, interfaces, build files, configuration, launch scripts, etc that
-Mutant provides.
-
-
-
In particular, some features in Mutant are experimental and may not, in the
-long run, prove to be worthwhile.
-
-
-
-
-
-
-
-
-
-
-
-
-
-Start now by looking at the key requirements which have
-shaped the design of Mutant.
-
-These pages describe the design and implementation of mutant.
-
-
-For some time, there has been the concept of Ant 2.0. a rearchitecting of
-Ant designed to address the shortcomings in the design of Ant 1.x while
-drawing the experience gained in that development. This rearchitecting
-would most likely be accompanied by at least some break in backward
-compatability. Indeed this fact was recognized by Duncan, the original
-author of Ant when he proposed his AntEater revolution. Over time Ant 2.0
-has come to be known as Ant2 and the current Ant codebase is generally
-known as Ant1.
-
-
-Mutant is my proposal, a revolution, for Ant2. Actually, I consider it more
-an evolution of the design and implementation used for Ant1, but in Jakarta
-parlance, being a separate codebase, it is termed a revolution.
-
-
-There is no special significance in the name mutant. I chose it because, as
-a word, it is an extension of the word ant and it also signifies a change
-from the previos generation
-
-Mutant is not the only proposed revolution for Ant2. Peter Donald, another
-Ant committer, has developed another proposal known as Myrmidon, which you
-should also investigate if you are interested in a different view of how
-Ant2 should be realized. Other people hold the view that there is no need
-for any rearchitecting and the Ant1 codebase can continue to evolve.
-
-
-As I write this, no decision has been taken as to which codebase will be
-adopted for Ant2. It may not be mutant or it could be some entirely new
-proposal. This document does not compare and contrast mutant with these
-other proposals or points of view, at least not explicitly. It is just
-intended to describe and highlight how mutant is designed and implemented.
-
-
-
-
-
-
-
-
diff --git a/proposal/mutant/lib/ant1compat/readme.txt b/proposal/mutant/lib/ant1compat/readme.txt
deleted file mode 100644
index a0f3eff2b..000000000
--- a/proposal/mutant/lib/ant1compat/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Libraries required to build ant1 components go here
diff --git a/proposal/mutant/lib/antlib/script/readme.txt b/proposal/mutant/lib/antlib/script/readme.txt
deleted file mode 100644
index 3e289ee54..000000000
--- a/proposal/mutant/lib/antlib/script/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Please any jars in here which should be used when building the script antlib
diff --git a/proposal/mutant/lib/parser/xercesImpl.jar b/proposal/mutant/lib/parser/xercesImpl.jar
deleted file mode 100644
index a9c247ec4..000000000
Binary files a/proposal/mutant/lib/parser/xercesImpl.jar and /dev/null differ
diff --git a/proposal/mutant/lib/parser/xml-apis.jar b/proposal/mutant/lib/parser/xml-apis.jar
deleted file mode 100644
index 8331d27f1..000000000
Binary files a/proposal/mutant/lib/parser/xml-apis.jar and /dev/null differ
diff --git a/proposal/mutant/src/conf/ant.policy b/proposal/mutant/src/conf/ant.policy
deleted file mode 100644
index f5208cdc2..000000000
--- a/proposal/mutant/src/conf/ant.policy
+++ /dev/null
@@ -1,49 +0,0 @@
-// Mutant Policy File
-//
-// Copyright (c) 2002 The Apache Software Foundation.
-// All rights reserved.
-
-// Need to explicitly grant to java.home to pick up tools.jar classes
-grant codeBase "file:${java.home}/../lib/tools.jar" {
- permission java.security.AllPermission;
-};
-
-// full access is granted to the core
-grant codeBase "file:${ant.home}/lib/core/-" {
- permission java.security.AllPermission;
-};
-
-// grant full access to the command line front end.
-// All operations can be controlled by setting the appropriate
-// permissions on the front end. This will also affect core
-// functions
-grant codeBase "file:${ant.home}/lib/frontend/cli.jar" {
- permission java.security.AllPermission;
-};
-
-// grant for the Ant1 compat jar. Other Ant libraries can be controlled
-// individually.
-grant codeBase "file:${ant.home}/lib/antlibs/ant1compat.jar" {
- permission java.security.AllPermission;
-
- // For backward compatibility the Ant1 compatabilioty is granted full
- // permission. This can be reduced as desired to eliminate the ability to
- // access the network.
- //
- // For example, the following permissions are required to build Mutant. Additional
- // permissions are required depending on what tasks you want to enable.
-// permission java.io.FilePermission "<>", "read, write, execute, delete";
-// permission java.lang.RuntimePermission "accessDeclaredMembers";
-// permission java.lang.RuntimePermission "createClassLoader";
-// permission java.lang.RuntimePermission "getClassLoader";
-// permission java.util.PropertyPermission "java.class.path", "read, write";
-// permission java.util.PropertyPermission "java.home", "read";
-// permission java.util.PropertyPermission "user.dir", "read";
-// permission java.util.PropertyPermission "user.name", "read";
-// permission java.util.PropertyPermission "sun.*", "read";
-// permission java.util.PropertyPermission "java.*", "read";
-// permission java.util.PropertyPermission "javac.*", "read";
-// permission java.util.PropertyPermission "line.separator", "write";
-// permission java.lang.RuntimePermission "accessClassInPackage.sun.*";
-};
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibDefinition.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibDefinition.java
deleted file mode 100755
index b85d8152f..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibDefinition.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.antlib;
-
-/**
- * This class represents a definition in an AntLibrary.
- *
- * @author Conor MacNeill
- * @created 19 January 2002
- */
-public class AntLibDefinition {
- /** The type of element being defined int his definition */
- private int definitionType;
- /** The default name for the defintion */
- private String definitionName;
- /** The classname associated with the object */
- private String definitionClassName;
-
- /**
- * Create a definition
- *
- * @param definitionName the default name of this definition when it is
- * imported
- * @param definitionClassName the name of the class which is being
- * defined
- * @param definitionType the type of the definition (taskdef, typedef,
- * etc)
- */
- public AntLibDefinition(int definitionType, String definitionName,
- String definitionClassName) {
- this.definitionName = definitionName;
- this.definitionType = definitionType;
- this.definitionClassName = definitionClassName;
- }
-
- /**
- * Get the type of this definition
- *
- * @return the definition type
- * @see AntLibrary for values
- */
- public int getDefinitionType() {
- return definitionType;
- }
-
- /**
- * Get the default name for this definition
- *
- * @return the default name for this definition
- */
- public String getDefinitionName() {
- return definitionName;
- }
-
- /**
- * Get the classname being defined
- *
- * @return the classname of this definition
- */
- public String getClassName() {
- return definitionClassName;
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibException.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibException.java
deleted file mode 100644
index b42eab7e7..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibException.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.antlib;
-
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.Location;
-
-/**
- * An AntLibException indicates a problem in an ant library
- *
- * @author Conor MacNeill
- */
-public class AntLibException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public AntLibException(String msg) {
- super(msg);
- }
-
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public AntLibException(String msg, Location location) {
- super(msg, location);
- }
-
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public AntLibException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public AntLibException(String msg, Throwable cause, Location location) {
- super(msg, cause, location);
- }
-
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public AntLibException(Throwable cause) {
- super(cause);
- }
-
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public AntLibException(Throwable cause, Location location) {
- super(cause, location);
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibHandler.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibHandler.java
deleted file mode 100755
index f9db97230..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibHandler.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.antlib;
-import org.apache.ant.antcore.xml.ElementHandler;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-/**
- * XML Element Handler for Ant library definitions
- *
- * @author Conor MacNeill
- * @created 13 January 2002
- */
-public class AntLibHandler extends ElementHandler {
- /** The library identifier attribute name */
- public static final String LIBID_ATTR = "libid";
- /** The home attribute name */
- public static final String HOME_ATTR = "home";
- /**
- * The name of the attribute which indicates if Ant's XML parser is to
- * be made available
- */
- public static final String REQXML_ATTR = "reqxml";
- /** The extends attribute name */
- public static final String EXTENDS_ATTR = "extends";
- /** The name of the attribute which indicates tools jar is required */
- public static final String REQTOOLS_ATTR = "reqtools";
- /** The extends attribute name */
- public static final String ISOLATED_ATTR = "isolated";
-
-
- /** The list of allowed Attributes */
- public static final String[] ALLOWED_ATTRIBUTES
- = {LIBID_ATTR, HOME_ATTR, REQXML_ATTR, REQTOOLS_ATTR,
- EXTENDS_ATTR, ISOLATED_ATTR};
-
- /** The Ant Library definition being parsed. */
- private AntLibrarySpec antLibrarySpec;
-
- /**
- * Gets the parsed antLibrary specification
- *
- * @return the parsed antLibrary
- */
- public AntLibrarySpec getAntLibrarySpec() {
- return antLibrarySpec;
- }
-
- /**
- * Process the antlib element
- *
- * @param elementName the name of the element
- * @exception SAXParseException if there is a problem parsing the
- * element
- */
- public void processElement(String elementName)
- throws SAXParseException {
- antLibrarySpec = new AntLibrarySpec();
-
- if (getAttribute(LIBID_ATTR) == null) {
- throw new SAXParseException("antlib must have an libid sttribute",
- getLocator());
- }
- antLibrarySpec.setLibraryId(getAttribute(LIBID_ATTR));
- antLibrarySpec.setHome(getAttribute(HOME_ATTR));
- antLibrarySpec.setExtendsLibraryId(getAttribute(EXTENDS_ATTR));
- antLibrarySpec.setIsolated(getBooleanAttribute(ISOLATED_ATTR));
- antLibrarySpec.setAntXML(getBooleanAttribute(REQXML_ATTR));
- antLibrarySpec.setToolsJarRequired(getBooleanAttribute(REQTOOLS_ATTR));
- }
-
- /**
- * Start a new element in the antlibrary.
- *
- * @param uri The Namespace URI.
- * @param localName The local name (without prefix).
- * @param qualifiedName The qualified name (with prefix)
- * @param attributes The attributes attached to the element.
- * @throws SAXParseException if there is a parsing problem.
- */
- protected void addNestedElement(String uri, String localName,
- String qualifiedName, Attributes attributes)
- throws SAXParseException {
- try {
- if (qualifiedName.equals("taskdef")
- || qualifiedName.equals("typedef")) {
- DefinitionHandler defnHandler
- = new DefinitionHandler(qualifiedName);
- defnHandler.start(getParseContext(), getXMLReader(),
- this, getLocator(), attributes, getElementSource(),
- qualifiedName);
- antLibrarySpec.addDefinition(defnHandler.getDefinitionType(),
- defnHandler.getName(), defnHandler.getClassName());
- } else if (qualifiedName.equals("converter")) {
- ClassNameHandler converterHandler = new ClassNameHandler();
- converterHandler.start(getParseContext(), getXMLReader(),
- this, getLocator(), attributes, getElementSource(),
- qualifiedName);
- antLibrarySpec.addConverter(converterHandler.getClassName());
- } else if (qualifiedName.equals("aspect")) {
- ClassNameHandler aspectHandler = new ClassNameHandler();
- aspectHandler.start(getParseContext(), getXMLReader(),
- this, getLocator(), attributes, getElementSource(),
- qualifiedName);
- antLibrarySpec.addAspect(aspectHandler.getClassName());
- } else if (qualifiedName.equals("factory")) {
- ClassNameHandler factoryHandler
- = new ClassNameHandler();
- factoryHandler.start(getParseContext(), getXMLReader(),
- this, getLocator(), attributes, getElementSource(),
- qualifiedName);
- String factoryClass = factoryHandler.getClassName();
- antLibrarySpec.setFactory(factoryClass);
- } else {
- super.startElement(uri, localName, qualifiedName, attributes);
- }
- } catch (AntLibException e) {
- throw new SAXParseException(e.getMessage(), getLocator(), e);
- }
- }
-
- /**
- * Validate that the given attribute and value are valid.
- *
- * @param attributeName The name of the attributes
- * @param attributeValue The value of the attributes
- * @exception SAXParseException if the attribute is not allowed on the
- * element.
- */
- protected void validateAttribute(String attributeName,
- String attributeValue)
- throws SAXParseException {
- for (int i = 0; i < ALLOWED_ATTRIBUTES.length; ++i) {
- if (attributeName.equals(ALLOWED_ATTRIBUTES[i])) {
- return;
- }
- }
- throwInvalidAttribute(attributeName);
- }
-
-
-}
-
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibManager.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibManager.java
deleted file mode 100644
index 949a30c9d..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibManager.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.antlib;
-import java.io.FileNotFoundException;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.ant.antcore.xml.ParseContext;
-import org.apache.ant.antcore.xml.XMLParseException;
-import org.apache.ant.common.util.CircularDependencyChecker;
-import org.apache.ant.common.util.CircularDependencyException;
-import org.apache.ant.init.AntEnvironment;
-import org.apache.ant.init.LoaderUtils;
-
-/**
- * This class manages Ant Libraries. This class forms a global
- * repository of loaded libraries so that only one copy of a library is
- * used across all frames.
- *
- * @author Conor MacNeill
- * @created 29 January 2002
- */
-public class AntLibManager {
- /**
- * These are AntLibraries which have been loaded into the system
- */
- private Map antLibraries = new HashMap();
-
- /** The list of extensions which are examined for ant libraries */
- public static final String[] ANTLIB_EXTENSIONS
- = new String[]{".tsk", ".jar", ".zip"};
-
- /** Flag which indicates whether non-file URLS are used */
- private boolean remoteAllowed;
-
- /** The Ant initialization config - location of vital components */
- private AntEnvironment antEnv;
-
- /**
- * This map stores a list of additional paths for each library indexed by
- * the libraryId
- */
- private Map libPathsMap = new HashMap();
-
- /**
- * Constructor for the AntLibManager object
- *
- * @param antEnv the init config of the system.
- * @param remoteAllowed true if remote libraries can be used and
- * configured
- */
- public AntLibManager(AntEnvironment antEnv, boolean remoteAllowed) {
- this.remoteAllowed = remoteAllowed;
- this.antEnv = antEnv;
- }
-
- /**
- * Add all the Ant libraries that can be found at the given URL
- *
- * @param librarySpecs A map to which additional library specifications
- * are added.
- * @param libURL the URL from which Ant libraries are to be loaded
- * @exception AntLibException if the library specs cannot be parsed
- */
- public void addAntLibraries(Map librarySpecs, URL libURL)
- throws AntLibException {
- try {
- URL[] libURLs = LoaderUtils.getLocationURLs(libURL,
- libURL.toString(), ANTLIB_EXTENSIONS);
-
- if (libURLs == null) {
- return;
- }
-
- // parse each task library to get its library definition
- for (int i = 0; i < libURLs.length; ++i) {
- URL antLibraryURL = new URL("jar:" + libURLs[i]
- + "!/META-INF/antlib.xml");
- try {
- AntLibrarySpec antLibrarySpec
- = parseLibraryDef(antLibraryURL);
- if (antLibrarySpec != null) {
- String libraryId = antLibrarySpec.getLibraryId();
- if (librarySpecs.containsKey(libraryId)) {
- AntLibrarySpec currentSpec
- = (AntLibrarySpec) librarySpecs.get(libraryId);
- throw new AntLibException("Found more than one "
- + "copy of library with id = " + libraryId
- + " (" + libURLs[i] + ") + existing library "
- + "at (" + currentSpec.getLibraryURL() + ")");
- }
- antLibrarySpec.setLibraryURL(libURLs[i]);
- librarySpecs.put(libraryId, antLibrarySpec);
- }
- } catch (XMLParseException e) {
- Throwable t = e.getCause();
- // ignore file not found exceptions - means the
- // jar does not provide META-INF/antlib.xml
- if (t instanceof AntLibException) {
- throw (AntLibException) t;
- } else if (!(t instanceof FileNotFoundException)) {
- throw new AntLibException("Unable to parse Ant "
- + "library " + libURLs[i], e);
- }
- }
- }
- } catch (MalformedURLException e) {
- throw new AntLibException("Unable to load libraries from "
- + libURL, e);
- }
- }
-
- /**
- * Configures the Ant Libraries. Configuration of an Ant Library
- * involves resolving any dependencies between libraries and then
- * creating the class loaders for the library
- *
- * @param librarySpecs the loaded specifications of the Ant libraries
- * @return A map of the newly configured libraries
- * @exception AntLibException if a library cannot be configured from
- * the given specification
- */
- private Map configLibraries(Map librarySpecs)
- throws AntLibException {
-
- // check if any already defined
- for (Iterator i = librarySpecs.keySet().iterator(); i.hasNext();) {
- String libraryId = (String) i.next();
- if (antLibraries.containsKey(libraryId)) {
- AntLibrary currentVersion = getLibrary(libraryId);
- // same location?
- AntLibrarySpec spec
- = (AntLibrarySpec) librarySpecs.get(libraryId);
- URL specURL = spec.getLibraryURL();
- if (!specURL.equals(currentVersion.getDefinitionURL())) {
- throw new AntLibException("Ant Library \"" + libraryId
- + "\" is already loaded from "
- + currentVersion.getDefinitionURL()
- + " new version found at "
- + specURL);
- }
- }
- }
-
- Map newLibraries = new HashMap();
- CircularDependencyChecker configuring
- = new CircularDependencyChecker("configuring Ant libraries");
- for (Iterator i = librarySpecs.keySet().iterator(); i.hasNext();) {
- String libraryId = (String) i.next();
- if (!antLibraries.containsKey(libraryId)) {
- configLibrary(librarySpecs, libraryId,
- configuring, newLibraries);
- }
- }
-
- return newLibraries;
- }
-
- /**
- * Load either a set of libraries or a single library.
- *
- * @param libLocationURL URL where libraries can be found
- * @exception AntLibException if the libraries cannot be loaded
- *
- * @return a map containing the newly loaded libraries indexed by their
- * library ids.
- */
- public Map loadLibs(URL libLocationURL)
- throws AntLibException {
- if (!libLocationURL.getProtocol().equals("file")
- && !remoteAllowed) {
- throw new AntLibException("The config library "
- + "location \"" + libLocationURL
- + "\" cannot be used because config does "
- + "not allow remote libraries");
- }
-
- Map librarySpecs = new HashMap();
- addAntLibraries(librarySpecs, libLocationURL);
- Map newLibraries = configLibraries(librarySpecs);
-
- antLibraries.putAll(newLibraries);
- return newLibraries;
- }
-
- /**
- * Add a library path to the given library
- *
- * @param libraryId the id of the library to which the path is to be added
- * @param libPath the path to be added
- * @exception AntLibException if remote paths are not allowed by
- * configuration
- */
- public void addLibPath(String libraryId, URL libPath)
- throws AntLibException {
- if (!libPath.getProtocol().equals("file")
- && !remoteAllowed) {
- throw new AntLibException("Remote libpaths are not"
- + " allowed: " + libPath);
- }
-
- List libPaths = (List) libPathsMap.get(libraryId);
- if (libPaths == null) {
- libPaths = new ArrayList();
- libPathsMap.put(libraryId, libPaths);
- }
-
- List newPaths = new ArrayList();
- newPaths.add(libPath);
- if (libPath.getProtocol().equals("file")) {
- File dir = new File(libPath.getFile());
- if (dir.isDirectory()) {
- try {
- URL[] pathURLs = LoaderUtils.getLocationURLs(libPath,
- null, ANTLIB_EXTENSIONS);
- for (int i = 0; i < pathURLs.length; ++i) {
- newPaths.add(pathURLs[i]);
- }
- } catch (MalformedURLException e) {
- // ignore and just use what we were given
- }
- }
- }
-
- AntLibrary antLibrary = getLibrary(libraryId);
- for (Iterator i = newPaths.iterator(); i.hasNext();) {
- URL newPath = (URL) i.next();
- libPaths.add(newPath);
- if (antLibrary != null) {
- antLibrary.addLibraryURL(newPath);
- }
- }
- }
-
- /**
- * Configure a library from a specification and the Ant init config.
- *
- * @param librarySpecs the library specs from which this library is to
- * be configured.
- * @param libraryId the global identifier for the library
- * @param configuring A circualr dependency chcker for library
- * dependencies.
- * @param newLibraries the new libraries being configured.
- * @exception AntLibException if the library cannot be configured.
- */
- private void configLibrary(Map librarySpecs, String libraryId,
- CircularDependencyChecker configuring,
- Map newLibraries)
- throws AntLibException {
-
- try {
- configuring.visitNode(libraryId);
-
- AntLibrarySpec librarySpec
- = (AntLibrarySpec) librarySpecs.get(libraryId);
- String extendsId = librarySpec.getExtendsLibraryId();
- if (extendsId != null) {
- if (!antLibraries.containsKey(extendsId) &&
- !newLibraries.containsKey(extendsId)) {
- if (!librarySpecs.containsKey(extendsId)) {
- throw new AntLibException("Could not find library, "
- + extendsId + ", upon which library "
- + libraryId + " depends");
- }
- configLibrary(librarySpecs, extendsId,
- configuring, newLibraries);
- }
- }
-
- // now create the library for the specification
- AntLibrary antLibrary = new AntLibrary(librarySpec);
-
- // determine the URLs required for this task. These are the
- // task URL itself, the XML parser URLs if required, the
- // tools jar URL if required
- List urlsList = new ArrayList();
-
- if (librarySpec.getLibraryURL() != null) {
- urlsList.add(librarySpec.getLibraryURL());
- }
- if (librarySpec.isToolsJarRequired()
- && antEnv.getToolsJarURL() != null) {
- urlsList.add(antEnv.getToolsJarURL());
- }
-
- if (librarySpec.usesAntXML()) {
- URL[] parserURLs = antEnv.getParserURLs();
- for (int i = 0; i < parserURLs.length; ++i) {
- urlsList.add(parserURLs[i]);
- }
- }
-
- for (Iterator i = urlsList.iterator(); i.hasNext();) {
- antLibrary.addLibraryURL((URL) i.next());
- }
- if (extendsId != null) {
- AntLibrary extendsLibrary = getLibrary(extendsId);
- if (extendsLibrary == null) {
- extendsLibrary = (AntLibrary) newLibraries.get(extendsId);
- }
-
- antLibrary.setExtendsLibrary(extendsLibrary);
- }
- antLibrary.setParentLoader(antEnv.getCommonLoader());
- newLibraries.put(libraryId, antLibrary);
-
- if (libPathsMap != null) {
- List libPaths = (List) libPathsMap.get(libraryId);
- if (libPaths != null) {
- for (Iterator j = libPaths.iterator(); j.hasNext();) {
- URL pathURL = (URL) j.next();
- antLibrary.addLibraryURL(pathURL);
- }
- }
- }
- configuring.leaveNode(libraryId);
- } catch (CircularDependencyException e) {
- throw new AntLibException(e);
- }
- }
-
-
- /**
- * Read an Ant library definition from a URL
- *
- * @param antlibURL the URL of the library definition
- * @return the AntLibrary specification read from the library XML
- * definition
- * @exception XMLParseException if the library cannot be parsed
- */
- private AntLibrarySpec parseLibraryDef(URL antlibURL)
- throws XMLParseException {
- ParseContext context = new ParseContext();
- AntLibHandler libHandler = new AntLibHandler();
-
- context.parse(antlibURL, "antlib", libHandler);
-
- return libHandler.getAntLibrarySpec();
- }
-
-
- /**
- * Get a loaded library by its id.
- *
- * @param libraryId the library's global id
- *
- * @return the requested library or null if it has not been loaded
- */
- public AntLibrary getLibrary(String libraryId) {
- return (AntLibrary) antLibraries.get(libraryId);
- }
-
- /**
- * Get all the library ids of the currently loaded libraries.
- *
- * @return an iterator over the library identifier strings.
- */
- public Iterator getLibraryIds() {
- return antLibraries.keySet().iterator();
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibrary.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibrary.java
deleted file mode 100755
index cf9aafc07..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibrary.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.antlib;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.AntLibFactory;
-import org.apache.ant.common.util.AntException;
-
-/**
- * This class represents the Ant library.
- *
- * @author Conor MacNeill
- * @created 14 January 2002
- */
-public class AntLibrary implements ComponentLibrary {
- /**
- * This is the globally unique name of this library. It uses the same
- * conventions as the Java package space - i.e. reverse order DNS names
- * This name is used when importing tasks from this library
- */
- private String libraryId;
-
- /** THe URL of the antlib.xml library spec which defines this library */
- private URL definitionURL;
-
- /**
- * The URLs to use when contructing a classloader for the components in
- * this library.
- */
- private List libraryURLs = new ArrayList();
-
- /** The list of converter classnames defined in this library */
- private List converterClassNames = new ArrayList();
-
- /** The list of aspect classnames defined in this library */
- private List aspectClassNames = new ArrayList();
-
- /** The class name of this library's factory class, if any */
- private String factoryClassName;
-
- /** The parent classloader to use when contructing classloaders */
- private ClassLoader parentLoader;
-
- /** The library which this library extends, if any */
- private AntLibrary extendsLibrary;
-
- /** Indicates if each Task Instance should use its own classloader */
- private boolean isolated = false;
-
- /** The classloader for this library if it can be reused */
- private ClassLoader loader = null;
-
- /** The definitions in the library */
- private Map definitions = null;
-
- /**
- * Constructor for the AntLibrary object
- *
- * @param spec the specification from which this library is created.
- */
- public AntLibrary(AntLibrarySpec spec) {
- this.libraryId = spec.getLibraryId();
- this.definitions = spec.getDefinitions();
- this.isolated = spec.isIsolated();
- this.converterClassNames.addAll(spec.getConverters());
- this.aspectClassNames.addAll(spec.getAspects());
- this.factoryClassName = spec.getFactory();
- this.definitionURL = spec.getLibraryURL();
- }
-
- /**
- * Sets the Library which this library extends
- *
- * @param extendsLibrary The new ExtendsLibrary value
- */
- public void setExtendsLibrary(AntLibrary extendsLibrary) {
- this.extendsLibrary = extendsLibrary;
- }
-
- /**
- * Sets the ParentLoader of the AntLibrary
- *
- * @param parentLoader The new ParentLoader value
- */
- public void setParentLoader(ClassLoader parentLoader) {
- this.parentLoader = parentLoader;
- }
-
- /**
- * Gets the libraryId of the AntLibrary
- *
- * @return the libraryId value
- */
- public String getLibraryId() {
- return libraryId;
- }
-
- /**
- * Gets the ClassLoader of the AntLibrary
- *
- * @return The ClassLoader value
- */
- public ClassLoader getClassLoader() {
- if (isolated) {
- return createLoader();
- } else if (loader == null) {
- loader = createLoader();
- }
- return loader;
- }
-
- /**
- * Gets the definitions (taskdefs and typedefs) of the AntLibrary
- *
- * @return an iterator over the definition names
- */
- public Iterator getDefinitionNames() {
- return definitions.keySet().iterator();
- }
-
- /**
- * Get the definition of a particular component
- *
- * @param definitionName the name of the component within the library
- * @return an AntLibDefinition instance with information about the
- * component's definition
- */
- public AntLibDefinition getDefinition(String definitionName) {
- return (AntLibDefinition) definitions.get(definitionName);
- }
-
- /**
- * Gets the converter class names of the AntLibrary
- *
- * @return an iterator over a list of String class names
- */
- public Iterator getConverterClassNames() {
- return converterClassNames.iterator();
- }
-
- /**
- * Gets the aspect class names of the AntLibrary
- *
- * @return an iterator over a list of String class names
- */
- public Iterator getAspectClassNames() {
- return aspectClassNames.iterator();
- }
-
- /**
- * Get the URL to where the library was loaded from
- *
- * @return the library's URL
- */
- public URL getDefinitionURL() {
- return definitionURL;
- }
-
-
- /**
- * Gat an instance of a factory object for creating objects in this
- * library.
- *
- * @param context the context to use for the factory creation if
- * required
- * @return an instance of the factory, or null if this library does not
- * support a factory
- * @exception AntException if the factory cannot be created
- */
- public AntLibFactory getFactory(AntContext context)
- throws AntException {
- try {
- AntLibFactory libFactory = null;
- if (factoryClassName != null) {
- Class factoryClass = Class.forName(factoryClassName,
- true, getClassLoader());
- libFactory
- = (AntLibFactory) factoryClass.newInstance();
- libFactory.init(context);
- }
- return libFactory;
- } catch (ClassNotFoundException e) {
- throw new AntLibException("Unable to create factory "
- + factoryClassName + " for the \"" + libraryId
- + "\" Ant library", e);
- } catch (NoClassDefFoundError e) {
- throw new AntLibException("Could not load a dependent class ("
- + e.getMessage() + ") to create the factory "
- + factoryClassName + " for the \"" + libraryId
- + "\" Ant library", e);
- } catch (InstantiationException e) {
- throw new AntLibException("Unable to instantiate factory "
- + factoryClassName + " for the \"" + libraryId
- + "\" Ant library", e);
- } catch (IllegalAccessException e) {
- throw new AntLibException("Unable to access factory "
- + factoryClassName + " for the \"" + libraryId
- + "\" Ant library", e);
- }
- }
-
- /**
- * Indicate whether this library has any converters defined
- *
- * @return true if any converters have been defined
- */
- public boolean hasConverters() {
- return !converterClassNames.isEmpty();
- }
-
- /**
- * Indicate whether this library has any aspects defined
- *
- * @return true if any aspects have been defined
- */
- public boolean hasAspects() {
- return !aspectClassNames.isEmpty();
- }
-
- /**
- * Add a library to path to this AntLibrary definition
- *
- * @param libraryURL the URL to the library to be added
- */
- public void addLibraryURL(URL libraryURL) {
- libraryURLs.add(libraryURL);
- }
-
-
- /**
- * Create classloader which can be used to load the classes of this ant
- * library
- *
- * @return the classloader for this ant library
- */
- private ClassLoader createLoader() {
- ClassLoader ourParent
- = extendsLibrary == null ? parentLoader
- : extendsLibrary.getClassLoader();
- return new URLClassLoader((URL[]) libraryURLs.toArray(new URL[0]),
- ourParent);
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibrarySpec.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibrarySpec.java
deleted file mode 100755
index bd4d051c2..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/AntLibrarySpec.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.antlib;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * This class represents the specification of an Ant library. It is merely
- * the internal representation of the antlib XML definition. An instance of
- * this class is used to contruct an AntLibrary instance.
- *
- * @author Conor MacNeill
- * @created 13 January 2002
- */
-public class AntLibrarySpec {
- /**
- * This is the globally unique name of this library. It uses the same
- * conventions as the Java package space - i.e. reverse order DNS names
- * This name is used when importing tasks from this library
- */
- private String libraryId;
-
- /**
- * This string identifies the location where the library is maintained.
- * It is usually a URL to the location from which the library may be
- * downloaded or purchased
- */
- private String libraryHome;
-
- /** The list of converter classnames defined in this library */
- private List converterClassNames = new ArrayList();
-
- /** The list of aspect classnames defined in this library */
- private List aspectClassNames = new ArrayList();
-
- /** The name of the factory class for this library */
- private String factoryClassName;
-
- /**
- * This is the optional id of another Ant library upon which this
- * library depends.
- */
- private String extendsLibraryId;
-
- /** This is the URL from which this library has been loaded */
- private URL libraryURL;
-
- /** This is the list of definitions */
- private Map definitions = new HashMap();
-
- /** Indicates if each Task Instance should use its own classloader */
- private boolean isolated = false;
-
- /** Flag which indicates if tools.jar is required */
- private boolean toolsJarRequired = false;
-
- /**
- * This flag indicates that this task processes XML and wishes to use
- * the XML parser packaged with Ant
- */
- private boolean requiresAntXMLParser = false;
-
- /**
- * Set the library that this library extends, if any
- *
- * @param extendsLibraryId The new ExtendsLibraryId value
- */
- public void setExtendsLibraryId(String extendsLibraryId) {
- this.extendsLibraryId = extendsLibraryId;
- }
-
- /**
- * Sets the name of the factory class of the AntLibrarySpec
- *
- * @param className the new factory classname
- */
- public void setFactory(String className) {
- this.factoryClassName = className;
- }
-
- /**
- * Indicate that this library requires a separate classloader per task
- * instance
- *
- * @param isolated The new Isolated value
- */
- public void setIsolated(boolean isolated) {
- this.isolated = isolated;
- }
-
- /**
- * Sets the home of the AntLibrary
- *
- * @param home The new home value
- */
- public void setHome(String home) {
- this.libraryHome = libraryHome;
- }
-
- /**
- * Sets the libraryId of the AntLibrary
- *
- * @param libraryId The new libraryId value
- */
- public void setLibraryId(String libraryId) {
- this.libraryId = libraryId;
- }
-
-
- /**
- * Indicate that this library uses the Sun tools.jar
- *
- * @param toolsJarRequired The new ToolsJarRequired value
- */
- public void setToolsJarRequired(boolean toolsJarRequired) {
- this.toolsJarRequired = toolsJarRequired;
- }
-
- /**
- * Sets the libraryURL of the AntLibrary
- *
- * @param libraryURL The new libraryURL value
- */
- public void setLibraryURL(URL libraryURL) {
- this.libraryURL = libraryURL;
- }
-
- /**
- * Indicates that this library uses Ant's XML parser libraries
- *
- * @param requiresAntXMLParser true if this library uses Ant's XML
- * parser libraries
- */
- public void setAntXML(boolean requiresAntXMLParser) {
- this.requiresAntXMLParser = requiresAntXMLParser;
- }
-
- /**
- * Get the list of converter classnames defined in this library spec
- *
- * @return the converter classnames list
- */
- public List getConverters() {
- return converterClassNames;
- }
-
-
- /**
- * Get the list of aspect classnames defined in this library spec
- *
- * @return the aspect classnames list
- */
- public List getAspects() {
- return aspectClassNames;
- }
-
- /**
- * Gets the factory classname of the AntLibrarySpec
- *
- * @return the factory classname
- */
- public String getFactory() {
- return factoryClassName;
- }
-
- /**
- * Indicate whether this AntLibrary requires the Sun tools.jar
- *
- * @return The ToolsJarRequired value
- */
- public boolean isToolsJarRequired() {
- return toolsJarRequired;
- }
-
- /**
- * Get the id of the library that this library extends if any.
- *
- * @return The ExtendsLibraryId value
- */
- public String getExtendsLibraryId() {
- return extendsLibraryId;
- }
-
- /**
- * Indicate if this library required an classloader per instance
- *
- * @return true if a separate classloader should be used per instance.
- */
- public boolean isIsolated() {
- return isolated;
- }
-
-
- /**
- * Gets the libraryId of the AntLibrary
- *
- * @return The libraryId value
- */
- public String getLibraryId() {
- return libraryId;
- }
-
- /**
- * Gets the libraryURL of the AntLibrary
- *
- * @return The libraryURL value
- */
- public URL getLibraryURL() {
- return libraryURL;
- }
-
-
- /**
- * Gets the definitions of the AntLibrarySpec
- *
- * @return the definitions map
- */
- public Map getDefinitions() {
- return definitions;
- }
-
- /**
- * Add a converter to this library spec
- *
- * @param className the name of the converter class
- */
- public void addConverter(String className) {
- converterClassNames.add(className);
- }
-
- /**
- * Add an aspect to this the library spec
- *
- * @param className the name of the aspect class
- */
- public void addAspect(String className) {
- aspectClassNames.add(className);
- }
-
- /**
- * Indicates if this library requires Ant's XML parser
- *
- * @return true if this library requires Ant's XML parser
- */
- public boolean usesAntXML() {
- return requiresAntXMLParser;
- }
-
- /**
- * Adds a definition to the Ant Library
- *
- * @param name the name of the library definition
- * @param classname the name of the class implementing the element
- * @param definitionTypeName the name of the definition type. This is
- * converted to its symbolic value
- * @exception AntLibException if the definition has already been defined
- */
- public void addDefinition(String definitionTypeName, String name,
- String classname)
- throws AntLibException {
- if (definitions.containsKey(name)) {
- throw new AntLibException("More than one definition "
- + "in library for " + name);
- }
- int definitionType = 0;
-
- if (definitionTypeName.equals("typedef")) {
- definitionType = AntLibrary.TYPEDEF;
- } else if (definitionTypeName.equals("taskdef")) {
- definitionType = AntLibrary.TASKDEF;
- } else {
- throw new AntLibException("Unknown type of definition "
- + definitionTypeName);
- }
- definitions.put(name,
- new AntLibDefinition(definitionType, name, classname));
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/ClassNameHandler.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/ClassNameHandler.java
deleted file mode 100644
index 0b32dad2f..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/ClassNameHandler.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.antlib;
-
-import org.apache.ant.antcore.xml.ElementHandler;
-import org.xml.sax.SAXParseException;
-
-/**
- * Handler for elements which specify a class
- *
- * @author Conor MacNeill
- */
-public class ClassNameHandler extends ElementHandler {
- /** The classname attribute name */
- public static final String CLASSNAME_ATTR = "classname";
-
- /**
- * Gets the className of the Converter
- *
- * @return the className value
- */
- public String getClassName() {
- return getAttribute(CLASSNAME_ATTR);
- }
-
- /**
- * Process the definition element
- *
- * @param elementName the name of the element
- * @exception SAXParseException if there is a problem parsing the
- * element
- */
- public void processElement(String elementName)
- throws SAXParseException {
- if (getClassName() == null) {
- throw new SAXParseException(CLASSNAME_ATTR + " must be "
- + "specified for a converter", getLocator());
- }
- }
-
- /**
- * Validate that the given attribute and value are valid.
- *
- * @param attributeName The name of the attributes
- * @param attributeValue The value of the attributes
- * @exception SAXParseException if the attribute is not allowed on the
- * element.
- */
- protected void validateAttribute(String attributeName,
- String attributeValue)
- throws SAXParseException {
- if (!attributeName.equals(CLASSNAME_ATTR)) {
- throwInvalidAttribute(attributeName);
- }
- }
-}
-
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/ComponentLibrary.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/ComponentLibrary.java
deleted file mode 100644
index 91b7a6b2c..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/ComponentLibrary.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.antlib;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.AntLibFactory;
-import org.apache.ant.common.util.AntException;
-
-/**
- * A Component Library supplies components to the Ant core.
- *
- * @author Conor MacNeill
- * @created 8 February 2002
- */
-public interface ComponentLibrary {
- /** constant indicating a taskdef definition */
- public static final int TASKDEF = 1;
- /** constant indicating a typedef definition */
- public static final int TYPEDEF = 2;
-
- /**
- * Gets the ClassLoader of the AntLibrary
- *
- * @return The ClassLoader value
- */
- ClassLoader getClassLoader();
-
- /**
- * Gat an instance of a factory object for creating objects in this
- * library.
- *
- * @param context the context to use for the factory creation if
- * required
- * @return an instance of the factory, or null if this library does not
- * support a factory
- * @exception AntException if the factory cannot be created
- */
- AntLibFactory getFactory(AntContext context) throws AntException;
-
- /**
- * Gets the libraryId of the AntLibrary
- *
- * @return the libraryId value
- */
- String getLibraryId();
-
- /**
- * Get the definition of a particular component
- *
- * @param definitionName the name of the component within the library
- * @return an AntLibDefinition instance with information about the
- * component's definition
- */
- AntLibDefinition getDefinition(String definitionName);
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/DefinitionHandler.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/DefinitionHandler.java
deleted file mode 100755
index bac2a56ab..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/DefinitionHandler.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.antlib;
-
-import org.apache.ant.antcore.xml.ElementHandler;
-import org.xml.sax.SAXParseException;
-
-/**
- * Handler for definition within an Ant Library
- *
- * @author Conor MacNeill
- * @created 13 January 2002
- */
-public class DefinitionHandler extends ElementHandler {
- /** The name attribute name */
- public static final String NAME_ATTR = "name";
-
- /** The classname attribute name */
- public static final String CLASSNAME_ATTR = "classname";
-
- /** the type of the definition */
- private String definitionType;
-
- /**
- * Create a definition handler to handle a specific type of definition
- *
- * @param definitionType the type of the definition being handled
- */
- public DefinitionHandler(String definitionType) {
- this.definitionType = definitionType;
- }
-
- /**
- * Get the type of definition being handled
- *
- * @return the type of the definition
- */
- public String getDefinitionType() {
- return definitionType;
- }
-
- /**
- * Gets the name of the TaskdefHandler
- *
- * @return the name value
- */
- public String getName() {
- return getAttribute(NAME_ATTR);
- }
-
- /**
- * Gets the className of the TaskdefHandler
- *
- * @return the className value
- */
- public String getClassName() {
- return getAttribute(CLASSNAME_ATTR);
- }
-
- /**
- * Process the definition element
- *
- * @param elementName the name of the element
- * @exception SAXParseException if there is a problem parsing the
- * element
- */
- public void processElement(String elementName)
- throws SAXParseException {
- if (getName() == null || getClassName() == null) {
- throw new SAXParseException("name and classname must be "
- + "specified for a " + definitionType, getLocator());
- }
- }
-
- /**
- * Validate that the given attribute and value are valid.
- *
- * @param attributeName The name of the attributes
- * @param attributeValue The value of the attributes
- * @exception SAXParseException if the attribute is not allowed on the
- * element.
- */
- protected void validateAttribute(String attributeName,
- String attributeValue)
- throws SAXParseException {
- if (!attributeName.equals(NAME_ATTR) &&
- !attributeName.equals(CLASSNAME_ATTR)) {
- throwInvalidAttribute(attributeName);
- }
- }
-}
-
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/DynamicLibrary.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/DynamicLibrary.java
deleted file mode 100644
index 4cc7f1f5c..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/antlib/DynamicLibrary.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.antlib;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.AntLibFactory;
-
-/**
- * A dynamic library is created at runtime to hold newly defined components.
- *
- * @author Conor MacNeill
- * @created 8 February 2002
- */
-public class DynamicLibrary implements ComponentLibrary {
- /** The name profix for naming dynamic libraries */
- public static final String DYNAMIC_LIB_PREFIX = "_internal";
- /** A static field used to uniquely name dynamic libraries */
- private static int dynamicIdCounter = 0;
-
- /**
- * the factory this dynamic library will use to create instances of its
- * components
- */
- private AntLibFactory factory;
- /**
- * the classloader that will be used to create new instances of the
- * library's components
- */
- private ClassLoader loader;
- /** the library's unique id */
- private String libraryId;
- /**
- * the component definitions of this library. This map contains
- * AntLibDefinition instances indexed on the definition names.
- */
- private Map definitions = new HashMap();
-
-
- /**
- * Constructor for the DynamicLibrary object
- *
- * @param factory the factory to use to create instances. May be null
- * @param loader the loader to use to load the instance classes
- */
- public DynamicLibrary(AntLibFactory factory, ClassLoader loader) {
- int dynamicId = 0;
- synchronized (DynamicLibrary.class) {
- dynamicId = dynamicIdCounter;
- dynamicIdCounter++;
- }
- this.libraryId = DYNAMIC_LIB_PREFIX + dynamicId;
- this.loader = loader;
- this.factory = factory;
- }
-
- /**
- * Gets the ClassLoader of the AntLibrary
- *
- * @return The ClassLoader value
- */
- public ClassLoader getClassLoader() {
- return loader;
- }
-
- /**
- * Gat an instance of a factory object for creating objects in this
- * library.
- *
- * @param context the context to use for the factory creation if
- * required
- * @return an instance of the factory, or null if this library does not
- * support a factory
- */
- public AntLibFactory getFactory(AntContext context) {
- return factory;
- }
-
- /**
- * Gets the libraryId of the AntLibrary
- *
- * @return the libraryId value
- */
- public String getLibraryId() {
- return libraryId;
- }
-
- /**
- * Get the definition of a particular component
- *
- * @param definitionName the name of the component within the library
- * @return an AntLibDefinition instance with information about the
- * component's definition
- */
- public AntLibDefinition getDefinition(String definitionName) {
- return (AntLibDefinition) definitions.get(definitionName);
- }
-
- /**
- * Add a new component definition to this library
- *
- * @param componentType the type of the component
- * @param componentName the name of the component
- * @param componentClassName the component's class
- */
- public void addComponent(int componentType, String componentName,
- String componentClassName) {
- AntLibDefinition newDefinition
- = new AntLibDefinition(componentType, componentName,
- componentClassName);
-
- definitions.put(componentName, newDefinition);
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/config/AntConfig.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/config/AntConfig.java
deleted file mode 100755
index 5d78e895c..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/config/AntConfig.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.config;
-import java.util.Iterator;
-import org.apache.ant.common.model.BuildElement;
-
-/**
- * An AntConfig is the java class representation of the antconfig.xml files
- * used to configure Ant.
- *
- * @author Conor MacNeill
- * @created 20 January 2002
- */
-public class AntConfig {
- /** Indicates if remote libraries may be used */
- private boolean remoteLibs = false;
-
- /** Indicates if remote projects may be used */
- private boolean remoteProjects = false;
-
- /** Indicates if unset properties are ignored */
- private boolean unsetProperties = true;
-
- /**
- * Global Configuration tasks. These are run only once.
- */
- private BuildElement globalTasks;
-
- /**
- * Frame tasks - these are run in each new frame.
- */
- private BuildElement frameTasks;
-
- /**
- * Indicate if unset properties are OK.
- *
- * @return true if unset properties will not cause an exception
- */
- public boolean isUnsetPropertiesAllowed() {
- return unsetProperties;
- }
-
- /**
- * Indicate if the use of remote library's is allowe dby this config.
- *
- * @return true if this config allows the use of remote libraries,
- */
- public boolean isRemoteLibAllowed() {
- return remoteLibs;
- }
-
- /**
- * Indicate if this config allows the execution of a remote project
- *
- * @return true if remote projects are allowed
- */
- public boolean isRemoteProjectAllowed() {
- return remoteProjects;
- }
-
- /**
- * Get the global configuration tasks
- *
- * @return an iterator over the set of config tasks.
- */
- public Iterator getGlobalTasks() {
- if (globalTasks == null) {
- return null;
- }
- return globalTasks.getNestedElements();
- }
-
- /**
- * Get the per-frame configuration tasks
- *
- * @return an iterator over the set of config tasks.
- */
- public Iterator getFrameTasks() {
- if (frameTasks == null) {
- return null;
- }
- return frameTasks.getNestedElements();
- }
-
- /**
- * Add a global config task.
- *
- * @param globalTasks a collection of tasks to be executed as part of
- * the configuration process.
- */
- public void addGlobalTasks(BuildElement globalTasks) {
- this.globalTasks = globalTasks;
- }
-
- /**
- * Add a per-frame config task.
- *
- * @param frameTasks a collection of tasks to be executed as part of the
- * setup of each new frame.
- */
- public void addFrameTasks(BuildElement frameTasks) {
- this.frameTasks = frameTasks;
- }
-
- /**
- * Allow remote libraries to be used
- *
- * @param allowRemoteLibs true if remote libraries may be used.
- */
- public void allowRemoteLibs(boolean allowRemoteLibs) {
- this.remoteLibs = allowRemoteLibs;
- }
-
- /**
- * Allow remote projects to be used
- *
- * @param allowRemoteProjects true if remote projects may be executed.
- */
- public void allowRemoteProjects(boolean allowRemoteProjects) {
- this.remoteProjects = allowRemoteProjects;
- }
-
- /**
- * Allow properties to be used even when they have not been set
- *
- * @param allowUnsetProperties true if un set properties should not
- * cause an exception
- */
- public void allowUnsetProperties(boolean allowUnsetProperties) {
- this.unsetProperties = allowUnsetProperties;
- }
-
- /**
- * Merge in another configuration. The configuration being merged in
- * takes precedence
- *
- * @param otherConfig the other AntConfig to be merged.
- */
- public void merge(AntConfig otherConfig) {
- remoteLibs = otherConfig.remoteLibs;
- remoteProjects = otherConfig.remoteProjects;
- unsetProperties = otherConfig.unsetProperties;
- globalTasks = combineTasks(globalTasks, otherConfig.globalTasks);
- frameTasks = combineTasks(frameTasks, otherConfig.frameTasks);
- }
-
- /**
- * Combine two task collections
- *
- * @param lhs the lefthand collection
- * @param rhs the right hand collection
- *
- * @return the combined collection of tasks
- */
- private BuildElement combineTasks(BuildElement lhs, BuildElement rhs) {
- if (rhs == null) {
- return lhs;
- }
-
- if (lhs == null) {
- return rhs;
- }
-
- for (Iterator i = rhs.getNestedElements(); i.hasNext();) {
- lhs.addNestedElement((BuildElement) i.next());
- }
-
- return lhs;
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/config/AntConfigHandler.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/config/AntConfigHandler.java
deleted file mode 100755
index 6b3bb9859..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/config/AntConfigHandler.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.config;
-import org.apache.ant.antcore.xml.ElementHandler;
-import org.apache.ant.antcore.modelparser.BuildElementHandler;
-import org.apache.ant.common.model.BuildElement;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-/**
- * XML Element Handler for Ant config files
- *
- * @author Conor MacNeill
- * @created 20 January 2002
- */
-public class AntConfigHandler extends ElementHandler {
- /** The allowRemoteProject attribute name */
- public static final String REMOTE_PROJECT_ATTR = "allow-remote-project";
-
- /** The allowRemoteLibrary attribute name */
- public static final String REMOTE_LIBRARY_ATTR = "allow-remote-library";
-
- /** The allowReportProject attribute name */
- public static final String UNSET_PROPS_ATTR = "allow-unset-properties";
-
- /** The global tasks element */
- public static final String GLOBAL_TASKS_ELEMENT = "global-tasks";
-
- /** The per-frame tasks element */
- public static final String PERFRAME_TASKS_ELEMENT = "project-tasks";
-
- /** The list of allowed Attributes */
- public static final String[] ALLOWED_ATTRIBUTES
- = {REMOTE_PROJECT_ATTR, REMOTE_LIBRARY_ATTR, UNSET_PROPS_ATTR};
- /**
- * The config object which is contructed from the XML representation of
- * the config
- */
- private AntConfig config;
-
- /**
- * Get the Ant Config read in by this handler
- *
- * @return the AntConfig instance
- */
- public AntConfig getAntConfig() {
- return config;
- }
-
- /**
- * Process the antlib element
- *
- * @param elementName the name of the element
- * @exception SAXParseException if there is a problem parsing the
- * element
- */
- public void processElement(String elementName)
- throws SAXParseException {
- config = new AntConfig();
- config.allowRemoteLibs(getBooleanAttribute(REMOTE_LIBRARY_ATTR));
- config.allowRemoteProjects(getBooleanAttribute(REMOTE_PROJECT_ATTR));
- boolean allowUnsetProperties = true;
- if (getAttribute(UNSET_PROPS_ATTR) != null) {
- allowUnsetProperties = getBooleanAttribute(UNSET_PROPS_ATTR);
- }
- config.allowUnsetProperties(allowUnsetProperties);
- }
-
- /**
- * Start a new element in the ant config.
- *
- * @param uri The Namespace URI.
- * @param localName The local name (without prefix).
- * @param qualifiedName The qualified name (with prefix)
- * @param attributes The attributes attached to the element.
- * @throws SAXParseException if there is a parsing problem.
- */
- protected void addNestedElement(String uri, String localName,
- String qualifiedName, Attributes attributes)
- throws SAXParseException {
-
- // configs support two task collections as elements
- BuildElementHandler buildElementHandler = new BuildElementHandler();
- buildElementHandler.start(getParseContext(), getXMLReader(),
- this, getLocator(), attributes, getElementSource(),
- qualifiedName);
- BuildElement element = buildElementHandler.getBuildElement();
- if (element.getType().equals(GLOBAL_TASKS_ELEMENT)) {
- config.addGlobalTasks(element);
- } else if (element.getType().equals(PERFRAME_TASKS_ELEMENT)) {
- config.addFrameTasks(element);
- } else {
- throw new SAXParseException(" does not support the <"
- + element.getType() + "> element", getLocator());
- }
- }
-
- /**
- * Validate that the given attribute and value are valid.
- *
- * @param attributeName The name of the attributes
- * @param attributeValue The value of the attributes
- * @exception SAXParseException if the attribute is not allowed on the
- * element.
- */
- protected void validateAttribute(String attributeName,
- String attributeValue)
- throws SAXParseException {
- for (int i = 0; i < ALLOWED_ATTRIBUTES.length; ++i) {
- if (attributeName.equals(ALLOWED_ATTRIBUTES[i])) {
- return;
- }
- }
- throwInvalidAttribute(attributeName);
- }
-}
-
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/AttributeSetter.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/AttributeSetter.java
deleted file mode 100644
index 370b7f053..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/AttributeSetter.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import org.apache.ant.common.antlib.Converter;
-import org.apache.ant.common.util.AntException;
-
-/**
- * AttributeSetters are created at introspection time for each
- * setter method a class provides and for which a conversion from a
- * String value is available.
- *
- * @author Conor MacNeill
- * @created 19 January 2002
- */
-public class AttributeSetter {
- /** The method that will perform the setting */
- private Method method;
-
- /**
- * A converter to convert the string value to a value to be given to
- * the setter method
- */
- private Converter converter;
-
- /**
- * A constructor used to create the string value to an object to be used
- * by the setter
- */
- private Constructor valueConstructor;
-
- /** The depth of the setter in the class hierarchy */
- private int depth;
-
- /**
- * Create a setter which just uses string values
- *
- * @param method the method to be invoked.
- * @param depth the depth of this method declaraion in the class hierarchy.
- */
- public AttributeSetter(Method method, int depth) {
- this.method = method;
- this.depth = depth;
- }
-
- /**
- * Create a setter which just uses string values
- *
- * @param method the method to be invoked.
- * @param depth the depth of this method declaraion in the class hierarchy.
- * @param converter a converter to convert string values into instances of
- * the type expected by the method.
- */
- public AttributeSetter(Method method, int depth, Converter converter) {
- this(method, depth);
- this.converter = converter;
- }
-
- /**
- * Create a setter which just uses string values
- *
- * @param method the method to be invoked.
- * @param depth the depth of this method declaraion in the class hierarchy.
- * @param valueConstructor an object constructor used to convert string
- * values into instances of the type expected by the method.
- */
- public AttributeSetter(Method method, int depth,
- Constructor valueConstructor) {
- this(method, depth);
- this.valueConstructor = valueConstructor;
- }
-
- /**
- * Set the attribute value on an object
- *
- * @param obj the object on which the set method is to be invoked
- * @param stringValue the string representation of the value
- * @exception InvocationTargetException if the method cannot be
- * invoked
- * @exception IllegalAccessException if the method cannot be invoked
- * @exception AntException if the conversion of the value
- * fails
- */
- void set(Object obj, String stringValue)
- throws InvocationTargetException, IllegalAccessException,
- AntException {
-
- Object value = null;
- if (converter != null) {
- Class type = getType();
- value = converter.convert(stringValue, type);
- } else if (valueConstructor != null) {
- try {
- value = valueConstructor.newInstance(new String[]{stringValue});
- } catch (InstantiationException e) {
- throw new ExecutionException(e);
- }
- } else {
- value = stringValue;
- }
-
- method.invoke(obj, new Object[]{value});
- }
-
- /**
- * Get the declaration depth of this setter.
- *
- * @return the attribute setter's declaration depth.
- */
- public int getDepth() {
- return depth;
- }
-
- /**
- * Get the type expected by this setter's method
- *
- * @return a Class instance being the type this setter's method accepts.
- */
- public Class getType() {
- return method.getParameterTypes()[0];
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/BuildEventSupport.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/BuildEventSupport.java
deleted file mode 100644
index a170324c7..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/BuildEventSupport.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import org.apache.ant.common.antlib.Task;
-import org.apache.ant.common.event.BuildEvent;
-import org.apache.ant.common.event.BuildListener;
-import org.apache.ant.common.model.ModelElement;
-import org.apache.ant.common.util.DemuxOutputReceiver;
-import org.apache.ant.common.event.MessageLevel;
-import org.apache.ant.common.util.AntException;
-
-/**
- * BuildEventSupport is used by classes which which to send build events to
- * the BuildListeners
- *
- * @author Conor MacNeill
- * @created 15 January 2002
- */
-public class BuildEventSupport implements DemuxOutputReceiver {
- /**
- * The listeners attached to the object which contains this support
- * object
- */
- private ArrayList listeners = new ArrayList();
-
- /** Records the latest task to be executed on a thread (Thread to Task). */
- private Map threadTasks = new HashMap();
-
- /**
- * Gets the listeners of the BuildEventSupport
- *
- * @return the listeners value
- */
- public List getListeners() {
- return (List) listeners.clone();
- }
-
- /**
- * Add a listener
- *
- * @param listener the listener to be added
- */
- public void addBuildListener(BuildListener listener) {
- listeners.add(listener);
- }
-
- /**
- * Remove a listener
- *
- * @param listener the listener to be removed
- */
- public void removeBuildListener(BuildListener listener) {
- listeners.remove(listener);
- }
-
- /**
- * Fire a build started event
- *
- * @param element the build element with which the event is associated
- */
- public void fireBuildStarted(ModelElement element) {
- BuildEvent event = new BuildEvent(element, BuildEvent.BUILD_STARTED);
- List listeners = getListeners();
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- BuildListener listener = (BuildListener) i.next();
- listener.buildStarted(event);
- }
- }
-
- /**
- * Fir a build finished event
- *
- * @param element the build element with which the event is associated
- * @param cause an exception if there was a failure in the build
- */
- public void fireBuildFinished(ModelElement element,
- Throwable cause) {
- BuildEvent event = new BuildEvent(element, BuildEvent.BUILD_FINISHED,
- cause);
- List listeners = getListeners();
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- BuildListener listener = (BuildListener) i.next();
- listener.buildFinished(event);
- }
- }
-
- /**
- * fire a target started event
- *
- * @param element the build element with which the event is associated
- */
- public void fireTargetStarted(ModelElement element) {
- BuildEvent event = new BuildEvent(element, BuildEvent.TARGET_STARTED);
- List listeners = getListeners();
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- BuildListener listener = (BuildListener) i.next();
- listener.targetStarted(event);
- }
- }
-
- /**
- * fire a target finished event
- *
- * @param element the build element with which the event is associated
- * @param cause an exception if there was a failure in the target's task
- */
- public void fireTargetFinished(ModelElement element,
- Throwable cause) {
- BuildEvent event = new BuildEvent(element, BuildEvent.TARGET_FINISHED,
- cause);
- List listeners = getListeners();
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- BuildListener listener = (BuildListener) i.next();
- listener.targetFinished(event);
- }
- }
-
- /**
- * fire a task started event
- *
- * @param task the task with which the event is associated
- */
- public void fireTaskStarted(Task task) {
- synchronized (this) {
- threadTasks.put(Thread.currentThread(), task);
- }
- BuildEvent event = new BuildEvent(task, BuildEvent.TASK_STARTED);
- List listeners = getListeners();
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- BuildListener listener = (BuildListener) i.next();
- listener.taskStarted(event);
- }
- }
-
- /**
- * fire a task finished event
- *
- * @param task the task with which the event is associated
- * @param cause an exception if there was a failure in the task
- */
- public void fireTaskFinished(Task task,
- Throwable cause) {
- System.out.flush();
- System.err.flush();
- synchronized (this) {
- threadTasks.remove(Thread.currentThread());
- }
- BuildEvent event = new BuildEvent(task, BuildEvent.TASK_FINISHED,
- cause);
- List listeners = getListeners();
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- BuildListener listener = (BuildListener) i.next();
- listener.taskFinished(event);
- }
- }
-
- /**
- * Send a message event
- *
- * @param source the build element with which the event is associated
- * @param message the message to be sent
- * @param priority the priority of the message
- */
- public void fireMessageLogged(Object source,
- String message, int priority) {
- BuildEvent event = new BuildEvent(source, message, priority);
- List listeners = getListeners();
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- BuildListener listener = (BuildListener) i.next();
- listener.messageLogged(event);
- }
- }
-
- /**
- * Demultiplexes output so that each task receives the appropriate
- * messages. If the current thread is not currently executing a task,
- * the message is logged directly.
- *
- * @param line Message to handle. Should not be null.
- * @param isError Whether the text represents an error (true
- * ) or information (false).
- */
- public void threadOutput(String line, boolean isError) {
- Task task = (Task) threadTasks.get(Thread.currentThread());
- if (task != null) {
- try {
- if (isError) {
- task.handleSystemErr(line);
- } else {
- task.handleSystemOut(line);
- }
- return;
- } catch (AntException e) {
- // ignore just log as a non-task message
- }
- }
- fireMessageLogged(this, line,
- isError ? MessageLevel.ERROR : MessageLevel.INFO);
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ClassIntrospector.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ClassIntrospector.java
deleted file mode 100755
index ee94a26d0..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ClassIntrospector.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * Introspects a class and builds a reflector for setting values on
- * instances of the class
- *
- * @author Conor MacNeill
- * @created 19 January 2002
- */
-public class ClassIntrospector {
- /** The reflector that this introspector populates */
- private Reflector reflector;
-
- /**
- * A Map which maps the classnames to their depth in the class hiearchy,
- * with the current class being depth=0
- */
- private Map classDepth = new HashMap();
-
- /**
- * Determine the class hierarchy depths for the given class.
- *
- * @param bean the class for which the class depths will be determined.
- */
- private void getDepths(Class bean) {
- Class currentClass = bean;
- int index = 0;
- while (currentClass != null) {
- classDepth.put(currentClass, new Integer(index++));
- currentClass = currentClass.getSuperclass();
- }
- }
-
-
- /**
- * Create a introspector for the bean
- *
- * @param bean the class which is introspected
- * @param converters a collection of converters for converting values
- * from strings
- */
- public ClassIntrospector(final Class bean, Map converters) {
- reflector = new Reflector();
- getDepths(bean);
-
- Method[] methods = bean.getMethods();
- for (int i = 0; i < methods.length; i++) {
- final Method m = methods[i];
- final String name = m.getName();
- Class returnType = m.getReturnType();
- Class[] args = m.getParameterTypes();
-
- if (name.equals("addText")
- && returnType.equals(Void.TYPE)
- && args.length == 1
- && args[0].equals(String.class)) {
- reflector.setAddTextMethod(m);
- } else if (name.startsWith("set")
- && name.length() > 3
- && returnType.equals(Void.TYPE)
- && args.length == 1
- && !args[0].isArray()) {
- Integer depth = (Integer) classDepth.get(m.getDeclaringClass());
- reflector.addAttributeMethod(m, depth.intValue(),
- getPropertyName(name, "set"), converters);
- } else if (name.startsWith("addConfigured")
- && name.length() > 13
- && returnType.equals(Void.TYPE)
- && args.length == 1
- && !args[0].equals(String.class)
- && !args[0].isArray()
- && !args[0].isPrimitive()) {
- reflector.addElementMethod(m,
- getPropertyName(name, "addConfigured"));
- } else if (name.startsWith("add")
- && name.length() > 3
- && returnType.equals(Void.TYPE)
- && args.length == 1
- && !args[0].equals(String.class)
- && !args[0].isArray()
- && !args[0].isPrimitive()) {
- reflector.addElementMethod(m, getPropertyName(name, "add"));
- } else if (name.startsWith("create")
- && name.length() > 6
- && !returnType.isArray()
- && !returnType.isPrimitive()
- && args.length == 0) {
- reflector.addCreateMethod(m, getPropertyName(name, "create"));
- }
- }
- }
-
- /**
- * Gets the reflector associed with the class we are introspecting
- *
- * @return the reflector
- */
- public Reflector getReflector() {
- return reflector;
- }
-
- /**
- * extract the name of a property from a method name - subtracting a
- * given prefix.
- *
- * @param methodName the name of the method
- * @param prefix the prefix to be ignored
- * @return the property name
- */
- private String getPropertyName(String methodName, String prefix) {
- int start = prefix.length();
- return methodName.substring(start).toLowerCase();
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ComponentManager.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ComponentManager.java
deleted file mode 100644
index b51c2a5db..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ComponentManager.java
+++ /dev/null
@@ -1,1048 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.apache.ant.antcore.antlib.AntLibDefinition;
-import org.apache.ant.antcore.antlib.AntLibManager;
-import org.apache.ant.antcore.antlib.AntLibrary;
-import org.apache.ant.antcore.antlib.ComponentLibrary;
-import org.apache.ant.antcore.antlib.DynamicLibrary;
-import org.apache.ant.antcore.config.AntConfig;
-import org.apache.ant.common.antlib.AntLibFactory;
-import org.apache.ant.common.antlib.Aspect;
-import org.apache.ant.common.antlib.Converter;
-import org.apache.ant.common.antlib.DeferredTask;
-import org.apache.ant.common.antlib.ExecutionComponent;
-import org.apache.ant.common.antlib.StandardLibFactory;
-import org.apache.ant.common.antlib.Task;
-import org.apache.ant.common.antlib.TaskContainer;
-import org.apache.ant.common.event.MessageLevel;
-import org.apache.ant.common.model.BuildElement;
-import org.apache.ant.common.service.ComponentService;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.Location;
-import org.apache.ant.init.LoaderUtils;
-import org.apache.ant.common.util.AttributeCollection;
-import org.apache.ant.common.constants.Namespace;
-
-/**
- * The instance of the ComponentServices made available by the core to the ant
- * libraries.
- *
- * @author Conor MacNeill
- * @created 27 January 2002
- */
-public class ComponentManager implements ComponentService {
-
- /**
- * Type converters for this frame. Converters are used when configuring
- * Tasks to handle special type conversions.
- */
- private Map converters = new HashMap();
-
- /** This is the set of libraries whose converters have been loaded */
- private Set loadedConverters = new HashSet();
-
- /** This is the set of libraries whose aspects have been loaded */
- private Set loadedAspects = new HashSet();
-
- /** The factory objects for each library, indexed by the library Id */
- private Map libFactories = new HashMap();
-
- /** The Frame this service instance is working for */
- private Frame frame;
-
- /** The library manager instance used to configure libraries. */
- private AntLibManager libManager;
-
- /**
- * This is the list of aspects which have been loaded from the various Ant
- * libraries
- */
- private List aspects = new ArrayList();
-
- /** dynamic libraries which have been defined */
- private Map dynamicLibraries;
-
- /** The definitions which have been imported into this frame. */
- private Map imports = new HashMap();
-
- /** Reflector objects used to configure Tasks from the Task models. */
- private Map setters = new HashMap();
-
-
- /**
- * Constructor
- *
- * @param frame the frame containing this context
- * @param libManager the library manager with the library definitions
- * which are shared across all component manager instances.
- * @exception ExecutionException if the loaded libraries could not be
- * imported.
- */
- protected ComponentManager(Frame frame, AntLibManager libManager)
- throws ExecutionException {
- this.frame = frame;
- AntConfig config = frame.getConfig();
- this.libManager = libManager;
- dynamicLibraries = new HashMap();
- }
-
- /**
- * Load a library or set of libraries from a location making them
- * available for use
- *
- * @param libLocation the file or URL of the library location
- * @param importAll if true all tasks are imported as the library is
- * loaded
- * @exception AntException if the library cannot be loaded
- */
- public void loadLib(URL libLocation, boolean importAll)
- throws AntException {
- Map newLibraries = libManager.loadLibs(libLocation);
- Iterator i = newLibraries.keySet().iterator();
- while (i.hasNext()) {
- String libraryId = (String) i.next();
- if (importAll) {
- importLibrary(libraryId);
- }
- }
- }
-
- /**
- * Examine all the libraries defined in the Library manager and import
- * those which are in the ant library namespace.
- *
- * @exception AntException if the standard components cannot be imported.
- */
- protected void importStandardComponents() throws AntException {
- for (Iterator i = libManager.getLibraryIds(); i.hasNext();) {
- String libraryId = (String) i.next();
- if (libraryId.startsWith(Constants.ANT_LIB_PREFIX)) {
- importLibrary(libraryId);
- }
- }
- }
-
- /**
- * Experimental - define a new task
- *
- * @param taskName the name by which this task will be referred
- * @param factory the library factory object to create the task instances
- * @param loader the class loader to use to create the particular tasks
- * @param className the name of the class implementing the task
- * @exception ExecutionException if the task cannot be defined
- */
- public void taskdef(AntLibFactory factory, ClassLoader loader,
- String taskName, String className)
- throws ExecutionException {
- defineComponent(factory, loader, ComponentLibrary.TASKDEF,
- taskName, className);
- }
-
- /**
- * Experimental - define a new type
- *
- * @param typeName the name by which this type will be referred
- * @param factory the library factory object to create the type instances
- * @param loader the class loader to use to create the particular types
- * @param className the name of the class implementing the type
- * @exception ExecutionException if the type cannot be defined
- */
- public void typedef(AntLibFactory factory, ClassLoader loader,
- String typeName, String className)
- throws ExecutionException {
- defineComponent(factory, loader, ComponentLibrary.TYPEDEF,
- typeName, className);
- }
-
- /**
- * Add a library path for the given library
- *
- * @param libraryId the unique id of the library for which an additional
- * path is being defined
- * @param libPath the library path (usually a jar)
- * @exception AntException if the path cannot be specified
- */
- public void addLibPath(String libraryId, URL libPath)
- throws AntException {
- libManager.addLibPath(libraryId, libPath);
- }
-
- /**
- * Import a complete library into the current execution frame
- *
- * @param libraryId The id of the library to be imported
- * @exception AntException if the library cannot be imported
- */
- public void importLibrary(String libraryId) throws AntException {
- AntLibrary library = libManager.getLibrary(libraryId);
- if (library == null) {
- throw new ExecutionException("Unable to import library " + libraryId
- + " as it has not been loaded");
- }
- for (Iterator i = library.getDefinitionNames(); i.hasNext();) {
- String defName = (String) i.next();
- importLibraryDef(library, defName, null);
- }
- addConverters(library);
- addAspects(library);
- }
-
- /**
- * Import a single component from a library, optionally aliasing it to a
- * new name
- *
- * @param libraryId the unique id of the library from which the component
- * is being imported
- * @param defName the name of the component within its library
- * @param alias the name under which this component will be used in the
- * build scripts. If this is null, the components default name is
- * used.
- * @exception AntException if the component cannot be imported
- */
- public void importComponent(String libraryId, String defName,
- String alias) throws AntException {
- AntLibrary library = libManager.getLibrary(libraryId);
- if (library == null) {
- throw new ExecutionException("Unable to import component from "
- + "library \"" + libraryId + "\" as it has not been loaded");
- }
- importLibraryDef(library, defName, alias);
- addConverters(library);
- addAspects(library);
- }
-
- /**
- * Imports a component defined in another frame.
- *
- * @param relativeName the qualified name of the component relative to
- * this execution frame
- * @param alias the name under which this component will be used in the
- * build scripts. If this is null, the components default name is
- * used.
- * @exception ExecutionException if the component cannot be imported
- */
- public void importFrameComponent(String relativeName, String alias)
- throws ExecutionException {
- ImportInfo definition
- = frame.getReferencedDefinition(relativeName);
-
- if (definition == null) {
- throw new ExecutionException("The reference \"relativeName\" does"
- + " not refer to a defined component");
- }
-
- String label = alias;
- if (label == null) {
- label = frame.getNameInFrame(relativeName);
- }
-
- frame.log("Adding referenced component <" + definition.getLocalName()
- + "> as <" + label + "> from library \""
- + definition.getComponentLibrary().getLibraryId() + "\", class: "
- + definition.getClassName(), MessageLevel.DEBUG);
- imports.put(label, definition);
- }
-
- /**
- * Create a component. The component will have a context but will not be
- * configured. It should be configured using the appropriate set methods
- * and then validated before being used.
- *
- * @param componentName the name of the component
- * @return the created component. The return type of this method depends
- * on the component type.
- * @exception AntException if the component cannot be created
- */
- public Object createComponent(String componentName)
- throws AntException {
- return createComponent(componentName, (BuildElement) null);
- }
-
- /**
- * Create a component given its libraryId and local name within the
- * library. This method is unambiguous in the face of imports, aliases and
- * taskdefs performed in the build.
- *
- * @param libraryId the component's library identifier.
- * @param localName the name component within the library.
- * @return the created component. The return type of this method depends
- * on the component type.
- * @exception AntException if the component cannot be created
- */
- public Object createComponent(String libraryId, String localName)
- throws AntException {
- AntLibrary library = libManager.getLibrary(libraryId);
- if (library == null) {
- throw new ExecutionException("No library with libraryId \""
- + libraryId + "\" is available");
- }
-
- AntLibDefinition libDefinition = library.getDefinition(localName);
- if (libDefinition == null) {
- throw new ExecutionException("No component with name \""
- + localName + "\" was found in library with libraryId \""
- + libraryId + "\"");
- }
- return createComponentFromDef(localName, library, libDefinition, null);
- }
-
- /**
- * Get the collection ov converters currently configured
- *
- * @return A map of converter instances indexed on the class they can
- * convert
- */
- protected Map getConverters() {
- return converters;
- }
-
- /**
- * Initialize a library.
- *
- * @param libraryId the library's identifier.
- *
- * @exception AntException if the library cannot be initalized.
- */
- protected void initializeLibrary(String libraryId)
- throws AntException {
- AntLibrary library = libManager.getLibrary(libraryId);
- if (library != null) {
- getLibFactory(library);
- }
- }
-
- /**
- * Get the collection of Ant Libraries defined for this frame Gets the
- * factory object for the given library
- *
- * @param componentLibrary the compnent library for which a factory objetc
- * is required
- * @return the library's factory object
- * @exception AntException if the factory cannot be created
- */
- protected AntLibFactory getLibFactory(ComponentLibrary componentLibrary)
- throws AntException {
- String libraryId = componentLibrary.getLibraryId();
- if (libFactories.containsKey(libraryId)) {
- return (AntLibFactory) libFactories.get(libraryId);
- }
- ExecutionContext context
- = new ExecutionContext(frame, null, null);
- AntLibFactory libFactory = componentLibrary.getFactory(context);
- if (libFactory == null) {
- libFactory = new StandardLibFactory();
- }
- libFactories.put(libraryId, libFactory);
- return libFactory;
- }
-
- /**
- * Set an attribute on an object.
- *
- * This method is useful for manipulating components without assuming
- * anything about the component's type. The context classloader should be
- * set to the component's loaded when calling this method.
- *
- * @param component the component on which to set the attribute
- * @param attributeName the attribute name
- * @param attributeValue the required value
- *
- * @exception AntException if the attribute cannot be set.
- */
- public void setAttribute(Object component, String attributeName,
- String attributeValue) throws AntException {
-
- Setter setter = getSetter(component.getClass());
- setter.setAttribute(component, attributeName,
- frame.replacePropertyRefs(attributeValue));
- }
-
- /**
- * Add a nested element to a component.
- *
- * This method is useful for manipulating components without assuming
- * anything about the component's type. The context classloader should be
- * set to the component's loaded when calling this method.
- *
- * @param component the component to which the nested element will be added.
- * @param nestedElementName the name of the nested element.
- * @param nestedElement the actual object to be added.
- *
- * @exception AntException if the nested element cannot be added.
- */
- public void addNestedElement(Object component, String nestedElementName,
- Object nestedElement) throws AntException {
- Setter setter = getSetter(component.getClass());
- setter.addElement(component, nestedElementName, nestedElement);
- }
- /**
- * Get an imported definition from the component manager
- *
- * @param name the name under which the component has been imported
- * @return the ImportInfo object detailing the import's library and other
- * details
- */
- protected ImportInfo getImport(String name) {
- return (ImportInfo) imports.get(name);
- }
-
- /**
- * Create a component from a build model
- *
- * @param model the build model representing the component and its
- * configuration
- * @return the configured component
- * @exception AntException if there is a problem creating or
- * configuring the component
- */
- public Object createComponent(BuildElement model)
- throws AntException {
- String componentName = model.getType();
- return createComponent(componentName, model);
- }
-
- /**
- * Create a component. This method creates a component and then configures
- * it from the given build model.
- *
- * @param componentName the name of the component which is used to select
- * the object type to be created
- * @param model the build model of the component. If this is null, the
- * component is created but not configured.
- * @return the configured component
- * @exception AntException if there is a problem creating or
- * configuring the component
- */
- private Object createComponent(String componentName, BuildElement model)
- throws AntException {
-
- ImportInfo importInfo = getImport(componentName);
- if (importInfo == null) {
- throw new ExecutionException("There is no definition of the <"
- + componentName + "> component");
- }
- String className = importInfo.getClassName();
-
- ComponentLibrary componentLibrary
- = importInfo.getComponentLibrary();
-
- return createComponentFromDef(componentName, componentLibrary,
- importInfo.getDefinition(), model);
- }
-
- /**
- * Create a component from its library definition.
- *
- * @param componentName The component's name in the global context
- * @param componentLibrary the library which provides the deifnition of
- * the component
- * @param libDefinition the component's definition
- * @param model the BuildElement model of the component's configuration.
- * @return the required component potentially wrapped in a wrapper object.
- * @exception AntException if the component cannot be created
- */
- private Object createComponentFromDef(String componentName,
- ComponentLibrary componentLibrary,
- AntLibDefinition libDefinition,
- BuildElement model)
- throws AntException {
-
- Location location = Location.UNKNOWN_LOCATION;
- String className = null;
- try {
- boolean isTask
- = libDefinition.getDefinitionType() == AntLibrary.TASKDEF;
-
- Object component = null;
- if (model != null) {
- location = model.getLocation();
- for (Iterator i = aspects.iterator(); i.hasNext();) {
- Aspect aspect = (Aspect) i.next();
- component = aspect.preCreateComponent(component, model);
- }
- }
-
- AntLibFactory libFactory = getLibFactory(componentLibrary);
- ClassLoader componentLoader = null;
- if (component == null) {
- String localName = libDefinition.getDefinitionName();
- className = libDefinition.getClassName();
- componentLoader = componentLibrary.getClassLoader();
- Class componentClass
- = Class.forName(className, true, componentLoader);
- // create the component using the factory
- component
- = libFactory.createComponent(componentClass, localName);
- } else {
- className = component.getClass().getName();
- componentLoader = component.getClass().getClassLoader();
- }
-
- // wrap the component in an adapter if required.
- ExecutionComponent execComponent = null;
- if (isTask) {
- if (component instanceof Task) {
- execComponent = (Task) component;
- } else {
- execComponent = new TaskAdapter(componentName, component);
- }
- } else if (component instanceof ExecutionComponent) {
- execComponent = (ExecutionComponent) component;
- }
-
- // set the context loader to that for the component
- ClassLoader currentLoader
- = LoaderUtils.setContextLoader(componentLoader);
-
- // if the component is an execution component create a context and
- // initialise the component with it.
- if (execComponent != null) {
- // give it a context unless it already has one
- if (execComponent.getAntContext() == null) {
- ExecutionContext context
- = new ExecutionContext(frame, execComponent, model);
- context.setClassLoader(componentLoader);
- execComponent.init(context, componentName);
- }
- }
-
- // if we have a model, use it to configure the component. Otherwise
- // the caller is expected to configure thre object
- if (model != null) {
- configureElement(libFactory, component, model);
- // if the component is an execution component and we have a
- // model, validate it
- if (execComponent != null) {
- execComponent.validateComponent();
- }
- for (Iterator i = aspects.iterator(); i.hasNext();) {
- Aspect aspect = (Aspect) i.next();
- component = aspect.postCreateComponent(component, model);
- }
- }
-
- // reset the loader
- LoaderUtils.setContextLoader(currentLoader);
-
- // if we have an execution component, potentially a wrapper,
- // return it otherwise the component directly
- if (execComponent != null) {
- return execComponent;
- } else {
- return component;
- }
- } catch (ClassNotFoundException e) {
- throw new ExecutionException("Class " + className
- + " for component <" + componentName + "> was not found", e,
- location);
- } catch (NoClassDefFoundError e) {
- throw new ExecutionException("Could not load a dependent class ("
- + e.getMessage() + ") for component " + componentName, e,
- location);
- } catch (InstantiationException e) {
- throw new ExecutionException("Unable to instantiate component "
- + "class " + className + " for component <"
- + componentName + ">", e, location);
- } catch (IllegalAccessException e) {
- throw new ExecutionException("Unable to access task class "
- + className + " for component <"
- + componentName + ">", e, location);
- } catch (ExecutionException e) {
- e.setLocation(location, false);
- throw e;
- }
- }
-
- /**
- * Import a single component from the given library
- *
- * @param library the library which provides the component
- * @param defName the name of the component in the library
- * @param alias the name to be used for the component in build files. If
- * this is null, the component's name within its library is used.
- */
- protected void importLibraryDef(ComponentLibrary library, String defName,
- String alias) {
- String label = alias;
- if (label == null) {
- label = defName;
- }
-
- AntLibDefinition libDef = library.getDefinition(defName);
- frame.log("Adding component <" + defName + "> as <" + label
- + "> from library \"" + library.getLibraryId() + "\", class: "
- + libDef.getClassName(), MessageLevel.DEBUG);
- imports.put(label, new ImportInfo(library, libDef));
- }
-
- /**
- * Gets the setter for the given class
- *
- * @param c the class for which the reflector is desired
- * @return the reflector
- */
- private Setter getSetter(Class c) {
- if (setters.containsKey(c)) {
- return (Setter) setters.get(c);
- }
- Setter setter = null;
- if (DeferredTask.class.isAssignableFrom(c)) {
- setter = new DeferredSetter();
- } else {
- ClassIntrospector introspector
- = new ClassIntrospector(c, getConverters());
- setter = introspector.getReflector();
- }
-
- setters.put(c, setter);
- return setter;
- }
-
- /**
- * Create an instance of a type given its required class
- *
- * @param typeClass the class from which the instance should be created
- * @param model the model describing the required configuration of the
- * instance
- * @param libFactory the factory object of the typeClass's Ant library
- * @param localName the name of the type within its Ant library
- * @return an instance of the given class appropriately configured
- * @exception AntException if there is a problem creating the type
- * instance
- */
- private Object createTypeInstance(Class typeClass, AntLibFactory libFactory,
- BuildElement model, String localName)
- throws AntException {
- try {
- Object typeInstance
- = libFactory.createComponent(typeClass, localName);
-
- if (typeInstance instanceof ExecutionComponent) {
- ExecutionComponent component
- = (ExecutionComponent) typeInstance;
- ExecutionContext context
- = new ExecutionContext(frame, component, model);
- component.init(context, localName);
- configureElement(libFactory, typeInstance, model);
- component.validateComponent();
- } else {
- configureElement(libFactory, typeInstance, model);
- }
- return typeInstance;
- } catch (InstantiationException e) {
- throw new ExecutionException("Unable to instantiate type class "
- + typeClass.getName() + " for type <" + model.getType() + ">",
- e, model.getLocation());
- } catch (IllegalAccessException e) {
- throw new ExecutionException("Unable to access type class "
- + typeClass.getName() + " for type <" + model.getType() + ">",
- e, model.getLocation());
- } catch (ExecutionException e) {
- e.setLocation(model.getLocation(), false);
- throw e;
- } catch (RuntimeException e) {
- throw new ExecutionException(e, model.getLocation());
- }
- }
-
- /**
- * Create and add a nested element
- *
- * @param setter The Setter instance for the container element
- * @param element the container element in which the nested element will
- * be created
- * @param model the model of the nested element
- * @param factory Ant Library factory associated with the element to which
- * the attribute is to be added.
- * @exception AntException if the nested element cannot be created
- */
- private void addNested(AntLibFactory factory, Setter setter,
- Object element, BuildElement model)
- throws AntException {
- String nestedElementName = model.getType();
- Class nestedType = setter.getType(nestedElementName);
-
- // is there a polymorph indicator - look in Ant aspects
- String typeName
- = model.getNamespaceAttributeValue(Namespace.XSI_URI, "type");
-
- Object typeInstance = null;
- if (typeName != null) {
- // the build file has specified the actual type of the element.
- // we need to look up that type and use it
- typeInstance = createComponent(typeName, model);
- } else if (nestedType != null) {
- // We need to create an instance of the class expected by the nested
- // element's adder method if that is possible
- if (nestedType.isInterface()) {
- throw new ExecutionException("No element can be created for "
- + "nested element <" + nestedElementName + ">. Please "
- + "provide a value by reference or specify the value type",
- model.getLocation());
- }
- typeInstance = createTypeInstance(nestedType, factory, model, null);
- } else {
- throw new ExecutionException("The type of the <"
- + nestedElementName + "> nested element is not known. "
- + "Please specify by the type using the \"xsi:type\" "
- + "attribute or provide a reference to another instance");
- }
-
- // is the typeInstance compatible with the type expected
- // by the element's add method
- if (!nestedType.isInstance(typeInstance)) {
- throw new ExecutionException("The type "
- + typeName + " is not compatible with the <"
- + nestedElementName + "> nested element", model.getLocation());
- }
- setter.addElement(element, nestedElementName, typeInstance);
- }
-
- /**
- * Create a nested element for the given object according to the model.
- *
- * @param setter the Setter instance of the container object
- * @param element the container object for which a nested element is
- * required.
- * @param model the build model for the nestd element
- * @param factory Ant Library factory associated with the element creating
- * the nested element
- * @exception AntException if the nested element cannot be created.
- */
- private void createNested(AntLibFactory factory, Setter setter,
- Object element, BuildElement model)
- throws AntException {
- String nestedElementName = model.getType();
- try {
- Object nestedElement
- = setter.createElement(element, nestedElementName);
- factory.registerCreatedElement(nestedElement);
- if (nestedElement instanceof ExecutionComponent) {
- ExecutionComponent component
- = (ExecutionComponent) nestedElement;
- ExecutionContext context
- = new ExecutionContext(frame, component, model);
- component.init(context, nestedElementName);
- configureElement(factory, nestedElement, model);
- component.validateComponent();
- } else {
- configureElement(factory, nestedElement, model);
- }
- } catch (ExecutionException e) {
- e.setLocation(model.getLocation(), false);
- throw e;
- } catch (RuntimeException e) {
- throw new ExecutionException(e, model.getLocation());
- }
- }
-
- /**
- * configure an object with attribtes from the given map
- *
- * @param object the object to be configured.
- * @param attributeValues a map containing named attribute values.
- * @param ignoreUnsupported if this is true, attribute names for which no
- * setter method exists are ignored.
- * @exception AntException if the object does not support an
- * attribute in the map.
- */
- public void configureAttributes(Object object,
- AttributeCollection attributeValues,
- boolean ignoreUnsupported)
- throws AntException {
- Setter setter = getSetter(object.getClass());
- for (Iterator i = attributeValues.getAttributeNames(); i.hasNext();) {
- String attributeName = (String) i.next();
- String attributeValue = attributeValues.getAttribute(attributeName);
- if (!setter.supportsAttribute(attributeName)) {
- if (!ignoreUnsupported) {
- throw new ExecutionException(object.getClass().getName()
- + " does not support the \"" + attributeName
- + "\" attribute");
- }
- } else {
- setter.setAttribute(object, attributeName,
- frame.replacePropertyRefs(attributeValue));
- }
- }
- }
-
- /**
- * Configure an element according to the given model.
- *
- * @param element the object to be configured
- * @param model the BuildElement describing the object in the build file
- * @param factory Ant Library factory associated with the element being
- * configured
- * @exception AntException if the element cannot be configured
- */
- private void configureElement(AntLibFactory factory, Object element,
- BuildElement model)
- throws AntException {
- Setter setter = getSetter(element.getClass());
- // do the nested elements
- for (Iterator i = model.getNestedElements(); i.hasNext();) {
- BuildElement nestedElementModel = (BuildElement) i.next();
- String nestedElementName = nestedElementModel.getType();
- ImportInfo info = getImport(nestedElementName);
- if (element instanceof TaskContainer
- && info != null
- && info.getDefinitionType() == AntLibrary.TASKDEF
- && !setter.supportsNestedElement(nestedElementName)) {
- // it is a nested task
- Task nestedTask
- = (Task) createComponent(nestedElementModel);
- TaskContainer container = (TaskContainer) element;
- container.addNestedTask(nestedTask);
- } else {
- if (setter.supportsNestedAdder(nestedElementName)) {
- addNested(factory, setter, element, nestedElementModel);
- } else if (setter.supportsNestedCreator(nestedElementName)) {
- createNested(factory, setter, element, nestedElementModel);
- } else {
- throw new ExecutionException("<" + model.getType() + ">"
- + " does not support the \"" + nestedElementName
- + "\" nested element",
- nestedElementModel.getLocation());
- }
- }
- }
-
- // Set the attributes of this element
- for (Iterator i = model.getAttributeNames(); i.hasNext();) {
- String attributeName = (String) i.next();
- String attributeValue = model.getAttributeValue(attributeName);
- if (!setter.supportsAttribute(attributeName)) {
- throw new ExecutionException("<" + model.getType() + ">"
- + " does not support the \"" + attributeName
- + "\" attribute", model.getLocation());
- }
- setter.setAttribute(element, attributeName,
- frame.replacePropertyRefs(attributeValue));
- }
-
- String modelText = model.getText();
- if (modelText.length() != 0) {
- if (!setter.supportsText()) {
- throw new ExecutionException("<" + model.getType() + ">"
- + " does not support content", model.getLocation());
- }
- setter.addText(element,
- frame.replacePropertyRefs(modelText));
- }
-
- }
-
- /**
- * Define a new component
- *
- * @param componentName the name this component will take
- * @param defType the type of component being defined
- * @param factory the library factory object to create the component
- * instances
- * @param loader the class loader to use to create the particular
- * components
- * @param className the name of the class implementing the component
- * @exception ExecutionException if the component cannot be defined
- */
- private void defineComponent(AntLibFactory factory, ClassLoader loader,
- int defType, String componentName,
- String className)
- throws ExecutionException {
- DynamicLibrary dynamicLibrary
- = new DynamicLibrary(factory, loader);
- dynamicLibrary.addComponent(defType, componentName, className);
- dynamicLibraries.put(dynamicLibrary.getLibraryId(), dynamicLibrary);
- importLibraryDef(dynamicLibrary, componentName, null);
- }
-
-
- /**
- * Load any apsects from the given library.
- *
- * @param library the library from which the aspects are to be loaded.
- *
- * @exception AntException if an aspect cannot be loaded.
- */
- private void addAspects(AntLibrary library) throws AntException {
- if (!library.hasAspects()
- || loadedAspects.contains(library.getLibraryId())) {
- return;
- }
-
- String className = null;
- try {
- AntLibFactory libFactory = getLibFactory(library);
- ClassLoader aspectLoader = library.getClassLoader();
- for (Iterator i = library.getAspectClassNames(); i.hasNext();) {
- className = (String) i.next();
- Class aspectClass
- = Class.forName(className, true, aspectLoader);
- if (!Aspect.class.isAssignableFrom(aspectClass)) {
- throw new ExecutionException("In Ant library \""
- + library.getLibraryId() + "\" the aspect class "
- + aspectClass.getName()
- + " does not implement the Aspect interface");
- }
- Aspect aspect = (Aspect) libFactory.createInstance(aspectClass);
- ExecutionContext context
- = new ExecutionContext(frame, null, null);
- aspect.init(context);
- aspects.add(aspect);
- }
- loadedAspects.add(library.getLibraryId());
- } catch (ClassNotFoundException e) {
- throw new ExecutionException("In Ant library \""
- + library.getLibraryId() + "\" aspect class "
- + className + " was not found", e);
- } catch (NoClassDefFoundError e) {
- throw new ExecutionException("In Ant library \""
- + library.getLibraryId()
- + "\" could not load a dependent class ("
- + e.getMessage() + ") for aspect " + className);
- } catch (InstantiationException e) {
- throw new ExecutionException("In Ant library \""
- + library.getLibraryId()
- + "\" unable to instantiate aspect class "
- + className, e);
- } catch (IllegalAccessException e) {
- throw new ExecutionException("In Ant library \""
- + library.getLibraryId()
- + "\" unable to access aspect class "
- + className, e);
- }
- }
-
-
- /**
- * Add the converters from the given library to those managed by this
- * frame.
- *
- * @param library the library from which the converters are required
- * @exception AntException if a converter defined in the library
- * cannot be instantiated
- */
- private void addConverters(AntLibrary library)
- throws AntException {
- if (!library.hasConverters()
- || loadedConverters.contains(library.getLibraryId())) {
- return;
- }
-
- String className = null;
- try {
- AntLibFactory libFactory = getLibFactory(library);
- ClassLoader converterLoader = library.getClassLoader();
- for (Iterator i = library.getConverterClassNames(); i.hasNext();) {
- className = (String) i.next();
- Class converterClass
- = Class.forName(className, true, converterLoader);
- if (!Converter.class.isAssignableFrom(converterClass)) {
- throw new ExecutionException("In Ant library \""
- + library.getLibraryId() + "\" the converter class "
- + converterClass.getName()
- + " does not implement the Converter interface");
- }
- Converter converter
- = (Converter) libFactory.createInstance(converterClass);
- ExecutionContext context
- = new ExecutionContext(frame, null, null);
- converter.init(context);
- Class[] converterTypes = converter.getTypes();
- for (int j = 0; j < converterTypes.length; ++j) {
- converters.put(converterTypes[j], converter);
- }
- }
- loadedConverters.add(library.getLibraryId());
- } catch (ClassNotFoundException e) {
- throw new ExecutionException("In Ant library \""
- + library.getLibraryId() + "\" converter class "
- + className + " was not found", e);
- } catch (NoClassDefFoundError e) {
- throw new ExecutionException("In Ant library \""
- + library.getLibraryId()
- + "\" could not load a dependent class ("
- + e.getMessage() + ") for converter " + className);
- } catch (InstantiationException e) {
- throw new ExecutionException("In Ant library \""
- + library.getLibraryId()
- + "\" unable to instantiate converter class "
- + className, e);
- } catch (IllegalAccessException e) {
- throw new ExecutionException("In Ant library \""
- + library.getLibraryId()
- + "\" unable to access converter class "
- + className, e);
- }
- }
-
- /**
- * Get the aspects which have been registered from ant libraries.
- *
- * @return the list of Aspect instances currently defined.
- */
- protected List getAspects() {
- return aspects;
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Constants.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Constants.java
deleted file mode 100644
index 341184371..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Constants.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-
-/**
- * Core constants
- *
- * @author Conor MacNeill
- * @created 20 February 2002
- */
-public abstract class Constants {
- /** The prefix for library ids that are automatically imported */
- public static final String ANT_LIB_PREFIX = "ant.";
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreDataService.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreDataService.java
deleted file mode 100644
index 8daee51b3..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreDataService.java
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.apache.ant.common.event.MessageLevel;
-import org.apache.ant.common.model.Project;
-import org.apache.ant.common.service.DataService;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.DataValue;
-import org.apache.ant.common.util.PropertyUtils;
-
-/**
- * This is the core's implementation of the DataService service interface. It
- * gives Ant libraries access to property values maintained in the Frame.
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public class CoreDataService implements DataService {
-
- /** The Frame this service instance is working for */
- private Frame frame;
-
- /** all properties to be unset without throwing an exception */
- private boolean allowUnsetProperties;
-
- /**
- * The context of this execution. This contains all data object's created
- * by tasks that have been executed
- */
- private Map dataValues = new HashMap();
-
- /**
- * The property overrides for the referenced frames. This map is indexed
- * by the reference names of the frame. Each entry is another Map of
- * property values indexed by their relative name.
- */
- private Map overrides = new HashMap();
-
- /**
- * Constructor
- *
- * @param frame the frame containing this context
- * @param allowUnsetProperties true if the reference to an unset property
- * should not throw an exception
- */
- protected CoreDataService(Frame frame,
- boolean allowUnsetProperties) {
- this.frame = frame;
- this.allowUnsetProperties = allowUnsetProperties;
- }
-
- /**
- * Get the Data service of a frame
- *
- * @param frame the frame whose data service is required.
- * @return the frame's data service.
- * @exception ExecutionException if the frame's data service cannot be
- * retrieved.
- */
- private DataService getFrameDataService(Frame frame)
- throws ExecutionException {
- return (DataService) frame.getCoreService(DataService.class);
- }
-
- /**
- * Update a DataValue in a repository.
- *
- * The value is only updated if it is a higher priority than any existing
- * values or the same priority and the mutable flag is set.
- *
- * @param repository the repository containing the values.
- * @param key the key under which the value is to be stored.
- * @param value the data vale instance
- * @param mutable true if a value of equal priority can be overwritten.
- */
- private void updateValue(Map repository, String key,
- DataValue value, boolean mutable) {
- int priority = value.getPriority();
- DataValue currentDataValue = (DataValue) repository.get(key);
- if (currentDataValue != null) {
- int currentPriority = currentDataValue.getPriority();
- if (currentPriority > priority
- || (currentPriority == priority && !mutable)) {
- frame.log("Ignoring override for data value " + key,
- MessageLevel.VERBOSE);
- return;
- }
- }
- repository.put(key, value);
- }
-
- /**
- * Set a value in this frame or any of its imported frames.
- *
- * @param name the name of the value
- * @param value the actual value
- * @param mutable if true, existing values can be changed
- * @exception AntException if the value cannot be set.
- */
- public void setDataValue(String name, DataValue value, boolean mutable)
- throws AntException {
- Frame containingFrame = frame.getContainingFrame(name);
-
- if (containingFrame == null) {
- setOverrideProperty(name, value, mutable);
- return;
- }
-
- String localName = frame.getNameInFrame(name);
- if (containingFrame == frame) {
- updateValue(dataValues, localName, value, mutable);
- } else {
- DataService actualDataService = getFrameDataService(containingFrame);
- actualDataService.setDataValue(localName, value, mutable);
- }
- }
-
- /**
- * When a frame has not yet been referenced, this method is used to set
- * the initial properties for the frame when it is introduced.
- *
- * @param name the name of the value
- * @param value the actual value
- * @param mutable if true, existing values can be changed
- * @exception ExecutionException if attempting to override a property in
- * the current frame.
- */
- private void setOverrideProperty(String name, DataValue value,
- boolean mutable)
- throws ExecutionException {
- int refIndex = name.indexOf(Project.REF_DELIMITER);
- if (refIndex == -1) {
- throw new ExecutionException("Property overrides can only be set"
- + " for properties in referenced projects - not "
- + name);
- }
-
- String firstFrameName = name.substring(0, refIndex);
-
- String relativeName
- = name.substring(refIndex + Project.REF_DELIMITER.length());
-
- Map frameOverrides = (Map) overrides.get(firstFrameName);
- if (frameOverrides == null) {
- frameOverrides = new HashMap();
- overrides.put(firstFrameName, frameOverrides);
- }
-
- updateValue(frameOverrides, relativeName, value, mutable);
- }
-
-
- /**
- * Get a data value
- *
- * @param name the name of the data value
- * @return the current object associated with the name or null if no value
- * is currently associated with the name
- * @exception AntException if the value cannot be retrieved.
- */
- public Object getDataValue(String name) throws AntException {
- Frame containingFrame = frame.getContainingFrame(name);
-
- if (containingFrame == null) {
- return getOverrideProperty(name);
- }
- if (containingFrame == frame) {
- DataValue dataValue = (DataValue) dataValues.get(name);
- if (dataValue == null) {
- return null;
- }
- return dataValue.getValue();
- } else {
- String localName = frame.getNameInFrame(name);
- DataService actualDataService = getFrameDataService(containingFrame);
- return actualDataService.getDataValue(localName);
- }
- }
-
- /**
- * Indicate if a data value has been set
- *
- * @param name the name of the data value - may contain reference
- * delimiters
- * @return true if the value exists
- * @exception AntException if the data value cannot be accessed.
- */
- public boolean isDataValueSet(String name) throws AntException {
- Frame containingFrame = frame.getContainingFrame(name);
-
- if (containingFrame == null) {
- return isOverrideSet(name);
- }
- if (containingFrame == frame) {
- return dataValues.containsKey(name);
- } else {
- String localName = frame.getNameInFrame(name);
- DataService actualDataService = getFrameDataService(containingFrame);
- return actualDataService.isDataValueSet(localName);
- }
- }
-
- /**
- * Get all the data values from the frame and any referenced frames. This
- * is an expensive operation since it must clone all of the property
- * stores in all frames
- *
- * @return a Map containing the frames data values indexed by their full
- * name.
- * @exception AntException if the values cannot be retrieved.
- */
- public Map getAllDataValues() throws AntException {
- Map allValues = new HashMap();
- mergeDataValues(allValues, dataValues);
-
- // add in values from sub frames
- for (Iterator i = frame.getRefNames(); i.hasNext();) {
- String refName = (String) i.next();
- Frame refFrame = frame.getReferencedFrame(refName);
-
- DataService refDataService = getFrameDataService(refFrame);
- Map refValues = refDataService.getAllDataValues();
- Iterator j = refValues.keySet().iterator();
-
- while (j.hasNext()) {
- String name = (String) j.next();
- DataValue value = (DataValue) refValues.get(name);
- updateValue(allValues, refName + Project.REF_DELIMITER + name,
- value, false);
- }
- }
-
- // add in values from overrides which have not yet been activated
- for (Iterator i = overrides.keySet().iterator(); i.hasNext();) {
- String refName = (String) i.next();
- Map refOverrides = (Map) overrides.get(refName);
- for (Iterator j = refOverrides.keySet().iterator(); j.hasNext();) {
- String name = (String) j.next();
- DataValue value = (DataValue) refOverrides.get(name);
- updateValue(allValues, refName + Project.REF_DELIMITER + name,
- value, false);
- }
- }
-
- return allValues;
- }
-
-
- /**
- * Replace ${} style constructions in the given value with the string
- * value of the corresponding data values in the frame
- *
- * @param value the string to be scanned for property references.
- * @return the string with all property references replaced
- * @exception AntException if any of the properties do not exist
- */
- public String replacePropertyRefs(String value)
- throws AntException {
- if (value == null) {
- return null;
- }
-
- List fragments = new ArrayList();
- List propertyRefs = new ArrayList();
- PropertyUtils.parsePropertyString(value, fragments, propertyRefs);
-
- StringBuffer sb = new StringBuffer();
- Iterator i = fragments.iterator();
- Iterator j = propertyRefs.iterator();
- while (i.hasNext()) {
- String fragment = (String) i.next();
- if (fragment == null) {
- String propertyName = (String) j.next();
- if (!isDataValueSet(propertyName)) {
- if (!allowUnsetProperties) {
- throw new ExecutionException("Property \""
- + propertyName + "\" has not been set");
- }
- fragment = "${" + propertyName + "}";
- } else {
- fragment = getDataValue(propertyName).toString();
- }
- }
- sb.append(fragment);
- }
-
- return sb.toString();
- }
-
- /**
- * Replace ${} style constructions in the given value with the string
- * value of the objects in the given map. Any values which are not found
- * are left unchanged.
- *
- * @param value the string to be scanned for property references.
- * @param replacementValues the collection of replacement values
- * @return the string with all property references replaced
- * @exception AntException if any of the properties do not exist
- */
- public String replacePropertyRefs(String value, Map replacementValues)
- throws AntException {
- if (value == null) {
- return null;
- }
-
- List fragments = new ArrayList();
- List propertyRefs = new ArrayList();
- PropertyUtils.parsePropertyString(value, fragments, propertyRefs);
-
- StringBuffer sb = new StringBuffer();
- Iterator i = fragments.iterator();
- Iterator j = propertyRefs.iterator();
- while (i.hasNext()) {
- String fragment = (String) i.next();
- if (fragment == null) {
- String propertyName = (String) j.next();
- if (!replacementValues.containsKey(propertyName)) {
- fragment = "${" + propertyName + "}";
- } else {
- fragment
- = replacementValues.get(propertyName).toString();
- }
- }
- sb.append(fragment);
- }
-
- return sb.toString();
- }
-
- /**
- * Get the data value overrides associated with a given reference name.
- *
- * @param refName The name of the reference for which overriding datavalues
- * are required.
- * @return The map of named DataValue instances.
- */
- protected Map getOverrides(String refName) {
- return (Map) overrides.get(refName);
- }
-
- /**
- * Remove the override values associated with a given reference name.
- *
- * @param refName The name of the reference for which overriding datavalues
- * are required.
- */
- protected void removeOverrides(String refName) {
- overrides.remove(refName);
- }
-
- /**
- * Get a value which exists in the frame property overrides awaiting the
- * frame to be introduced.
- *
- * @param name the name of the value
- * @return the value of the property or null if the property does not
- * exist.
- * @exception ExecutionException if attempting to get an override in the
- * current frame.
- */
- private Object getOverrideProperty(String name) throws ExecutionException {
- int refIndex = name.indexOf(Project.REF_DELIMITER);
- if (refIndex == -1) {
- throw new ExecutionException("Property overrides can only be"
- + " returned for properties in referenced projects - not "
- + name);
- }
-
- String firstFrameName = name.substring(0, refIndex);
-
- String relativeName
- = name.substring(refIndex + Project.REF_DELIMITER.length());
-
- Map frameOverrides = (Map) overrides.get(firstFrameName);
- if (frameOverrides == null) {
- return null;
- }
-
- return frameOverrides.get(relativeName);
- }
-
- /**
- * Get a value which exists in the frame property overrides awaiting the
- * frame to be introduced.
- *
- * @param name the name of the value
- * @return the value of the property or null if the property does not
- * exist.
- * @exception ExecutionException if attempting to check an override in the
- * current frame.
- */
- private boolean isOverrideSet(String name) throws ExecutionException {
- int refIndex = name.indexOf(Project.REF_DELIMITER);
- if (refIndex == -1) {
- throw new ExecutionException("Property overrides can only be"
- + " returned for properties in referenced projects - not "
- + name);
- }
-
- String firstFrameName = name.substring(0, refIndex);
-
- String relativeName
- = name.substring(refIndex + Project.REF_DELIMITER.length());
-
- Map frameOverrides = (Map) overrides.get(firstFrameName);
- if (frameOverrides == null) {
- return false;
- }
-
- return frameOverrides.containsKey(relativeName);
- }
-
-
- /**
- * Add a collection of properties to this frame with a given priority.
- *
- * @param properties the collection of property values, indexed by their
- * names
- * @param priority the priority at which the values are added.
- * @exception AntException if the values cannot be added.
- */
- protected void addProperties(Map properties, int priority)
- throws AntException {
- addDataValues(DataValue.makeDataValues(properties, priority));
- }
-
- /**
- * Add a set of data values.
- *
- * @param dataValues a collection of DataValue instances named
- * @exception AntException if the values cannot be added.
- */
- protected void addDataValues(Map values) throws AntException {
- mergeDataValues(dataValues, values);
- }
-
- /**
- * Merge one set of values into another
- *
- * @param values the values to which the new values are added
- * @param newValues the values to be added in.
- */
- public void mergeDataValues(Map values, Map newValues) {
- mergeDataValues(values, newValues, DataValue.PRIORITY_BASE);
- }
-
- /**
- * Merge in values which are of a given priority or higher.
- *
- * @param values the values to which the new values are added
- * @param newValues the values to be added in.
- * @param threshold The require data value priority for a value to be
- * merged.
- */
- public void mergeDataValues(Map values, Map newValues, int threshold) {
- if (newValues == null) {
- return;
- }
-
- for (Iterator i = newValues.keySet().iterator(); i.hasNext();) {
- String name = (String) i.next();
- DataValue value = (DataValue) newValues.get(name);
- if (value.getPriority() >= threshold) {
- updateValue(values, name, value, false);
- }
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreEventService.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreEventService.java
deleted file mode 100644
index 9ac09fb93..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreEventService.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import org.apache.ant.common.event.BuildListener;
-import org.apache.ant.common.service.EventService;
-
-/**
- * Core implementation of the event service
- *
- * @author Conor MacNeill
- * @created 7 February 2002
- */
-public class CoreEventService implements EventService {
- /** The Frame this service instance is working for */
- private Frame frame;
-
- /**
- * Constructor
- *
- * @param frame the frame for which this instance is providing service
- */
- protected CoreEventService(Frame frame) {
- this.frame = frame;
- }
-
- /**
- * Add a build listener to the current frame
- *
- * @param listener the lister which will receive build events
- * @exception ExecutionException if the listener cannot be added
- */
- public void addBuildListener(BuildListener listener)
- throws ExecutionException {
- frame.addBuildListener(listener);
- }
-
- /**
- * Remove a listener from the current frame
- *
- * @param listener the listener to be removed
- * @exception ExecutionException if the listener could not be removed
- */
- public void removeBuildListener(BuildListener listener)
- throws ExecutionException {
- frame.removeBuildListener(listener);
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreExecService.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreExecService.java
deleted file mode 100644
index f46132523..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreExecService.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.List;
-import java.util.Map;
-import org.apache.ant.antcore.modelparser.XMLProjectParser;
-import org.apache.ant.antcore.xml.XMLParseException;
-import org.apache.ant.common.antlib.Task;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.model.Project;
-import org.apache.ant.common.model.BuildElement;
-import org.apache.ant.common.service.ExecService;
-import org.apache.ant.init.InitUtils;
-import org.apache.ant.common.model.NamespaceValueCollection;
-import org.apache.ant.common.event.BuildListener;
-import org.apache.ant.common.util.AntException;
-
-/**
- * This is the core's implementation of the Execution Service.
- *
- * @author Conor MacNeill
- * @created 8 February 2002
- */
-public class CoreExecService implements ExecService {
-
- /** The Frame this service instance is working for */
- private Frame frame;
-
- /**
- * Constructor
- *
- * @param frame the frame containing this context
- */
- protected CoreExecService(Frame frame) {
- this.frame = frame;
- }
-
-
- /**
- * Execute a task. The task should have already been initialised by the
- * core. This is checked
- *
- * @param task the task to be executed
- * @exception AntException if there is an execution problem
- */
- public void executeTask(Task task) throws AntException {
- ExecutionContext execContext = getTaskExecutionContext(task);
-
- BuildElement model = execContext.getModel();
- NamespaceValueCollection namespaceValues = null;
- if (model != null) {
- namespaceValues = model.getNamespaceAttributes();
- }
- frame.executeTask(task, namespaceValues);
- }
-
- /**
- * Retrieve the execution context from a task and verify that the context
- * is valid.
- *
- * @param task the task.
- * @return the task's execution context.
- *
- * @exception ExecutionException if the task's context is not valid.
- */
- private ExecutionContext getTaskExecutionContext(Task task)
- throws ExecutionException {
- AntContext context = task.getAntContext();
-
- if (!(context instanceof ExecutionContext)) {
- throw new ExecutionException("The Task was not configured with an"
- + " appropriate context");
- }
- return (ExecutionContext) context;
- }
-
- /**
- * Execute a task with a set of aspect values. Normally aspect values come
- * from a build model but not all tasks will be created from a build model.
- * Some may be created dynamically and configured programatically. This
- * method allows aspect values to provided for execution of such tasks since
- * by their nature, aspect values are not part of the task configuration.
- *
- * @param task the task to be executed
- * @param aspectValues the aspect attribute values.
- * @exception AntException if there is an execution problem
- */
- public void executeTask(Task task, NamespaceValueCollection aspectValues)
- throws AntException {
- ExecutionContext execContext = getTaskExecutionContext(task);
-
- frame.executeTask(task, aspectValues);
- }
-
- /**
- * Get the base directory for this execution of this frame
- *
- * @return the base directory
- */
- public File getBaseDir() {
- return frame.getBaseDir();
- }
-
- /**
- * Set the basedir for the current execution
- *
- * @param baseDir the new base directory for this execution of Ant
- *
- * @exception AntException if the baseDir cannot be set to the given value.
- */
- public void setBaseDir(File baseDir) throws AntException {
- frame.setBaseDir(baseDir);
- }
-
-
- /**
- * get the name of the project associated with this execution.
- *
- * @return the project's name
- */
- public String getProjectName() {
- return frame.getProjectName();
- }
-
-
- /**
- * Handle subbuild output.
- *
- * @param subbuildKey the core's key for managing the subbuild.
- * @param line the content produce by the current thread.
- * @param isErr true if this content is from the thread's error stream.
- * @exception ExecutionException if the subbuild cannot be found.
- */
- public void handleBuildOutput(Object subbuildKey, String line,
- boolean isErr) throws ExecutionException {
- Frame subFrame = (Frame) subbuildKey;
- subFrame.threadOutput(line, isErr);
- }
-
-
- /**
- * Force initialisation of a particular ant library in the context of the
- * given subbuild.
- *
- * @param key the build key.
- * @param libraryId the id of the library to be initialized.
- * @exception AntException if the build cannot be run
- */
- public void initializeBuildLibrary(Object key, String libraryId)
- throws AntException {
- Frame subFrame = (Frame) key;
- subFrame.initializeLibrary(libraryId);
- }
-
- /**
- * Add a listener to a subbuild
- *
- * @param key the key identifying the build previously setup
- * @param listener the listener to add to the build.
- *
- * @exception ExecutionException if the build cannot be found.
- */
- public void addBuildListener(Object key, BuildListener listener)
- throws ExecutionException {
- Frame subFrame = (Frame) key;
- subFrame.addBuildListener(listener);
- }
-
-
- /**
- * Run a build which have been previously setup
- *
- * @param targets A list of targets to be run
- * @param key Description of the Parameter
- * @exception AntException if the build cannot be run
- */
- public void runBuild(Object key, List targets) throws AntException {
- Frame subFrame = (Frame) key;
- subFrame.runBuild(targets);
- }
-
-
- /**
- * Parse an XML file into a build model.
- *
- * @param xmlBuildFile The file containing the XML build description.
- * @return A Project model for the build.
- * @exception ExecutionException if the build cannot be parsed
- */
- public Project parseXMLBuildFile(File xmlBuildFile)
- throws ExecutionException {
- try {
- // Parse the build file into a project
- XMLProjectParser parser = new XMLProjectParser();
-
- return parser.parseBuildFile(InitUtils.getFileURL(xmlBuildFile));
- } catch (MalformedURLException e) {
- throw new ExecutionException(e);
- } catch (XMLParseException e) {
- throw new ExecutionException(e);
- }
- }
-
-
- /**
- * Create a project reference.
- *
- * @param referenceName the name under which the project will be
- * referenced.
- * @param model the project model.
- * @param initialData the project's initial data load.
- * @exception AntException if the project cannot be referenced.
- */
- public void createProjectReference(String referenceName, Project model,
- Map initialData)
- throws AntException {
- frame.createProjectReference(referenceName, model, initialData);
- }
-
-
- /**
- * Setup a sub-build.
- *
- * @param model the project model to be used for the build
- * @param dataValues the initial data values to be used in the build
- * @param addListeners true if the current frame's listeners should be
- * added to the created Frame
- * @return Description of the Return Value
- * @exception AntException if the subbuild cannot be run
- */
- public Object setupBuild(Project model, Map dataValues,
- boolean addListeners)
- throws AntException {
- Frame newFrame = frame.createFrame(model);
- if (addListeners) {
- frame.addListeners(newFrame);
- }
- newFrame.initialize(dataValues);
-
- return newFrame;
- }
-
-
- /**
- * Setup a sub-build using the current frame's project model
- *
- * @param dataValues the initial properties to be used in the build
- * @param addListeners true if the current frame's listeners should be
- * added to the created Frame
- * @return Description of the Return Value
- * @exception AntException if the subbuild cannot be run
- */
- public Object setupBuild(Map dataValues, boolean addListeners)
- throws AntException {
- return setupBuild(frame.getProject(), dataValues, addListeners);
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreFileService.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreFileService.java
deleted file mode 100644
index 4d1ddc401..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreFileService.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import java.io.File;
-import org.apache.ant.common.service.FileService;
-import org.apache.ant.common.util.FileUtils;
-import org.apache.ant.common.util.AntException;
-
-/**
- * The core's implementation of the File Service. The File Service is used
- * by Ant Library components to perform operations on the local file system
- *
- * @author Conor MacNeill
- * @created 27 January 2002
- */
-public class CoreFileService implements FileService {
- /** The Frame this service instance is working for */
- private Frame frame;
-
- /** General file utilities */
- private FileUtils fileUtils = FileUtils.newFileUtils();
-
- /**
- * Constructor
- *
- * @param frame the frame containing this context
- */
- protected CoreFileService(Frame frame) {
- this.frame = frame;
- }
-
- /**
- * Resolve a file according to the base directory of the project
- * associated with this context
- *
- * @param fileName the file name to be resolved.
- * @return the file resolved to the project's base dir
- * @exception AntException if the file cannot be resolved.
- */
- public File resolveFile(String fileName) throws AntException {
- File base = frame.getBaseDir();
- return fileUtils.resolveFile(fileUtils.normalize(base.getPath()),
- fileName);
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreInputService.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreInputService.java
deleted file mode 100644
index d88cda06d..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/CoreInputService.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import org.apache.ant.common.service.InputService;
-import org.apache.ant.common.input.InputRequest;
-
-/**
- * The core's implementation of the Input Service.
- *
- * @author Conor MacNeill
- * @created 30 April 2002
- */
-public class CoreInputService implements InputService {
- /** The Frame this service instance is working for */
- private Frame frame;
-
- /**
- * Constructor
- *
- * @param frame the frame containing this context
- */
- protected CoreInputService(Frame frame) {
- this.frame = frame;
- }
-
- /**
- * Handle an input request
- *
- * @param request an input request
- * @exception ExecutionException if the request cannot be handled
- */
- public void handleInput(InputRequest request) throws ExecutionException {
- // XXX
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/DeferredSetter.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/DeferredSetter.java
deleted file mode 100644
index 7e070a173..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/DeferredSetter.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import org.apache.ant.common.antlib.DeferredTask;
-
-/**
- * An implementation of the Setter interface for configuring instances of
- * the DeferredTask interface
- *
- * @author Conor MacNeill
- * @created 11 February 2002
- */
-public class DeferredSetter implements Setter {
- /**
- * Set an attribute value on an object
- *
- * @param obj the object on which the value is being set
- * @param attributeName the name of the attribute
- * @param value the string represenation of the attribute's value
- * @exception ExecutionException if the object does not support the
- * attribute or the object has a problem setting the value
- */
- public void setAttribute(Object obj, String attributeName,
- String value) throws ExecutionException {
- DeferredTask task = (DeferredTask) obj;
- task.setAttribute(attributeName, value);
- }
-
-
- /**
- * Get the type of the given nested element
- *
- * @param elementName the nested element whose type is desired
- * @return the class instance representing the type of the element adder
- */
- public Class getType(String elementName) {
- return null;
- }
-
- /**
- * Adds PCDATA to the element
- *
- * @param obj the instance whose content is being provided
- * @param text the required content
- * @exception ExecutionException if the object does not support
- * contentor the object has a problem setting the content
- */
- public void addText(Object obj, String text)
- throws ExecutionException {
- DeferredTask task = (DeferredTask) obj;
- task.addText(text);
- }
-
- /**
- * Add an element to the given object
- *
- * @param obj The object to which the element is being added
- * @param elementName the name of the element
- * @param value the object to be added - the nested element
- * @exception ExecutionException if the object does not support content
- * or the object has a problem setting the content
- */
- public void addElement(Object obj, String elementName, Object value)
- throws ExecutionException {
- DeferredTask task = (DeferredTask) obj;
- task.addElement(elementName, value);
- }
-
- /**
- * Create a nested element using the object's element factory method.
- *
- * @param container the object in which the nested element is required.
- * @param elementName the name of the nested element
- * @return the new instance of the nested element
- * @exception ExecutionException if the nested element cannot be
- * created.
- */
- public Object createElement(Object container, String elementName)
- throws ExecutionException {
- throw new ExecutionException("Deferred Tasks do not support "
- + "creation of nested elements");
- }
-
- /**
- * Indicate if the class assocated with this reflector supports the
- * addition of text content.
- *
- * @return true if the class supports an addText method
- */
- public boolean supportsText() {
- return true;
- }
-
- /**
- * Indicate if the class assocated with this reflector supports the
- * given attribute
- *
- * @param attributeName the name of the attribute
- * @return true if the given attribute is supported
- */
- public boolean supportsAttribute(String attributeName) {
- return true;
- }
-
- /**
- * Determine if the class associated with this reflector supports a
- * particular nested element via a create factory method
- *
- * @param elementName the name of the element
- * @return true if the class supports creation of that element
- */
- public boolean supportsNestedCreator(String elementName) {
- return false;
- }
-
- /**
- * Determine if the class associated with this reflector supports a
- * particular nested element via an add method
- *
- * @param elementName the name of the element
- * @return true if the class supports addition of that element
- */
- public boolean supportsNestedAdder(String elementName) {
- return true;
- }
-
- /**
- * Determine if the class associated with this reflector supports a
- * particular nested element
- *
- * @param elementName the name of the element
- * @return true if the class supports the given type of nested element
- */
- public boolean supportsNestedElement(String elementName) {
- return true;
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ExecutionContext.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ExecutionContext.java
deleted file mode 100755
index e225809be..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ExecutionContext.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.ExecutionComponent;
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.model.BuildElement;
-
-/**
- * This is the core's implementation of the AntContext for all core objects.
- * Specific subclasses handle types and tasks
- *
- * @author Conor MacNeill
- * @created 20 January 2002
- */
-public class ExecutionContext implements AntContext {
- /** The Frame containing this context */
- private Frame frame;
-
- /** the event support instance used to manage build events */
- private BuildEventSupport eventSupport;
-
- /** The build model associated with this context. */
- private BuildElement model;
-
- /** the execution component associated with the context, if any */
- private ExecutionComponent component;
-
- /**
- * the loader used to load this context. Note that this is not
- * necessarily the loader which is used to load the component as loading
- * may have been delegated to a parent loader.
- */
- private ClassLoader loader;
-
- /**
- * Initilaise this context's environment
- *
- * @param frame the frame containing this context
- * @param component the component associated with this context - may be null
- * @param model the build model associated with this component if any.
- */
- protected ExecutionContext(Frame frame, ExecutionComponent component,
- BuildElement model) {
- this.frame = frame;
- this.eventSupport = frame.getEventSupport();
- this.model = model;
- this.component = component;
- }
-
- /**
- * Get an implementation of one of the core's service interfaces
- *
- * @param serviceInterfaceClass the interface class for which an
- * implementation is required
- * @return the core's implementation of the interface.
- * @exception ExecutionException if there is a problem finding the
- * interface
- */
- public Object getCoreService(Class serviceInterfaceClass)
- throws ExecutionException {
- return frame.getCoreService(serviceInterfaceClass);
- }
-
-
- /**
- * Gets the location associated with the ExecutionContext
- *
- * @return the location in the build model associated with this context.
- */
- public Location getLocation() {
- if (model == null) {
- return Location.UNKNOWN_LOCATION;
- }
- return model.getLocation();
- }
-
- /**
- * Log a message as a build event
- *
- * @param message the message to be logged
- * @param level the priority level of the message
- */
- public void log(String message, int level) {
- Object source = component;
- if (source == null) {
- source = frame.getProject();
- if (source == null) {
- source = frame;
- }
- }
- eventSupport.fireMessageLogged(source, message, level);
- }
-
- /**
- * Sets the classLoader of the ExecutionContext
- *
- * @param loader the new classLoader value
- */
- protected void setClassLoader(ClassLoader loader) {
- this.loader = loader;
- }
-
- /**
- * Gets the loader for this context
- *
- * @return the context's loader
- */
- public ClassLoader getClassLoader() {
- return loader;
- }
-
- /**
- * Gets the executionComponent of the ExecutionContext
- *
- * @return the executionComponent value
- */
- protected ExecutionComponent getExecutionComponent() {
- return component;
- }
-
- /**
- * Get the build model associated with this context.
- *
- * @return the build model or null if there is no build model.
- */
- public BuildElement getModel() {
- return model;
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ExecutionException.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ExecutionException.java
deleted file mode 100755
index f66cf5f05..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ExecutionException.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.Location;
-
-/**
- * An ExecutionException indicates a problem while executing tasks in a
- * build
- *
- * @author Conor MacNeill
- * @created 20 January 2002
- */
-public class ExecutionException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public ExecutionException(String msg) {
- super(msg);
- }
-
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public ExecutionException(String msg, Location location) {
- super(msg, location);
- }
-
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public ExecutionException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public ExecutionException(String msg, Throwable cause, Location location) {
- super(msg, cause, location);
- }
-
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public ExecutionException(Throwable cause) {
- super(cause);
- }
-
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public ExecutionException(Throwable cause, Location location) {
- super(cause, location);
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java
deleted file mode 100644
index d74b25d0b..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java
+++ /dev/null
@@ -1,1085 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import java.io.File;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Set;
-import org.apache.ant.antcore.config.AntConfig;
-import org.apache.ant.antcore.antlib.AntLibManager;
-import org.apache.ant.common.antlib.Task;
-import org.apache.ant.common.antlib.Aspect;
-import org.apache.ant.common.event.BuildListener;
-import org.apache.ant.common.event.MessageLevel;
-import org.apache.ant.common.model.BuildElement;
-import org.apache.ant.common.model.ModelException;
-import org.apache.ant.common.model.Project;
-import org.apache.ant.common.model.Target;
-import org.apache.ant.common.model.NamespaceValueCollection;
-import org.apache.ant.common.service.ComponentService;
-import org.apache.ant.common.service.DataService;
-import org.apache.ant.common.service.EventService;
-import org.apache.ant.common.service.ExecService;
-import org.apache.ant.common.service.FileService;
-import org.apache.ant.common.service.InputService;
-import org.apache.ant.common.service.MagicProperties;
-import org.apache.ant.common.util.DemuxOutputReceiver;
-import org.apache.ant.common.util.DataValue;
-import org.apache.ant.common.util.FileUtils;
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.init.AntEnvironment;
-import org.apache.ant.init.LoaderUtils;
-
-/**
- * An Frame maintains the state of a project during an execution. The Frame
- * contains the data values set by Ant tasks as they are executed, including
- * task definitions, property values, etc.
- *
- * @author Conor MacNeill
- * @created 14 January 2002
- */
-public class Frame implements DemuxOutputReceiver {
- /** the base dir of the project */
- private File baseDir;
-
- /** The Project that this execution frame is processing */
- private Project project = null;
-
- /** The referenced frames corresponding to the referenced projects */
- private Map referencedFrames = new HashMap();
-
- /**
- * This is a Map of Maps. This map is keyed on an executing task.
- * Each entry is itself a Map of Aspects to their context for the
- * particular task.
- */
- private Map aspectContextsMap = new HashMap();
-
- /**
- * Ant's initialization configuration with information on the location of
- * Ant and its libraries.
- */
- private AntEnvironment antEnv;
-
- /** BuildEvent support used to fire events and manage listeners */
- private BuildEventSupport eventSupport = new BuildEventSupport();
-
- /**
- * The services map is a map of service interface classes to instances
- * which provide the service.
- */
- private Map services = new HashMap();
-
- /**
- * The configuration to be used in this execution of Ant. It is formed
- * from the system, user and any runtime configs.
- */
- private AntConfig config;
-
- /**
- * The Data Service instance used by the frame for data management
- */
- private CoreDataService dataService;
-
- /** The execution file service instance */
- private CoreFileService fileService;
-
- /**
- * the Component Manager used to manage the importing of library
- * components from the Ant libraries
- */
- private ComponentManager componentManager;
-
- /** The core's execution Service */
- private CoreExecService execService;
-
- /** The parent frame of this frame - may be null. */
- private Frame parent = null;
-
- /** The currently executing target in this frame */
- private String currentTarget = null;
-
- /** The global library manager */
- private AntLibManager libManager;
-
- /**
- * Create the main or root Execution Frame.
- *
- * @param config the user config to use for this execution of Ant
- * @param antEnv Ant's initialisation config
- */
- public Frame(AntEnvironment antEnv, AntConfig config) {
- this.config = config;
- this.antEnv = antEnv;
- this.parent = null;
- this.libManager
- = new AntLibManager(antEnv, config.isRemoteLibAllowed());
- }
-
- /**
- * Create an Execution Frame.
- *
- * @param config the user config to use for this execution of Ant
- * @param antEnv Ant's initialisation config
- * @param parent the frame creating this frame.
- */
- private Frame(AntEnvironment antEnv, AntConfig config, Frame parent) {
- this.config = config;
- this.antEnv = antEnv;
- this.parent = parent;
- this.libManager = parent.libManager;
- }
-
-
- /**
- * Replace ${} style constructions in the given value with the string
- * value of the corresponding data values in the frame
- *
- * @param value the string to be scanned for property references.
- * @return the string with all property references replaced
- * @exception AntException if any of the properties do not exist
- */
- protected String replacePropertyRefs(String value)
- throws AntException {
- return dataService.replacePropertyRefs(value);
- }
-
-
- /**
- * Sets the Project of the Frame
- *
- * @param project The new Project value
- * @exception ModelException if the project is not valid.
- */
- public void setProject(Project project) throws ModelException {
- this.project = project;
- referencedFrames.clear();
- project.validate();
- }
-
-
- /**
- * get the name of the project associated with this frame.
- *
- * @return the project's name
- */
- protected String getProjectName() {
- if (project != null) {
- return project.getName();
- }
- return null;
- }
-
-
- /**
- * Initialize the frame.
- *
- * @param initialDataValues a Map of named DataValue instances.
- * @exception AntException if the frame cannot be initialized.
- */
- public void initialize(Map initialDataValues) throws AntException {
- configureServices();
- // add in system properties
- dataService.addProperties(System.getProperties(),
- DataValue.PRIORITY_BASE);
- if (initialDataValues != null) {
- dataService.addDataValues(initialDataValues);
- }
- setMagicProperties();
- }
-
- /**
- * Set the values of various magic properties
- *
- * @exception AntException if the properties cannot be set
- */
- protected void setMagicProperties() throws AntException {
- // ant.home
- URL antHomeURL = antEnv.getAntHome();
- String antHomeString = null;
-
- if (antHomeURL.getProtocol().equals("file")) {
- File antHome = new File(antHomeURL.getFile());
-
- antHomeString = antHome.getAbsolutePath();
- } else {
- antHomeString = antHomeURL.toString();
- }
- DataValue antHomeValue
- = new DataValue(antHomeString, DataValue.PRIORITY_USER);
- dataService.setDataValue(MagicProperties.ANT_HOME, antHomeValue,
- false);
-
- // ant.file
- URL projectSource = project.getSourceURL();
- if (projectSource != null
- && projectSource.getProtocol().equals("file")) {
- DataValue antFileValue = new DataValue(projectSource.getFile(),
- DataValue.PRIORITY_USER);
- dataService.setDataValue(MagicProperties.ANT_FILE,
- antFileValue, true);
- }
-
- // basedir
- determineBaseDir();
-
- // ant.project.name
- String projectName = project.getName();
- if (projectName != null) {
- dataService.setDataValue(MagicProperties.ANT_PROJECT_NAME,
- new DataValue(projectName, DataValue.PRIORITY_USER),
- true);
- }
-
- }
-
-
- /**
- * Get a definition from a referenced frame
- *
- * @param definitionName the name of the definition relative to this frame
- * @return the appropriate import info object from the referenced frame's
- * imports
- * @exception ExecutionException if the referenced definition cannot be
- * found
- */
- protected ImportInfo getReferencedDefinition(String definitionName)
- throws ExecutionException {
- Frame containingFrame = getContainingFrame(definitionName);
- String localName = getNameInFrame(definitionName);
-
- if (containingFrame == null) {
- throw new ExecutionException("There is no project corresponding "
- + "to the name \"" + definitionName + "\"");
- }
- if (containingFrame == this) {
- return componentManager.getImport(localName);
- } else {
- return containingFrame.getReferencedDefinition(localName);
- }
- }
-
-
- /**
- * Gets the project model this frame is working with
- *
- * @return the project model
- */
- protected Project getProject() {
- return project;
- }
-
-
-
- /**
- * Get the Ant initialization configuration for this frame.
- *
- * @return Ant's initialization configuration
- */
- protected AntEnvironment getAntEnvironment() {
- return antEnv;
- }
-
-
- /**
- * Get the config instance being used by this frame.
- *
- * @return the config associated with this frame.
- */
- protected AntConfig getConfig() {
- return config;
- }
-
-
- /**
- * Get the core's implementation of the given service interface.
- *
- * @param serviceInterfaceClass the service interface for which an
- * implementation is require
- * @return the core's implementation of the service interface
- * @exception ExecutionException if the core does not provide an
- * implementatin of the requested interface
- */
- protected Object getCoreService(Class serviceInterfaceClass)
- throws ExecutionException {
- Object service = services.get(serviceInterfaceClass);
-
- if (service == null) {
- throw new ExecutionException("No service of interface class "
- + serviceInterfaceClass);
- }
- return service;
- }
-
-
- /**
- * Get the EventSupport instance for this frame. This tracks the build
- * listeners on this frame
- *
- * @return the EventSupport instance
- */
- protected BuildEventSupport getEventSupport() {
- return eventSupport;
- }
-
-
- /**
- * Gets the baseDir of the Frame
- *
- * @return the baseDir value
- */
- protected File getBaseDir() {
- return baseDir;
- }
-
-
- /**
- * Get a referenced frame by its reference name
- *
- * @param referenceName the name under which the frame was imported.
- * @return the Frame asscociated with the given reference name or null if
- * there is no such project.
- */
- protected Frame getReferencedFrame(String referenceName) {
- return (Frame) referencedFrames.get(referenceName);
- }
-
-
- /**
- * Get the frames representing referenced projects.
- *
- * @return an iterator which returns the referenced ExeuctionFrames.
- */
- protected Iterator getReferencedFrames() {
- return referencedFrames.values().iterator();
- }
-
- /**
- * Get the names used for referenced projects
- *
- * @return an iterator which returns the referenced frame names.
- */
- protected Iterator getRefNames() {
- return referencedFrames.keySet().iterator();
- }
-
- /**
- * Get the name of an object in its frame
- *
- * @param fullname The name of the object
- * @return the name of the object within its containing frame
- */
- protected String getNameInFrame(String fullname) {
- int index = fullname.lastIndexOf(Project.REF_DELIMITER);
-
- if (index == -1) {
- return fullname;
- }
- return fullname.substring(index + Project.REF_DELIMITER.length());
- }
-
-
- /**
- * Get the execution frame which contains, directly, the named element
- * where the name is relative to this frame
- *
- * @param elementName The name of the element
- * @return the execution frame for the project that contains the given
- * target
- */
- protected Frame getContainingFrame(String elementName) {
- int index = elementName.lastIndexOf(Project.REF_DELIMITER);
-
- if (index == -1) {
- return this;
- }
-
- Frame currentFrame = this;
- String relativeName = elementName.substring(0, index);
- StringTokenizer tokenizer
- = new StringTokenizer(relativeName, Project.REF_DELIMITER);
-
- while (tokenizer.hasMoreTokens()) {
- String refName = tokenizer.nextToken();
-
- currentFrame = currentFrame.getReferencedFrame(refName);
- if (currentFrame == null) {
- return null;
- }
- }
-
- return currentFrame;
- }
-
- /**
- * Create a project reference.
- *
- * @param name the name under which the project will be
- * referenced.
- * @param project the project model.
- * @param initialData the project's initial data load.
- * @exception AntException if the project cannot be referenced.
- */
- protected void createProjectReference(String name, Project project,
- Map initialData)
- throws AntException {
- Frame referencedFrame = createFrame(project);
- addListeners(referencedFrame);
-
-
- Map overrideProperties = dataService.getOverrides(name);
- Map values = new HashMap();
- dataService.mergeDataValues(values, initialData);
- dataService.mergeDataValues(values, overrideProperties);
- referencedFrame.initialize(values);
- dataService.removeOverrides(name);
-
- referencedFrames.put(name, referencedFrame);
- referencedFrame.importStandardComponents();
- referencedFrame.runGlobalTasks();
- }
-
- /**
- * Create a new frame for a given project
- *
- * @param project the project model the frame will deal with
- * @return an Frame ready to build the project
- * @exception ModelException if the given project is not valid.
- */
- protected Frame createFrame(Project project)
- throws ModelException {
- Frame newFrame
- = new Frame(antEnv, config, this);
-
- newFrame.setProject(project);
-
- return newFrame;
- }
-
- /**
- * Add all build listeners from this frame to the given sub frame.
- *
- * @param subFrame the subFrame to which all the listeners of this frame
- * will be added.
- */
- protected void addListeners(Frame subFrame) {
- List listeners = eventSupport.getListeners();
- for (Iterator j = listeners.iterator(); j.hasNext();) {
- BuildListener listener = (BuildListener) j.next();
-
- subFrame.addBuildListener(listener);
- }
- }
-
-
- /**
- * Log a message as a build event
- *
- * @param message the message to be logged
- * @param level the priority level of the message
- */
- protected void log(String message, int level) {
- eventSupport.fireMessageLogged(project, message, level);
- }
-
-
- /**
- * Add a build listener to this execution frame
- *
- * @param listener the listener to be added to the frame
- */
- public void addBuildListener(BuildListener listener) {
- for (Iterator i = getReferencedFrames(); i.hasNext();) {
- Frame referencedFrame = (Frame) i.next();
-
- referencedFrame.addBuildListener(listener);
- }
- eventSupport.addBuildListener(listener);
- }
-
-
- /**
- * Remove a build listener from the execution
- *
- * @param listener the listener to be removed
- */
- protected void removeBuildListener(BuildListener listener) {
- for (Iterator i = getReferencedFrames(); i.hasNext();) {
- Frame subFrame = (Frame) i.next();
-
- subFrame.removeBuildListener(listener);
- }
- eventSupport.removeBuildListener(listener);
- }
-
- /**
- * Import any standard components from the libraries which have been loaded.
- * A standard component is a component provided by a library in the ant
- * namespace.
- *
- * @exception AntException if the standard components cannot be imported.
- */
- private void importStandardComponents() throws AntException {
- componentManager.importStandardComponents();
- }
-
- /**
- * Run the given list of targets
- *
- * @param targets a list of target names which are to be evaluated
- * @exception AntException if there is a problem in the build
- */
- protected void runBuild(List targets) throws AntException {
- log("Running build.", MessageLevel.DEBUG);
- importStandardComponents();
- runGlobalTasks();
- if (targets.isEmpty()) {
- // we just execute the default target if any
- String defaultTarget = project.getDefaultTarget();
-
- if (defaultTarget != null) {
- log("Executing default target: " + defaultTarget,
- MessageLevel.DEBUG);
- executeTarget(defaultTarget);
- }
- } else {
- for (Iterator i = targets.iterator(); i.hasNext();) {
- String targetName = (String) i.next();
-
- log("Executing target: " + targetName, MessageLevel.DEBUG);
- executeTarget(targetName);
- }
- }
- }
-
-
-
- /**
- * Given a fully qualified target name, this method returns the fully
- * qualified name of the project
- *
- * @param fullTargetName the full qualified target name
- * @return the full name of the containing project
- */
- private String getFullProjectName(String fullTargetName) {
- int index = fullTargetName.lastIndexOf(Project.REF_DELIMITER);
- if (index == -1) {
- return null;
- }
-
- return fullTargetName.substring(0, index);
- }
-
- /**
- * Flatten the dependencies to the given target
- *
- * @param flattenedList the List of targets that must be executed before
- * the given target
- * @param fullTargetName the fully qualified name of the target
- * @param targetRefLocation the location requesting this dependency.
- * @exception ExecutionException if the given target does not exist in the
- * project hierarchy
- */
- private void flattenDependency(List flattenedList, String fullTargetName,
- Location targetRefLocation)
- throws ExecutionException {
- if (flattenedList.contains(fullTargetName)) {
- return;
- }
- String fullProjectName = getFullProjectName(fullTargetName);
- Frame frame = getContainingFrame(fullTargetName);
- if (frame == null) {
- throw new ExecutionException("No project available under the "
- + "referenced name \"" + fullTargetName, targetRefLocation);
- }
- String localTargetName = getNameInFrame(fullTargetName);
- Target target = frame.getProject().getTarget(localTargetName);
- if (target == null) {
- throw new ExecutionException("Target \"" + fullTargetName
- + "\" does not exist", targetRefLocation);
- }
- for (Iterator i = target.getDependencies(); i.hasNext();) {
- String localDependencyName = (String) i.next();
- String fullDependencyName = localDependencyName;
- if (fullProjectName != null) {
- fullDependencyName = fullProjectName + Project.REF_DELIMITER
- + localDependencyName;
- }
- flattenDependency(flattenedList, fullDependencyName,
- target.getLocation());
- if (!flattenedList.contains(fullDependencyName)) {
- flattenedList.add(fullDependencyName);
- }
- }
- }
-
- /**
- * get the list of dependent targets which must be evaluated for the
- * given target.
- *
- * @param fullTargetName the full name (in reference space) of the
- * target
- * @return the flattened list of targets
- * @exception ExecutionException if the given target could not be found
- */
- protected List getTargetDependencies(String fullTargetName)
- throws ExecutionException {
- List flattenedList = new ArrayList();
- flattenDependency(flattenedList, fullTargetName, null);
- flattenedList.add(fullTargetName);
- return flattenedList;
- }
-
-
- /**
- * Execute the tasks of a target in this frame with the given name
- *
- * @param targetName the name of the target whose tasks will be evaluated
- * @exception AntException if there is a problem executing the tasks
- * of the target
- */
- protected void executeTarget(String targetName) throws AntException {
-
- // to execute a target we must determine its dependencies and
- // execute them in order.
-
- // firstly build a list of fully qualified target names to execute.
- List dependencyOrder = getTargetDependencies(targetName);
-
- for (Iterator i = dependencyOrder.iterator(); i.hasNext();) {
- String fullTargetName = (String) i.next();
- Frame frame = getContainingFrame(fullTargetName);
- String localTargetName = getNameInFrame(fullTargetName);
-
- frame.executeTargetTasks(localTargetName);
- }
- }
-
- /**
- * Execute a task with the given aspect values.
- *
- * @param task the task to be executed.
- * @param namespaceValues the collection of namespace attribute values.
- * @exception AntException if the task has a problem.
- */
- protected void executeTask(Task task,
- NamespaceValueCollection namespaceValues)
- throws AntException {
-
- List aspects = componentManager.getAspects();
- Map aspectContexts = new HashMap();
- for (Iterator i = aspects.iterator(); i.hasNext();) {
- Aspect aspect = (Aspect) i.next();
- Object aspectContext = aspect.preExecuteTask(task, namespaceValues);
- if (aspectContext != null) {
- aspectContexts.put(aspect, aspectContext);
- }
- }
- if (aspectContexts.size() != 0) {
- aspectContextsMap.put(task, aspectContexts);
- }
-
- eventSupport.fireTaskStarted(task);
-
- Throwable failureCause = null;
-
- ExecutionContext execContext = (ExecutionContext) task.getAntContext();
- try {
- ClassLoader currentLoader
- = LoaderUtils.setContextLoader(execContext.getClassLoader());
-
- task.execute();
- LoaderUtils.setContextLoader(currentLoader);
- } catch (Throwable e) {
- failureCause = e;
- }
-
- // Now call back the aspects that registered interest
-
- Set activeAspects = aspectContexts.keySet();
- for (Iterator i = activeAspects.iterator(); i.hasNext();) {
- Aspect aspect = (Aspect) i.next();
- Object aspectContext = aspectContexts.get(aspect);
- failureCause
- = aspect.postExecuteTask(aspectContext, failureCause);
- }
-
- eventSupport.fireTaskFinished(task, failureCause);
- if (aspectContexts.size() != 0) {
- aspectContextsMap.remove(task);
- }
-
- if (failureCause != null) {
- if (failureCause instanceof AntException) {
- throw (AntException) failureCause;
- }
- throw new ExecutionException(failureCause);
- }
- }
-
-
- /**
- * Run the tasks returned by the given iterator
- *
- * @param taskIterator the iterator giving the tasks to execute
- * @exception AntException if there is execution problem while
- * executing tasks
- */
- protected void executeTasks(Iterator taskIterator)
- throws AntException {
-
- if (taskIterator == null) {
- return;
- }
-
- while (taskIterator.hasNext()) {
- BuildElement model = (BuildElement) taskIterator.next();
-
- // what sort of element is this.
- try {
- Object component = componentManager.createComponent(model);
- if (component instanceof Task) {
- execService.executeTask((Task) component);
- }
- } catch (ExecutionException e) {
- e.setLocation(model.getLocation(), false);
- throw e;
- } catch (RuntimeException e) {
- ExecutionException ee =
- new ExecutionException(e, model.getLocation());
-
- throw ee;
- }
- }
-
- }
-
- /**
- * Get the parent frame of this frame.
- *
- * @return the parent frame - may be null if this frame has no parent.
- */
- private Frame getParent() {
- return parent;
- }
-
- /**
- * Get the currently executing target of this frame
- *
- * @return the name of the current target.
- */
- private String getCurrentTarget() {
- return currentTarget;
- }
-
- /**
- * Check for recursion - executing the same target in the same buildfile
- * with the same base directory
- *
- * @param targetName the target to check
- *
- * @exception ExecutionException if the target is already being evaluated
- * in a parent frame.
- */
- private void checkRecursion(String targetName) throws ExecutionException {
- Frame checkFrame = getParent();
- while (checkFrame != null) {
- File checkDir = checkFrame.getBaseDir();
- String checkTarget = checkFrame.getCurrentTarget();
- URL checkURL = checkFrame.getProject().getSourceURL();
- if (targetName.equals(checkTarget)
- && checkDir.equals(getBaseDir())
- && checkURL != null
- && checkURL.equals(getProject().getSourceURL())) {
- throw new ExecutionException("Recursive execution of "
- + "target \"" + targetName + "\" in "
- + "project \"" + checkURL + "\"");
- }
- checkFrame = checkFrame.getParent();
- }
- }
-
- /**
- * Initialize a library in this frame.
- *
- * @param libraryId the library's global identifier.
- *
- * @exception AntException if the library cannot be initialized.
- */
- protected void initializeLibrary(String libraryId)
- throws AntException {
- componentManager.initializeLibrary(libraryId);
- }
-
-
- /**
- * Execute the given target's tasks. The target must be local to this
- * frame's project
- *
- * @param targetName the name of the target within this frame that is to
- * be executed.
- * @exception AntException if there is a problem executing tasks
- */
- protected void executeTargetTasks(String targetName)
- throws AntException {
- checkRecursion(targetName);
- currentTarget = targetName;
-
- Throwable failureCause = null;
- Target target = project.getTarget(targetName);
- String ifCondition = target.getIfCondition();
- String unlessCondition = target.getUnlessCondition();
-
- if (ifCondition != null) {
- ifCondition = dataService.replacePropertyRefs(ifCondition.trim());
- if (!dataService.isDataValueSet(ifCondition)) {
- return;
- }
- }
-
- if (unlessCondition != null) {
- unlessCondition
- = dataService.replacePropertyRefs(unlessCondition.trim());
- if (dataService.isDataValueSet(unlessCondition)) {
- return;
- }
- }
-
- try {
- Iterator taskIterator = target.getTasks();
-
- eventSupport.fireTargetStarted(target);
- executeTasks(taskIterator);
- } catch (ExecutionException e) {
- e.setLocation(target.getLocation(), false);
- failureCause = e;
- throw e;
- } catch (RuntimeException e) {
- ExecutionException ee =
- new ExecutionException(e, target.getLocation());
-
- failureCause = ee;
- throw ee;
- } finally {
- eventSupport.fireTargetFinished(target, failureCause);
- currentTarget = null;
- }
-
- }
-
- /**
- * Start the build. This is only called on the
- * main frame of the build. All subordinate frames use runBuild to
- * process sub builds.
- *
- * This method performs all global config tasks and then starts the
- * build
- *
- * @param targets the targets to be evaluated in this build
- *
- * @exception AntException if there is a problem running the build.
- */
- public void startBuild(List targets) throws AntException {
- eventSupport.fireBuildStarted(project);
-
- Throwable buildFailureCause = null;
- try {
- // load system ant lib
- log("Loading system antlibs.", MessageLevel.DEBUG);
- URL systemLibsURL = antEnv.getSyslibsURL();
- componentManager.loadLib(systemLibsURL, false);
- log("Importing standard components.", MessageLevel.DEBUG);
- importStandardComponents();
-
- log("Executing global configuration tasks", MessageLevel.DEBUG);
- executeTasks(config.getGlobalTasks());
-
- // now load other system libraries
- log("Loading standard antlibs.", MessageLevel.DEBUG);
- URL antLibsURL = antEnv.getAntlibsURL();
- componentManager.loadLib(antLibsURL, false);
-
- runBuild(targets);
- } catch (RuntimeException e) {
- buildFailureCause = e;
- throw e;
- } catch (AntException e) {
- buildFailureCause = e;
- throw e;
- } catch (Throwable e) {
- ExecutionException ee =
- new ExecutionException("Unable to initialize antlibs", e);
- buildFailureCause = ee;
- throw ee;
- } finally {
- eventSupport.fireBuildFinished(project, buildFailureCause);
- }
- }
-
- /**
- * Execute any config and project level tasks
- *
- * @exception AntException if the top level tasks of the frame
- * failed
- */
- private void runGlobalTasks() throws AntException {
- executeTasks(config.getFrameTasks());
- executeTasks(project.getTasks());
- }
-
- /**
- * Set the base director for this frame's execution.
- *
- * @param baseDir the new base directory
- *
- * @exception AntException if the base directory cannot be set.
- */
- protected void setBaseDir(File baseDir) throws AntException {
- FileUtils fileUtils = FileUtils.newFileUtils();
-
- baseDir = fileUtils.normalize(baseDir.getAbsolutePath());
- if (!baseDir.exists()) {
- throw new ExecutionException("Basedir " + baseDir.getAbsolutePath()
- + " does not exist");
- }
- if (!baseDir.isDirectory()) {
- throw new ExecutionException("Basedir " + baseDir.getAbsolutePath()
- + " is not a directory");
- }
- this.baseDir = baseDir;
- dataService.setDataValue(MagicProperties.BASEDIR,
- new DataValue(baseDir.getPath(), DataValue.PRIORITY_USER),
- false);
- log("Project base dir set to: " + this.baseDir,
- MessageLevel.VERBOSE);
- }
-
-
- /**
- * Determine the base directory.
- *
- * @exception AntException if the base directories cannot be
- * determined
- */
- private void determineBaseDir() throws AntException {
- if (dataService.isDataValueSet(MagicProperties.BASEDIR)) {
- String baseDirString
- = dataService.getDataValue(MagicProperties.BASEDIR).toString();
- setBaseDir(new File(baseDirString));
- } else {
- URL projectURL = project.getSourceURL();
-
- if (projectURL.getProtocol().equals("file")) {
- File projectFile = new File(projectURL.getFile());
- File projectFileParent = projectFile.getParentFile();
- String base = project.getBase();
-
- if (base == null) {
- setBaseDir(projectFileParent);
- } else {
- FileUtils fileUtils = FileUtils.newFileUtils();
-
- setBaseDir(fileUtils.resolveFile(projectFileParent, base));
- }
- } else {
- setBaseDir(new File("."));
- }
- }
- }
-
-
- /**
- * Configure the services that the frame makes available to its library
- * components
- *
- * @exception ExecutionException if the services required by the core
- * could not be configured.
- */
- private void configureServices() throws ExecutionException {
- // create services and make them available in our services map
- fileService = new CoreFileService(this);
- componentManager = new ComponentManager(this, libManager);
- dataService = new CoreDataService(this,
- config.isUnsetPropertiesAllowed());
- execService = new CoreExecService(this);
-
- services.put(FileService.class, fileService);
- services.put(ComponentService.class, componentManager);
- services.put(DataService.class, dataService);
- services.put(EventService.class, new CoreEventService(this));
- services.put(ExecService.class, execService);
- services.put(InputService.class, new CoreInputService(this));
- }
-
-
- /**
- * Handle the content from a single thread. This method will be called by
- * the thread producing the content. The content is broken up into
- * separate lines
- *
- * @param line the content produce by the current thread.
- * @param isErr true if this content is from the thread's error stream.
- */
- public void threadOutput(String line, boolean isErr) {
- eventSupport.threadOutput(line, isErr);
- }
-}
-
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ImportInfo.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ImportInfo.java
deleted file mode 100644
index 0539d829e..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/ImportInfo.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-
-import org.apache.ant.antcore.antlib.AntLibDefinition;
-import org.apache.ant.antcore.antlib.ComponentLibrary;
-
-/**
- * This class is used to maintain information about imports
- *
- * @author Conor MacNeill
- * @created 16 January 2002
- */
-public class ImportInfo {
- /** the component library from which the import is made */
- private ComponentLibrary library;
- /** the library definition information */
- private AntLibDefinition libDefinition;
-
- /**
- * ImportInfo records what has been imported from an Ant Library
- *
- * @param library The library from which the import was made
- * @param libDefinition the library definition information
- */
- public ImportInfo(ComponentLibrary library,
- AntLibDefinition libDefinition) {
- this.library = library;
- this.libDefinition = libDefinition;
- }
-
- /**
- * Get the classname that has been imported
- *
- * @return the classname that was imported.
- */
- public String getClassName() {
- return libDefinition.getClassName();
- }
-
- /**
- * Get the library from which the import was made
- *
- * @return the library from which the import was made
- */
- public ComponentLibrary getComponentLibrary() {
- return library;
- }
-
- /**
- * Get the type of the definition that was imported
- *
- * @return the type of definition
- */
- public int getDefinitionType() {
- return libDefinition.getDefinitionType();
- }
-
- /**
- * Get the name of the component within its library.
- *
- * @return the name of the component within its library
- */
- public String getLocalName() {
- return libDefinition.getDefinitionName();
- }
-
- /**
- * Get the definition of the imported component.
- *
- * @return the component's library definition.
- */
- public AntLibDefinition getDefinition() {
- return libDefinition;
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Reflector.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Reflector.java
deleted file mode 100755
index 583ab9edd..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Reflector.java
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import org.apache.ant.common.antlib.Converter;
-import org.apache.ant.common.util.AntException;
-
-/**
- * A reflector is used to set attributes and add nested elements to an
- * instance of an object using reflection. It is the result of class
- * introspection.
- *
- * @author Conor MacNeill
- * @created 19 January 2002
- */
-public class Reflector implements Setter {
-
- /**
- * An element adder is used to add an instance of an element to an of an
- * object. The object being added will have been fully configured by Ant
- * prior to calling this method.
- *
- * @author Conor MacNeill
- * @created 19 January 2002
- */
- private interface ElementAdder {
- /**
- * Add an object to the this container object
- *
- * @param container the object to which the element is the be added
- * @param obj an instance of the nested element
- * @exception InvocationTargetException if the method cannot be
- * invoked
- * @exception IllegalAccessException if the method cannot be invoked
- */
- void add(Object container, Object obj)
- throws InvocationTargetException, IllegalAccessException;
- }
-
- /**
- * Element Creator's a factory method provided by an Ant Library
- * Component for creating its own nested element instances. These
- * methods are now deprecated. It is better to use the add style methods
- * and support polymorphic interfaces.
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
- private interface ElementCreator {
- /**
- * Create a nested element object for the given container object
- *
- * @param container the object in which the nested element is to be
- * created.
- * @return the nested element.
- * @exception InvocationTargetException if the create method fails
- * @exception IllegalAccessException if the create method cannot be
- * accessed
- * @exception InstantiationException if the nested element instance
- * cannot be created.
- */
- Object create(Object container)
- throws InvocationTargetException, IllegalAccessException,
- InstantiationException;
- }
-
-
- /** The method used to add content to the element */
- private Method addTextMethod;
-
- /** the list of attribute setters indexed by their property name */
- private Map attributeSetters = new HashMap();
-
- /**
- * A list of the Java class or interface accetpted by each element adder
- * indexed by the element name
- */
- private Map elementTypes = new HashMap();
-
- /** the collection of element adders indexed by their element names */
- private Map elementAdders = new HashMap();
-
- /** the collection of element creators indexed by their element names */
- private Map elementCreators = new HashMap();
-
- /**
- * Set an attribute value on an object
- *
- * @param obj the object on which the value is being set
- * @param attributeName the name of the attribute
- * @param value the string represenation of the attribute's value
- * @exception AntException if the object does not support the
- * attribute or the object has a problem setting the value
- */
- public void setAttribute(Object obj, String attributeName,
- String value)
- throws AntException {
- String name = attributeName.toLowerCase();
- AttributeSetter as
- = (AttributeSetter) attributeSetters.get(name);
- if (as == null) {
- throw new ExecutionException("Class " + obj.getClass().getName()
- + " doesn't support the \"" + attributeName + "\" attribute");
- }
- try {
- as.set(obj, value);
- } catch (IllegalAccessException e) {
- // impossible as getMethods should only return public methods
- throw new ExecutionException(e);
- } catch (InvocationTargetException ite) {
- Throwable t = ite.getTargetException();
- if (t instanceof ExecutionException) {
- throw (ExecutionException) t;
- }
- throw new ExecutionException(t);
- }
- }
-
- /**
- * Set the method used to add content to the element
- *
- * @param addTextMethod the new addTextMethod value
- */
- public void setAddTextMethod(Method addTextMethod) {
- this.addTextMethod = addTextMethod;
- }
-
- /**
- * Get the type of the given nested element
- *
- * @param elementName the nested element whose type is desired
- * @return the class instance representing the type of the element adder
- */
- public Class getType(String elementName) {
- return (Class) elementTypes.get(elementName);
- }
-
- /**
- * Adds PCDATA to the element
- *
- * @param obj the instance whose content is being provided
- * @param text the required content
- * @exception ExecutionException if the object does not support
- * contentor the object has a problem setting the content
- */
- public void addText(Object obj, String text)
- throws ExecutionException {
-
- if (addTextMethod == null) {
- throw new ExecutionException("Class " + obj.getClass().getName() +
- " doesn't support content");
- }
- try {
- addTextMethod.invoke(obj, new String[]{text});
- } catch (IllegalAccessException ie) {
- // impossible as getMethods should only return public methods
- throw new ExecutionException(ie);
- } catch (InvocationTargetException ite) {
- Throwable t = ite.getTargetException();
- if (t instanceof ExecutionException) {
- throw (ExecutionException) t;
- }
- throw new ExecutionException(t);
- }
- }
-
- /**
- * Add an element to the given object
- *
- * @param obj The object to which the element is being added
- * @param elementName the name of the element
- * @param value the object to be added - the nested element
- * @exception ExecutionException if the object does not support content
- * or the object has a problem setting the content
- */
- public void addElement(Object obj, String elementName, Object value)
- throws ExecutionException {
- String name = elementName.toLowerCase();
- ElementAdder adder = (ElementAdder) elementAdders.get(name);
- if (adder == null) {
- throw new ExecutionException("Class " + obj.getClass().getName()
- + " doesn't support the \"" + elementName
- + "\" nested element");
- }
- try {
- adder.add(obj, value);
- } catch (IllegalAccessException ie) {
- // impossible as getMethods should only return public methods
- throw new ExecutionException(ie);
- } catch (InvocationTargetException ite) {
- Throwable t = ite.getTargetException();
- if (t instanceof ExecutionException) {
- throw (ExecutionException) t;
- }
- throw new ExecutionException(t);
- }
-
- }
-
- /**
- * Create a nested element using the object's element factory method.
- *
- * @param container the object in which the nested element is required.
- * @param elementName the name of the nested element
- * @return the new instance of the nested element
- * @exception ExecutionException if the nested element cannot be
- * created.
- */
- public Object createElement(Object container, String elementName)
- throws ExecutionException {
-
- ElementCreator creator
- = (ElementCreator) elementCreators.get(elementName.toLowerCase());
- if (creator == null) {
- throw new ExecutionException("Class "
- + container.getClass().getName()
- + " doesn't support the \"" + elementName
- + "\" nested element");
- }
-
- try {
- return creator.create(container);
- } catch (IllegalAccessException e) {
- // impossible as getMethods should only return public methods
- throw new ExecutionException(e);
- } catch (InstantiationException e) {
- // impossible as getMethods should only return public methods
- throw new ExecutionException(e);
- } catch (InvocationTargetException e) {
- Throwable t = e.getTargetException();
- if (t instanceof ExecutionException) {
- throw (ExecutionException) t;
- }
- throw new ExecutionException(t);
- }
- }
-
- /**
- * Indicate if the class assocated with this reflector supports the
- * addition of text content.
- *
- * @return true if the class supports an addText method
- */
- public boolean supportsText() {
- return addTextMethod != null;
- }
-
- /**
- * Indicate if the class assocated with this reflector supports the
- * given attribute
- *
- * @param attributeName the name of the attribute
- * @return true if the given attribute is supported
- */
- public boolean supportsAttribute(String attributeName) {
- return attributeSetters.containsKey(attributeName.toLowerCase());
- }
-
- /**
- * Determine if the class associated with this reflector supports a
- * particular nested element via a create factory method
- *
- * @param elementName the name of the element
- * @return true if the class supports creation of that element
- */
- public boolean supportsNestedCreator(String elementName) {
- return elementCreators.containsKey(elementName.toLowerCase());
- }
-
- /**
- * Determine if the class associated with this reflector supports a
- * particular nested element via an add method
- *
- * @param elementName the name of the element
- * @return true if the class supports addition of that element
- */
- public boolean supportsNestedAdder(String elementName) {
- return elementAdders.containsKey(elementName.toLowerCase());
- }
-
- /**
- * Add an attribute setter for the given property. The setter will only
- * be added if it does not override a higher priorty setter
- *
- * @param attributeName the name of the attribute that the setter operates
- * upon.
- * @param setter the AttribnuteSetter instance to use.
- */
- private void addAttributeSetter(String attributeName,
- AttributeSetter setter) {
- String name = attributeName.toLowerCase();
- AttributeSetter currentSetter
- = (AttributeSetter) attributeSetters.get(name);
- if (currentSetter != null) {
- // there is a setter, is it lower down in the class hierarchy
- int currentDepth = currentSetter.getDepth();
- if (currentDepth < setter.getDepth()) {
- return;
- } else if (currentDepth == setter.getDepth()) {
- // now check the types
- Class currentType = currentSetter.getType();
- if (currentType != String.class) {
- return;
- }
- }
- }
- attributeSetters.put(name, setter);
- }
-
-
- /**
- * Determine if the class associated with this reflector supports a
- * particular nested element
- *
- * @param elementName the name of the element
- * @return true if the class supports the given type of nested element
- */
- public boolean supportsNestedElement(String elementName) {
- return supportsNestedAdder(elementName)
- || supportsNestedCreator(elementName);
- }
-
- /**
- * Add a method to the reflector for setting an attribute value
- *
- * @param m the method, obtained by introspection.
- * @param depth the depth of this method's declaration in the class
- * hierarchy
- * @param propertyName the property name the method will set.
- * @param converters A map of converter classes used to convert strings
- * to different types.
- */
- public void addAttributeMethod(Method m, int depth,
- String propertyName, Map converters) {
- Class type = m.getParameterTypes()[0];
-
- if (converters != null && converters.containsKey(type)) {
- // we have a converter to use to convert the String
- // value into something the set method expects.
- Converter converter = (Converter) converters.get(type);
- addConvertingSetter(m, depth, propertyName, converter);
- return;
- }
-
- if (type.equals(String.class)) {
- addAttributeSetter(propertyName, new AttributeSetter(m, depth));
- return;
- }
-
- try {
- final Constructor c =
- type.getConstructor(new Class[]{java.lang.String.class});
- addAttributeSetter(propertyName, new AttributeSetter(m, depth, c));
- return;
- } catch (NoSuchMethodException nme) {
- // ignore
- }
-
- if (converters != null) {
- // desparate by now - try top find a converter which handles a super
- // class of this type and which supports subclass instantiation
- for (Iterator i = converters.keySet().iterator(); i.hasNext();) {
- Class converterType = (Class) i.next();
- if (converterType.isAssignableFrom(type)) {
- // could be a candidate
- Converter converter
- = (Converter) converters.get(converterType);
- if (converter.canConvertSubType(type)) {
- addConvertingSetter(m, depth, propertyName, converter);
- return;
- }
- }
- }
- }
- }
-
- /**
- * Add an element adder method to the list of element adders in the
- * reflector
- *
- * @param m the adder method
- * @param elementName The name of the element for which this adder works
- */
- public void addElementMethod(final Method m, String elementName) {
- final Class type = m.getParameterTypes()[0];
- elementTypes.put(elementName, type);
- elementAdders.put(elementName.toLowerCase(),
- new ElementAdder() {
- public void add(Object container, Object obj)
- throws InvocationTargetException, IllegalAccessException {
- m.invoke(container, new Object[]{obj});
- }
- });
- }
-
-
- /**
- * Add a create factory method.
- *
- * @param m the create method
- * @param elementName the name of the nested element the create method
- * supports.
- */
- public void addCreateMethod(final Method m, String elementName) {
- elementCreators.put(elementName.toLowerCase(),
- new ElementCreator() {
- public Object create(Object container)
- throws InvocationTargetException, IllegalAccessException {
- return m.invoke(container, new Object[]{});
- }
- });
- }
-
- /**
- * Add an attribute setter with an associated converter
- *
- * @param m the attribute setter method
- * @param depth the depth of this method's declaration in the class
- * hierarchy
- * @param propertyName the name of the attribute this method supports
- * @param converter the converter to be used to construct the value
- * expected by the method.
- */
- private void addConvertingSetter(Method m, int depth,
- String propertyName, Converter converter) {
- addAttributeSetter(propertyName,
- new AttributeSetter(m, depth, converter));
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Setter.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Setter.java
deleted file mode 100644
index cc3b8b0a8..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Setter.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import org.apache.ant.common.util.AntException;
-
-/**
- * The Setter interface is used by the Ant core to set values and nested
- * elements in objects being configured.
- *
- * @author Conor MacNeill
- * @created 11 February 2002
- */
-public interface Setter {
- /**
- * Set an attribute value on an object
- *
- * @param obj the object on which the value is being set
- * @param attributeName the name of the attribute
- * @param value the string represenation of the attribute's value
- * @exception AntException if the object does not support the
- * attribute or the object has a problem setting the value
- */
- void setAttribute(Object obj, String attributeName,
- String value)
- throws AntException;
-
- /**
- * Get the type of the given nested element
- *
- * @param elementName the nested element whose type is desired
- * @return the class instance representing the type of the element adder
- */
- Class getType(String elementName);
-
- /**
- * Adds PCDATA to the element
- *
- * @param obj the instance whose content is being provided
- * @param text the required content
- * @exception ExecutionException if the object does not support
- * contentor the object has a problem setting the content
- */
- void addText(Object obj, String text)
- throws ExecutionException;
-
- /**
- * Add an element to the given object
- *
- * @param obj The object to which the element is being added
- * @param elementName the name of the element
- * @param value the object to be added - the nested element
- * @exception ExecutionException if the object does not support content
- * or the object has a problem setting the content
- */
- void addElement(Object obj, String elementName, Object value)
- throws ExecutionException;
-
- /**
- * Create a nested element using the object's element factory method.
- *
- * @param container the object in which the nested element is required.
- * @param elementName the name of the nested element
- * @return the new instance of the nested element
- * @exception ExecutionException if the nested element cannot be
- * created.
- */
- Object createElement(Object container, String elementName)
- throws ExecutionException;
-
- /**
- * Indicate if the class assocated with this reflector supports the
- * addition of text content.
- *
- * @return true if the class supports an addText method
- */
- boolean supportsText();
-
- /**
- * Indicate if the class assocated with this reflector supports the
- * given attribute
- *
- * @param attributeName the name of the attribute
- * @return true if the given attribute is supported
- */
- boolean supportsAttribute(String attributeName);
-
- /**
- * Determine if the class associated with this reflector supports a
- * particular nested element via a create factory method
- *
- * @param elementName the name of the element
- * @return true if the class supports creation of that element
- */
- boolean supportsNestedCreator(String elementName);
-
- /**
- * Determine if the class associated with this reflector supports a
- * particular nested element via an add method
- *
- * @param elementName the name of the element
- * @return true if the class supports addition of that element
- */
- boolean supportsNestedAdder(String elementName);
-
- /**
- * Determine if the class associated with this reflector supports a
- * particular nested element
- *
- * @param elementName the name of the element
- * @return true if the class supports the given type of nested element
- */
- boolean supportsNestedElement(String elementName);
-
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/TaskAdapter.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/TaskAdapter.java
deleted file mode 100755
index f6431dc63..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/TaskAdapter.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.execution;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import org.apache.ant.common.antlib.AbstractTask;
-import org.apache.ant.common.event.MessageLevel;
-
-/**
- * Use introspection to "adapt" an arbitrary Bean (not extending Task, but
- * with similar patterns).
- *
- * @author Conor MacNeill
- * @created 16 January 2002
- */
-public class TaskAdapter extends AbstractTask {
-
- /** The real object that is performing the work */
- private Object worker;
-
- /** the execute method of the real object */
- private Method executeMethod = null;
-
- /**
- * Create an adapter for an arbitraty bean
- *
- * @param taskType the name of the task
- * @param worker an instance of the actual object that does the work
- * @exception ExecutionException if the worker object does not support
- * an execute method
- */
- public TaskAdapter(String taskType, Object worker)
- throws ExecutionException {
- this.worker = worker;
- try {
- Class workerClass = worker.getClass();
- executeMethod = workerClass.getMethod("execute", new Class[0]);
- if (executeMethod == null) {
- throw new ExecutionException("No execute method in the class"
- + " for the <" + taskType + "> task.");
- }
- } catch (NoSuchMethodException e) {
- throw new ExecutionException(e);
- }
- }
-
-
- /**
- * Standard Task execute method. This invokes the execute method of the
- * worker instance
- *
- * @exception ExecutionException if the proxied object throws an exception
- */
- public void execute() throws ExecutionException {
- try {
- executeMethod.invoke(worker, null);
- } catch (InvocationTargetException e) {
- log("Error in " + worker.getClass(), MessageLevel.ERROR);
- Throwable t = e.getTargetException();
- if (t instanceof ExecutionException) {
- throw (ExecutionException) t;
- } else {
- throw new ExecutionException(t);
- }
- } catch (Throwable t) {
- log("Error in " + worker.getClass(), MessageLevel.ERROR);
- throw new ExecutionException(t);
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/frontend/FrontendException.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/frontend/FrontendException.java
deleted file mode 100644
index f4c3e8acd..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/frontend/FrontendException.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.frontend;
-
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.Location;
-
-/**
- * An exception in the frontend set up of an Ant run
- *
- * @author Conor MacNeill
- */
-public class FrontendException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public FrontendException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public FrontendException(String msg, Location location) {
- super(msg, location);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public FrontendException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public FrontendException(String msg, Throwable cause,
- Location location) {
- super(msg, cause, location);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public FrontendException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public FrontendException(Throwable cause, Location location) {
- super(cause, location);
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/frontend/FrontendUtils.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/frontend/FrontendUtils.java
deleted file mode 100644
index 5869dc6dd..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/frontend/FrontendUtils.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.frontend;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.apache.ant.antcore.config.AntConfig;
-import org.apache.ant.antcore.config.AntConfigHandler;
-import org.apache.ant.antcore.xml.ParseContext;
-import org.apache.ant.antcore.xml.XMLParseException;
-import org.apache.ant.init.InitUtils;
-import org.apache.ant.common.constants.Namespace;
-
-/**
- * Frontend Utilities methods and constants.
- *
- * @author Conor MacNeill
- * @created 16 April 2002
- */
-public class FrontendUtils {
- /** The default build file name */
- public static final String DEFAULT_BUILD_FILENAME = "build.ant";
-
- /** The default build file name */
- public static final String DEFAULT_ANT1_FILENAME = "build.xml";
-
-
- /**
- * Get the AntConfig from the given config area if it is available
- *
- * @param configArea the config area from which the config may be read
- * @return the AntConfig instance representing the config info read in
- * from the config area. May be null if the AntConfig is not present
- * @exception FrontendException if the URL for the config file cannotbe
- * formed.
- */
- public static AntConfig getAntConfig(File configArea)
- throws FrontendException {
- File configFile = new File(configArea, "antconfig.xml");
-
- try {
- return getAntConfigFile(configFile);
- } catch (FileNotFoundException e) {
- // ignore if files are not present
- return null;
- }
- }
-
-
- /**
- * Read in a config file
- *
- * @param configFile the file containing the XML config
- * @return the parsed config object
- * @exception FrontendException if the config cannot be parsed
- * @exception FileNotFoundException if the file cannot be found.
- */
- public static AntConfig getAntConfigFile(File configFile)
- throws FrontendException, FileNotFoundException {
- try {
- URL configFileURL = InitUtils.getFileURL(configFile);
-
- ParseContext context = new ParseContext();
-
- AntConfigHandler configHandler = new AntConfigHandler();
-
- context.parse(configFileURL, "antconfig", configHandler);
-
- return configHandler.getAntConfig();
- } catch (MalformedURLException e) {
- throw new FrontendException("Unable to form URL to read "
- + "config from " + configFile, e);
- } catch (XMLParseException e) {
- if (e.getCause() instanceof FileNotFoundException) {
- throw (FileNotFoundException) e.getCause();
- }
-
- throw new FrontendException("Unable to parse config file from "
- + configFile, e, e.getLocation());
- }
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/BuildElementHandler.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/BuildElementHandler.java
deleted file mode 100644
index 858beb900..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/BuildElementHandler.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.modelparser;
-import java.util.Iterator;
-
-import org.apache.ant.common.model.BuildElement;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-/**
- * A BuildElementHandler parses the task elements of a build. Task elements
- * include tasks themselves plus all their nested elements to any depth.
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class BuildElementHandler extends ModelElementHandler {
- /** The task element being parsed by this handler. */
- private BuildElement buildElement;
-
- /**
- * Get the task element being parsed by this handler.
- *
- * @return the BuildElement being parsed.
- */
- public BuildElement getBuildElement() {
- return buildElement;
- }
-
- /**
- * Create a task element handler to parse a task element
- *
- * @param elementName the name of the element - always target
- */
- public void processElement(String elementName) {
- buildElement
- = new BuildElement(getLocation(), elementName);
- setModelElement(buildElement);
-
- for (Iterator i = getAttributes(); i.hasNext();) {
- String attributeName = (String) i.next();
- buildElement.addAttribute(attributeName,
- getAttribute(attributeName));
- }
- addNamespaceAttributes();
- }
-
-
- /**
- * Process a nested element of this task element. All nested elements of
- * a buildElement are themselves buildElements.
- *
- * @param uri The Namespace URI.
- * @param localName The local name (without prefix).
- * @param qualifiedName The qualified name (with prefix)
- * @param attributes The attributes attached to the element.
- * @throws SAXParseException if there is a parsing problem.
- */
- protected void addNestedElement(String uri, String localName,
- String qualifiedName, Attributes attributes)
- throws SAXParseException {
-
- // everything within a task element is also a task element
- BuildElementHandler nestedHandler
- = new BuildElementHandler();
- nestedHandler.start(getParseContext(), getXMLReader(),
- this, getLocator(), attributes, getElementSource(), qualifiedName);
- buildElement.addNestedElement(nestedHandler.getBuildElement());
- }
-
-
- /**
- * This method is called when this element is finished being processed.
- * This is a template method allowing subclasses to complete any
- * necessary processing.
- */
- protected void finish() {
- String content = getContent();
- if (content != null && content.trim().length() != 0) {
- buildElement.addText(getContent());
- }
- }
-
- /**
- * Validate that the given attribute and value are valid.
- *
- * @param attributeName The name of the attributes
- * @param attributeValue The value of the attributes
- */
- protected void validateAttribute(String attributeName,
- String attributeValue) {
- // do nothing - all attributes are OK by default.
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/IncludeHandler.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/IncludeHandler.java
deleted file mode 100644
index e7734bb67..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/IncludeHandler.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.modelparser;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.apache.ant.common.model.Project;
-import org.apache.ant.antcore.xml.ElementHandler;
-import org.apache.ant.antcore.xml.XMLParseException;
-import org.xml.sax.SAXParseException;
-
-/**
- * The include handler is used to read in included projects or fragments
- * into a project.
- *
- * @author Conor MacNeill
- * @created 11 January 2002
- */
-public class IncludeHandler extends ElementHandler {
- /** The attribute name which identifies the fragment to be included */
- public static final String SYSTEMID_ATTR = "fragment";
-
- /** The including project */
- private Project project;
-
-
- /**
- * Create an IncludeHandler.
- *
- * @param project the project into which the include fragment is to be
- * placed
- */
- public IncludeHandler(Project project) {
- this.project = project;
- }
-
-
- /**
- * Process the element.
- *
- * @param elementName the name of the element
- * @exception SAXParseException if there is a problem parsing the
- * element
- */
- public void processElement(String elementName)
- throws SAXParseException {
-
- String includeSystemId = getAttribute(SYSTEMID_ATTR);
- if (includeSystemId == null) {
- throw new SAXParseException("Attribute " + SYSTEMID_ATTR +
- " is required in an element", getLocator());
- }
-
- // create a new parser to read this project relative to the
- // project's URI
- try {
- URL includeURL = new URL(getElementSource(), includeSystemId);
- ProjectHandler includedProjectHandler = new ProjectHandler(project);
- getParseContext().parse(includeURL,
- new String[]{"project", "fragment"},
- includedProjectHandler);
- } catch (MalformedURLException e) {
- throw new SAXParseException("Unable to include " + includeSystemId
- + ": " + e.getMessage(), getLocator());
- } catch (XMLParseException e) {
- throw new SAXParseException("Error parsing included project "
- + includeSystemId + ": " + e.getMessage(), getLocator());
- }
- }
-
- /**
- * Validate that the given attribute and value are valid.
- *
- * @param attributeName The name of the attributes
- * @param attributeValue The value of the attributes
- * @exception SAXParseException if the attribute is not allowed on the
- * element.
- */
- protected void validateAttribute(String attributeName,
- String attributeValue)
- throws SAXParseException {
- if (!attributeName.equals(SYSTEMID_ATTR)) {
- throwInvalidAttribute(attributeName);
- }
- }
-}
-
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/ModelElementHandler.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/ModelElementHandler.java
deleted file mode 100644
index 49edd3b8e..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/ModelElementHandler.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.modelparser;
-import org.apache.ant.antcore.xml.ElementHandler;
-
-import org.apache.ant.common.model.ModelElement;
-import java.util.Iterator;
-import org.apache.ant.common.util.AttributeCollection;
-
-/**
- * A BuildElementHandler parses the task elements of a build. Task elements
- * include tasks themselves plus all their nested elements to any depth.
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public abstract class ModelElementHandler extends ElementHandler {
- /** The model element being parsed by this handler. */
- private ModelElement modelElement;
-
-
- /**
- * Set the model element being handled by this handler
- *
- * @param modelElement The new modelElement value
- */
- protected void setModelElement(ModelElement modelElement) {
- this.modelElement = modelElement;
- }
-
-
- /** Set the end location of the element. */
- protected void finish() {
- if (modelElement != null) {
- modelElement.setEndLocation(getLocation());
- }
- }
-
- /**
- * Add all attributes which belong to namespaces rather than the default
- * namespace for the build files.
- */
- protected void addNamespaceAttributes() {
- for (Iterator i = getNamespaces(); i.hasNext();) {
- String uri = (String) i.next();
- AttributeCollection namespaceValues = getNamespaceAttributes(uri);
- modelElement.addNamespaceAttributes(uri, namespaceValues);
- }
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/NoProjectReadException.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/NoProjectReadException.java
deleted file mode 100644
index 98f08fd94..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/NoProjectReadException.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.modelparser;
-
-/**
- * A NoProjectReadException is used to indicate that a project was not read
- * from the particular source. This will happen if the source is empty.
- *
- * @author Conor MacNeill
- * @created 15 January 2002
- */
-public class NoProjectReadException extends Exception {
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/ProjectHandler.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/ProjectHandler.java
deleted file mode 100644
index d534ee8e0..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/ProjectHandler.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.modelparser;
-import org.apache.ant.common.model.ModelException;
-import org.apache.ant.common.model.Project;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-/**
- * Element to parse the project element. The project handler creates a
- * number of different handlers to which it delegates processing of child
- * elements.
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class ProjectHandler extends ModelElementHandler {
- /** The basedir attribute tag */
- public static final String BASEDIR_ATTR = "basedir";
-
- /** The name attribute */
- public static final String NAME_ATTR = "name";
-
- /** The default attribute name */
- public static final String DEFAULT_ATTR = "default";
-
- /** The name of the element used to define includes */
- public static final String INCLUDE_ELEMENT = "ant:include";
-
- /** The name of the element used to define references */
- public static final String TARGET_ELEMENT = "target";
-
- /** The project being parsed. */
- private Project project;
-
- /** Constructor parsing a new project */
- public ProjectHandler() {
- project = null;
- }
-
- /**
- * Constructor for including a project or fragment into an existing
- * project
- *
- * @param project The project to be configured by the handler
- */
- public ProjectHandler(Project project) {
- this.project = project;
- }
-
- /**
- * Get the project that has been parsed from the element
- *
- * @return the project that has been parsed from the build source
- * @throws NoProjectReadException thrown if no project was read in.
- */
- public Project getProject()
- throws NoProjectReadException {
- if (project == null) {
- throw new NoProjectReadException();
- }
- return project;
- }
-
-
- /**
- * Process the project element
- *
- * @param elementName the name of the element
- * @exception SAXParseException if there is a problem parsing the
- * element
- */
- public void processElement(String elementName)
- throws SAXParseException {
- if (project == null) {
- project = new Project(getElementSource(), getLocation());
- setModelElement(project);
-
- project.setDefaultTarget(getAttribute(DEFAULT_ATTR));
- project.setBase(getAttribute(BASEDIR_ATTR));
- project.setName(getAttribute(NAME_ATTR));
- addNamespaceAttributes();
- }
- }
-
-
- /**
- * Start a new element in the project. Project currently handles the
- * following elements
- *
- *
ref
- *
include
- *
target
- *
- * Everything else is treated as a task.
- *
- * @param uri The Namespace URI.
- * @param localName The local name (without prefix).
- * @param qualifiedName The qualified name (with prefix)
- * @param attributes The attributes attached to the element.
- * @throws SAXParseException if there is a parsing problem.
- */
- protected void addNestedElement(String uri, String localName,
- String qualifiedName, Attributes attributes)
- throws SAXParseException {
-
- if (qualifiedName.equals(INCLUDE_ELEMENT)) {
- IncludeHandler includeHandler = new IncludeHandler(project);
- includeHandler.start(getParseContext(), getXMLReader(),
- this, getLocator(), attributes, getElementSource(),
- qualifiedName);
- } else if (qualifiedName.equals(TARGET_ELEMENT)) {
- TargetHandler targetHandler = new TargetHandler();
- targetHandler.start(getParseContext(), getXMLReader(),
- this, getLocator(), attributes,
- getElementSource(), qualifiedName);
- try {
- project.addTarget(targetHandler.getTarget());
- } catch (ModelException e) {
- throw new SAXParseException(e.getMessage(), getLocator(), e);
- }
- } else {
- // everything else is a task
- BuildElementHandler buildElementHandler = new BuildElementHandler();
- buildElementHandler.start(getParseContext(), getXMLReader(),
- this, getLocator(), attributes, getElementSource(),
- qualifiedName);
- project.addTask(buildElementHandler.getBuildElement());
- }
- }
-
- /**
- * Validate that the given attribute and value are valid.
- *
- * @param attributeName The name of the attributes
- * @param attributeValue The value of the attributes
- * @exception SAXParseException if the attribute is not allowed on the
- * element.
- */
- protected void validateAttribute(String attributeName,
- String attributeValue)
- throws SAXParseException {
- if (!attributeName.equals(BASEDIR_ATTR) &&
- !attributeName.equals(NAME_ATTR) &&
- !attributeName.equals(DEFAULT_ATTR)) {
- throwInvalidAttribute(attributeName);
- }
- }
-}
-
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/TargetHandler.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/TargetHandler.java
deleted file mode 100644
index 1b4adc5ca..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/TargetHandler.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.modelparser;
-import java.util.StringTokenizer;
-
-import org.apache.ant.common.model.Target;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-/**
- * Element handler for the target element
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class TargetHandler extends ModelElementHandler {
- /** The name attribute */
- public static final String NAME_ATTR = "name";
-
- /** The depends attribute name */
- public static final String DEPENDS_ATTR = "depends";
-
- /** The depends attribute name */
- public static final String DESC_ATTR = "description";
-
- /** The if attribute name */
- public static final String IF_ATTR = "if";
-
- /** The unless attribute name */
- public static final String UNLESS_ATTR = "unless";
-
- /** The target being configured. */
- private Target target;
-
- /**
- * Get the target parsed by this handler.
- *
- * @return the Target model object parsed by this handler.
- */
- public Target getTarget() {
- return target;
- }
-
-
- /**
- * Process the target element.
- *
- * @param elementName the name of the element
- * @exception SAXParseException if there is a problem parsing the
- * element
- */
- public void processElement(String elementName)
- throws SAXParseException {
- target = new Target(getLocation(), getAttribute(NAME_ATTR));
- setModelElement(target);
- target.setDescription(getAttribute(DESC_ATTR));
- addNamespaceAttributes();
-
- String depends = getAttribute(DEPENDS_ATTR);
- if (depends != null) {
- StringTokenizer tokenizer = new StringTokenizer(depends, ",");
- while (tokenizer.hasMoreTokens()) {
- String dependency = tokenizer.nextToken().trim();
- target.addDependency(dependency);
- }
- }
- target.setIfCondition(getAttribute(IF_ATTR));
- target.setUnlessCondition(getAttribute(UNLESS_ATTR));
- }
-
-
- /**
- * Process an element within this target. All elements within the target
- * are treated as tasks.
- *
- * @param uri The Namespace URI.
- * @param localName The local name (without prefix).
- * @param qualifiedName The qualified name (with prefix)
- * @param attributes The attributes attached to the element.
- * @throws SAXParseException if there is a parsing problem.
- */
- protected void addNestedElement(String uri, String localName,
- String qualifiedName, Attributes attributes)
- throws SAXParseException {
- // everything is a task
- BuildElementHandler taskHandler = new BuildElementHandler();
- taskHandler.start(getParseContext(), getXMLReader(), this, getLocator(),
- attributes, getElementSource(), qualifiedName);
- target.addTask(taskHandler.getBuildElement());
- }
-
- /**
- * Validate that the given attribute and value are valid.
- *
- * @param attributeName The name of the attributes
- * @param attributeValue The value of the attributes
- * @exception SAXParseException if the attribute is not allowed on the
- * element.
- */
- protected void validateAttribute(String attributeName,
- String attributeValue)
- throws SAXParseException {
- if (!attributeName.equals(NAME_ATTR)
- && !attributeName.equals(DEPENDS_ATTR)
- && !attributeName.equals(DESC_ATTR)
- && !attributeName.equals(IF_ATTR)
- && !attributeName.equals(UNLESS_ATTR)) {
- throwInvalidAttribute(attributeName);
- }
- }
-}
-
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/XMLProjectParser.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/XMLProjectParser.java
deleted file mode 100644
index 7564ba0c9..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/modelparser/XMLProjectParser.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.modelparser;
-import java.net.URL;
-
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.model.Project;
-import org.apache.ant.antcore.xml.ParseContext;
-import org.apache.ant.antcore.xml.XMLParseException;
-import org.apache.ant.common.constants.Namespace;
-
-/**
- * Parses an Ant project model from an XML source using a SAX Parser.
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class XMLProjectParser {
- /**
- * Parse a build file from the given URL.
- *
- * @param buildSource the URL from where the build source may be read.
- * @return a project model representing the project
- * @exception XMLParseException if there is an problem parsing the XML
- * representation
- */
- public Project parseBuildFile(URL buildSource)
- throws XMLParseException {
- try {
- ParseContext context = new ParseContext();
-
- ProjectHandler projectHandler = new ProjectHandler();
-
- context.parse(buildSource, "project", projectHandler);
-
- return projectHandler.getProject();
- } catch (NoProjectReadException e) {
- throw new XMLParseException("No project defined in build source ",
- e, new Location(buildSource.toString()));
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/xml/ElementHandler.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/xml/ElementHandler.java
deleted file mode 100755
index 2fa0fa2f2..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/xml/ElementHandler.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.xml;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import org.apache.ant.common.util.AttributeCollection;
-
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.util.PropertyUtils;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * An Element Handler is a handler which handles a single element by becoming
- * the handler for the parser while processing the element. Any sub elements
- * must be delegated to separate handlers. When this element is finished,
- * control returns to the parent handler.
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public abstract class ElementHandler extends DefaultHandler {
- /** The parsing context for parsing this element */
- private ParseContext context;
-
- /**
- * Locator used to identify where in the build source particular elements
- * occur.
- */
- private Locator locator;
-
- /** The actual XML parser used to parse the build source */
- private XMLReader reader;
-
- /** The parent element handler */
- private ContentHandler parent;
-
- /** The URL from which we are reading source */
- private URL source;
-
- /** The name of this element */
- private String elementName;
-
- /** The attributes read from this element */
- private AttributeCollection elementAttributes;
-
- /**
- * This map contains a set of attribute collections for each namespace
- * encountered.
- */
- private Map namespaces;
-
- /** The content of this element */
- private String content;
-
- /**
- * Get the source which contains this element
- *
- * @return the URL from which this element is being read
- */
- public URL getElementSource() {
- return source;
- }
-
- /**
- * Get an interator over the namespace URIs encountered in the processing
- * of the element
- *
- * @return an iterator over the namespace URIs.
- */
- public Iterator getNamespaces() {
- return namespaces.keySet().iterator();
- }
-
- /**
- * Get the collection of namespace attributes for a given namespace.
- *
- * @param uri the URI of the namespace from which the attribute collection
- * is required.
- * @return an attribute collection if any attributes of the requested
- * namespace have beebn encountered - otherwise null.
- */
- public AttributeCollection getNamespaceAttributes(String uri) {
- return (AttributeCollection) namespaces.get(uri);
- }
-
- /**
- * Gets the attributeValue attribute of the ElementHandler object
- *
- * @param attributeName th name of the attribute
- * @return The corresponding attribute value or null if the attribute wa
- * snot defined.
- */
- public String getAttribute(String attributeName) {
- return elementAttributes.getAttribute(attributeName);
- }
-
- /**
- * Get an attribute as a boolean value
- *
- * @param attributeName the name of the attribute
- * @return the attribute value as a boolean
- */
- protected boolean getBooleanAttribute(String attributeName) {
- return PropertyUtils.toBoolean(getAttribute(attributeName));
- }
-
- /**
- * Get an iterator to this elements attributes
- *
- * @return an iterator over the attribute names
- */
- public Iterator getAttributes() {
- return elementAttributes.getAttributeNames();
- }
-
- /**
- * Gets the content of the element
- *
- * @return The content value
- */
- public String getContent() {
- return content;
- }
-
-
- /**
- * Start this element handler.
- *
- * @param parent the element handler for the element which contains this
- * one.
- * @param locator the locator is used to get location information from
- * elements.
- * @param attributes the element's attributes.
- * @param source the URL from which the XML source is being parsed.
- * @param xmlReader the parser being used
- * @param context the parser context for this element
- * @param elementName the actual element Name for this element in the XML
- * @exception SAXParseException if there is a problem parsing the element
- */
- public final void start(ParseContext context, XMLReader xmlReader,
- ContentHandler parent, Locator locator,
- Attributes attributes, URL source,
- String elementName)
- throws SAXParseException {
- this.context = context;
- this.reader = xmlReader;
- this.parent = parent;
- this.locator = locator;
- this.source = source;
- this.elementName = elementName;
- processAttributes(attributes);
- processElement(elementName);
- reader.setContentHandler(this);
- }
-
-
- /**
- * Process an element. This resolves any namespaces against prefixes
- * declared in the ParseContext.
- *
- * @param uri The Namespace URI.
- * @param localName The local name (without prefix).
- * @param qualifiedName The qualified name (with prefix)
- * @param attributes The attributes attached to the element.
- * @throws SAXParseException if there is a problem parsng the subelement
- */
- public final void startElement(String uri, String localName,
- String qualifiedName, Attributes attributes)
- throws SAXParseException {
- addNestedElement(uri, localName, qualifiedName, attributes);
- }
-
- /**
- * By default an element handler does not support nested elements. This
- * method will always throw an exception. Subclasses should override this
- * method to support their own nested elements
- *
- * @param uri The Namespace URI.
- * @param localName The local name (without prefix).
- * @param qualifiedName The qualified name (with prefix)
- * @param attributes The attributes attached to the element.
- * @throws SAXParseException if there is a problem parsng the subelement
- */
- protected void addNestedElement(String uri, String localName,
- String qualifiedName,
- Attributes attributes)
- throws SAXParseException {
- throw new SAXParseException("<" + elementName + "> does not support a <"
- + qualifiedName + "> nested element", getLocator());
- }
-
-
- /**
- * Handle the end of this element by making the parent element handler the
- * current content handler
- *
- * @param localName The local name (without prefix).
- * @param namespaceURI The Namespace URI.
- * @param qName the qualified name of the element
- */
- public final void endElement(String namespaceURI, String localName,
- String qName) {
- finish();
- reader.setContentHandler(parent);
- }
-
- /**
- * Record content of this element
- *
- * @param buf the buffer containing the content to be added
- * @param start start position in the buffer
- * @param end end position in the buffer
- * @exception SAXParseException if there is a parsing error.
- * @see org.xml.sax.ContentHandler.characters()
- */
- public void characters(char[] buf, int start, int end)
- throws SAXParseException {
- if (content == null) {
- content = "";
- }
- content += new String(buf, start, end);
- }
-
-
- /**
- * Get the current parsing location
- *
- * @return a location instance representing the current parse position
- */
- protected Location getLocation() {
- return new Location(locator.getSystemId(), locator.getLineNumber(),
- locator.getColumnNumber());
- }
-
-
- /**
- * Get the XML Reader being used to parse the XML.
- *
- * @return the XML Reader.
- */
- protected XMLReader getXMLReader() {
- return reader;
- }
-
-
- /**
- * Get the parsing context
- *
- * @return the parsing context of this element
- */
- protected ParseContext getParseContext() {
- return context;
- }
-
-
- /**
- * Get the locator used to locate elements in the XML source as they are
- * parsed.
- *
- * @return the locator object which can be used to determine an elements
- * location within the XML source
- */
- protected Locator getLocator() {
- return locator;
- }
-
-
- /**
- * Process the element.
- *
- * @param elementName the name of the element
- * @exception SAXParseException if there is a problem parsing the element
- */
- protected abstract void processElement(String elementName)
- throws SAXParseException;
-
- /**
- * Process all of the attributes of the element into maps, one for aspects
- * and one for other attributes
- *
- * @param attributes The SAX attributes collection for the element
- * @exception SAXParseException if there is a problem reading the
- * attributes
- */
- protected final void processAttributes(Attributes attributes)
- throws SAXParseException {
- namespaces = new HashMap();
- elementAttributes = new AttributeCollection();
- int length = attributes.getLength();
- for (int i = 0; i < length; ++i) {
- String localName = attributes.getLocalName(i);
- String qName = attributes.getQName(i);
- String uri = attributes.getURI(i);
- if (uri != null && uri.trim().length() == 0) {
- uri = null;
- }
-
- String attributeValue = attributes.getValue(i);
- if (uri != null) {
- AttributeCollection namespaceAttributes
- = (AttributeCollection) namespaces.get(uri);
- if (namespaceAttributes == null) {
- namespaceAttributes = new AttributeCollection();
- namespaces.put(uri, namespaceAttributes);
- }
-
- namespaceAttributes.putAttribute(localName, attributeValue);
- } else {
- validateAttribute(localName, attributeValue);
- elementAttributes.putAttribute(localName, attributeValue);
- }
- }
- }
-
- /**
- * Validate that the given attribute and value are valid. By default all
- * attributes are considered invalid. This method should be overrider by
- * subclasses to allow specific attributes
- *
- * @param attributeName The name of the attributes
- * @param attributeValue The value of the attributes
- * @exception SAXParseException if the attribute is not allowed on the
- * element.
- */
- protected void validateAttribute(String attributeName,
- String attributeValue)
- throws SAXParseException {
- throwInvalidAttribute(attributeName);
- }
-
- /**
- * Throws an invalid attribute exception
- *
- * @param attributeName The name of the invalid attribute
- * @exception SAXParseException always - indicating attribute is invalid
- */
- protected final void throwInvalidAttribute(String attributeName)
- throws SAXParseException {
- throw new SAXParseException("The attribute '" + attributeName
- + "' is not " + "supported by the <" + elementName
- + "> element", getLocator());
- }
-
-
- /**
- * This method is called when this element is finished being processed.
- * This is a template method allowing subclasses to complete any necessary
- * processing.
- */
- protected void finish() {
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/xml/ParseContext.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/xml/ParseContext.java
deleted file mode 100755
index 48df853d4..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/xml/ParseContext.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.xml;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.HashMap;
-import java.net.URL;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.util.CircularDependencyChecker;
-import org.apache.ant.common.util.CircularDependencyException;
-import org.apache.ant.common.util.AntException;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-
-/**
- * Holds the current parsing context.
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class ParseContext {
- /** These are namespace to URIs which need not be declared in the XML */
- private Map knownNamespaces = new HashMap();
-
- /**
- * Used to check if we are trying to parse a build file within its own
- * context.
- */
- private CircularDependencyChecker checker
- = new CircularDependencyChecker("parsing XML");
-
- /** The factory used to create SAX parsers. */
- private SAXParserFactory parserFactory;
-
- /**
- * Initialize a parse context.
- *
- * This method creates the Parser Factory for which it sets the
- * context classloader.
- */
- public ParseContext() {
- Thread thread = Thread.currentThread();
- ClassLoader currentContextLoader = thread.getContextClassLoader();
- try {
- ClassLoader thisLoader = this.getClass().getClassLoader();
- thread.setContextClassLoader(thisLoader);
- parserFactory = SAXParserFactory.newInstance();
- parserFactory.setNamespaceAware(true);
- } finally {
- thread.setContextClassLoader(currentContextLoader);
- }
- }
-
- /**
- * Parse a URL using the given root handler
- *
- * @param source The URL to the source to be parsed
- * @param rootElementName The required root element name
- * @param rootElementHandler The handler for the root element
- * @exception XMLParseException if the element cannot be parsed
- */
- public void parse(URL source, String rootElementName,
- ElementHandler rootElementHandler)
- throws XMLParseException {
- parse(source, new String[]{rootElementName}, rootElementHandler);
- }
-
-
- /**
- * Parse a URL using the given root handler
- *
- * @param source The URL to the source to be parsed
- * @param rootElementNames The allowable root element names
- * @param rootElementHandler The handler for the root element
- * @exception XMLParseException if the element cannot be parsed
- */
- public void parse(URL source, String[] rootElementNames,
- ElementHandler rootElementHandler)
- throws XMLParseException {
- try {
- checker.visitNode(source);
-
- // create a parser for this source
- SAXParser saxParser = null;
-
- Thread thread = Thread.currentThread();
- ClassLoader currentContextLoader = thread.getContextClassLoader();
- try {
- ClassLoader thisLoader = this.getClass().getClassLoader();
- thread.setContextClassLoader(thisLoader);
- saxParser = parserFactory.newSAXParser();
- } finally {
- thread.setContextClassLoader(currentContextLoader);
- }
-
- XMLReader xmlReader = saxParser.getXMLReader();
-
- // create a root handler for this
- RootHandler rootHandler = new RootHandler(this, source, xmlReader,
- rootElementNames, rootElementHandler);
- saxParser.parse(source.toString(), rootHandler);
-
- checker.leaveNode(source);
- } catch (ParserConfigurationException e) {
- throw new XMLParseException(e);
- } catch (SAXParseException e) {
- Location location = new Location(e.getSystemId(),
- e.getLineNumber(), e.getColumnNumber());
- if (e.getException() != null) {
- Throwable nestedException = e.getException();
- if (nestedException instanceof AntException) {
- location = ((AntException) nestedException).getLocation();
- }
- throw new XMLParseException(nestedException, location);
- } else {
- throw new XMLParseException(e, location);
- }
- } catch (SAXException e) {
- throw new XMLParseException(e);
- } catch (IOException e) {
- throw new XMLParseException(e);
- } catch (CircularDependencyException e) {
- throw new XMLParseException(e);
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/xml/RootHandler.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/xml/RootHandler.java
deleted file mode 100755
index e671f2b87..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/xml/RootHandler.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.xml;
-
-import java.net.URL;
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * Handle the root of an XML parse. This class recognizes the root document
- * element and then passes control to the handler for that root element.
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class RootHandler extends DefaultHandler {
- /** The parsing context for this document */
- private ParseContext context;
-
- /**
- * Locator used to identify where in the build source particular
- * elements occur.
- */
- private Locator locator;
-
- /** The actual XML parser used to parse the build source */
- private XMLReader reader;
-
- /** The URL from which the XML source is being read. */
- private URL sourceURL;
-
- /** The allowed names of the root element in this document */
- private String[] allowedRootNames;
-
- /** The handler for the root element */
- private ElementHandler rootElementHandler;
-
-
- /**
- * Handler to handle the document root.
- *
- * @param context The Parser context for this parse operation
- * @param sourceURL URL of the source containing the XML definition
- * @param reader XML parser
- * @param allowedRootNames An array of allowed element names
- * @param rootElementHandler The element handler for the root element
- */
- public RootHandler(ParseContext context, URL sourceURL, XMLReader reader,
- String[] allowedRootNames,
- ElementHandler rootElementHandler) {
- this.context = context;
- this.sourceURL = sourceURL;
- this.reader = reader;
- this.allowedRootNames = allowedRootNames;
- this.rootElementHandler = rootElementHandler;
- }
-
-
- /**
- * Set the locator to use when parsing elements. This is passed onto
- * child elements.
- *
- * @param locator the locator for locating elements in the build source.
- */
- public void setDocumentLocator(Locator locator) {
- this.locator = locator;
- }
-
-
- /**
- * Start a new element in the root. This must be an allowed root element.
- * All other elements are invalid.
- *
- * @param uri The Namespace URI.
- * @param localName The local name (without prefix).
- * @param qualifiedName The qualified name (with prefix)
- * @param attributes The attributes attached to the element.
- * @throws SAXParseException if there is a parsing problem.
- */
- public void startElement(String uri, String localName, String qualifiedName,
- Attributes attributes)
- throws SAXParseException {
- boolean allowed = false;
- for (int i = 0; i < allowedRootNames.length; ++i) {
- if (qualifiedName.equals(allowedRootNames[i])) {
- allowed = true;
- break;
- }
- }
-
- if (allowed) {
- rootElementHandler.start(context, reader, this,
- locator, attributes, sourceURL, qualifiedName);
- } else {
- throw new SAXParseException("<" + qualifiedName
- + "> element was not expected as the root element", locator);
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/xml/XMLParseException.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/xml/XMLParseException.java
deleted file mode 100755
index 516bfe769..000000000
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/xml/XMLParseException.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antcore.xml;
-
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.Location;
-
-/**
- * An XMLParseException is thrown when there is an error parsing the XML
- * representation of an Ant build file.
- *
- * @author Conor MacNeill
- * @created 11 January 2002
- */
-public class XMLParseException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public XMLParseException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public XMLParseException(String msg, Location location) {
- super(msg, location);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public XMLParseException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public XMLParseException(String msg, Throwable cause, Location location) {
- super(msg, cause, location);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public XMLParseException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public XMLParseException(Throwable cause, Location location) {
- super(cause, location);
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/antlib.xml b/proposal/mutant/src/java/antlibs/ant1compat/antlib.xml
deleted file mode 100644
index 50a1570c7..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/antlib.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Ant1CompatException.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Ant1CompatException.java
deleted file mode 100644
index be4f99e90..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Ant1CompatException.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant;
-
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.util.AntException;
-
-/**
- * An exception in the Ant1 compatability layer.
- *
- * @author Conor MacNeill
- */
-public class Ant1CompatException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public Ant1CompatException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public Ant1CompatException(String msg, Location location) {
- super(msg, location);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public Ant1CompatException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public Ant1CompatException(String msg, Throwable cause,
- Location location) {
- super(msg, cause, location);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public Ant1CompatException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public Ant1CompatException(Throwable cause, Location location) {
- super(cause, location);
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Ant1Converter.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Ant1Converter.java
deleted file mode 100644
index cd5bb847d..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Ant1Converter.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant;
-
-import org.apache.ant.common.antlib.AbstractConverter;
-import org.apache.ant.common.antlib.ConverterException;
-import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.Path;
-
-/**
- * A converter to convert to the types supported by the Ant1 Ant library
- *
- * @author Conor MacNeill
- * @created 1 February 2002
- */
-public class Ant1Converter extends AbstractConverter {
-
- /** The project instance for this converter */
- private Project project;
-
- /**
- * Constructor for the Ant1Converter object
- *
- * @param project the project for this converter. It is used in the
- * conversion of some of the supported types.
- */
- public Ant1Converter(Project project) {
- this.project = project;
- }
-
- /**
- * Get the list of classes this converter is able to convert to.
- *
- * @return an array of Class objects representing the classes this
- * converter handles.
- */
- public Class[] getTypes() {
- return new Class[]{Path.class, EnumeratedAttribute.class};
- }
-
- /**
- * Convert a string from the value given to an instance of the given
- * type.
- *
- * @param value The value to be converted
- * @param type the desired type of the converted object
- * @return the value of the converted object
- * @exception ConverterException if the conversion cannot be made
- */
- public Object convert(String value, Class type) throws ConverterException {
- if (type.equals(Path.class)) {
- return new Path(project, value);
- } else if (EnumeratedAttribute.class.isAssignableFrom(type)) {
- try {
- EnumeratedAttribute ea
- = (EnumeratedAttribute) type.newInstance();
- ea.setValue(value);
- return ea;
- } catch (InstantiationException e) {
- throw new ConverterException(e);
- } catch (IllegalAccessException e) {
- throw new ConverterException(e);
- }
-
- } else {
- throw new ConverterException("This converter does not handle "
- + type.getName());
- }
- }
-
- /**
- * This method allows a converter to indicate whether it can create the
- * given type which is a sub-type of one of the converter's main types
- * indicated in getTypes. Most converters can return false here.
- *
- * @param subType the sub-type
- * @return true if this converter can convert a string representation to
- * the given subclass of one of its main class
- */
- public boolean canConvertSubType(Class subType) {
- return EnumeratedAttribute.class.isAssignableFrom(subType);
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Ant1Factory.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Ant1Factory.java
deleted file mode 100644
index 7a0d0dfc0..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Ant1Factory.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.StandardLibFactory;
-import org.apache.ant.common.service.EventService;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.init.LoaderUtils;
-import java.lang.reflect.InvocationTargetException;
-/**
- * The factory object for the Ant1 compatability Ant library
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public class Ant1Factory extends StandardLibFactory {
- /**
- * A Project instance associated with the factory - used in the creation
- * of tasks and types
- */
- private Project project;
- /** The Ant context for this factory */
- private AntContext context;
-
- /**
- * Initialise the factory
- *
- * @param context the context for this factory to use to access core
- * services.
- * @exception AntException if the factory cannot be initialised.
- */
- public void init(AntContext context) throws AntException {
- if (project != null) {
- return;
- }
-
- this.context = context;
- // set the system classpath. In Ant2, the system classpath will not
- // in general, have any useful information. For Ant1 compatability
- // we set it now to include the Ant1 facade classes
- System.setProperty("java.class.path", getAnt1Classpath());
-
- project = new Project(this);
- project.init(context);
-
- EventService eventService =
- (EventService) context.getCoreService(EventService.class);
- eventService.addBuildListener(project);
- }
-
-
- /**
- * Create an instance of the given component class
- *
- * @param componentClass the class for which an instance is required
- * @param localName the name within the library under which the task is
- * defined
- * @return an instance of the required class
- * @exception InstantiationException if the class cannot be instantiated
- * @exception IllegalAccessException if the instance cannot be accessed
- * @exception Ant1CompatException if there is a problem creating the task
- */
- public Object createComponent(Class componentClass, String localName)
- throws InstantiationException, IllegalAccessException,
- Ant1CompatException {
- try {
- java.lang.reflect.Constructor constructor = null;
- // DataType can have a "no arg" constructor or take a single
- // Project argument.
- Object component = null;
- try {
- constructor = componentClass.getConstructor(new Class[0]);
- component = constructor.newInstance(new Object[0]);
- } catch (NoSuchMethodException nse) {
- constructor
- = componentClass.getConstructor(new Class[]{Project.class});
- component = constructor.newInstance(new Object[]{project});
- }
-
- if (component instanceof ProjectComponent) {
- ((ProjectComponent) component).setProject(project);
- }
- return component;
- } catch (InvocationTargetException ite) {
- Throwable t = ite.getTargetException();
- String msg = "Could not create component of type: "
- + componentClass.getName() + " due to " + t;
- throw new Ant1CompatException(msg, t);
- } catch (NoSuchMethodException e) {
- throw new Ant1CompatException("Unable to find an appropriate "
- + "constructor for component " + componentClass.getName(), e);
- }
- }
-
- /**
- * Create an instance of the given class
- *
- * @param requiredClass the class for which an instance is
- * required
- * @return a instance of the required class
- * @exception InstantiationException if the class cannot be instantiated
- * @exception IllegalAccessException if the instance cannot be accessed
- * @exception Ant1CompatException if there is a problem creating the
- * converter
- */
- public Object createInstance(Class requiredClass)
- throws InstantiationException, IllegalAccessException,
- Ant1CompatException {
-
- java.lang.reflect.Constructor c = null;
-
- Object instance = null;
- try {
- try {
- c = requiredClass.getConstructor(new Class[0]);
- instance = c.newInstance(new Object[0]);
- } catch (NoSuchMethodException nse) {
- c = requiredClass.getConstructor(new Class[]{Project.class});
- instance = c.newInstance(new Object[]{project});
- }
-
- return instance;
- } catch (java.lang.reflect.InvocationTargetException ite) {
- Throwable t = ite.getTargetException();
- String msg = "Could not create instance of type: "
- + requiredClass.getName() + " due to " + t;
- throw new Ant1CompatException(msg, t);
- } catch (NoSuchMethodException e) {
- throw new Ant1CompatException("Unable to find an appropriate "
- + "constructor for class " + requiredClass.getName(), e);
- }
- }
-
- /**
- * Register an element which has been created as the result of calling a
- * create method.
- *
- * @param createdElement the element that the component created
- * @exception AntException if there is a problem registering the
- * element
- */
- public void registerCreatedElement(Object createdElement)
- throws AntException {
- if (createdElement instanceof ProjectComponent) {
- ProjectComponent component = (ProjectComponent) createdElement;
- component.setProject(project);
- }
- }
-
- /**
- * Get an Ant1 equivalent classpath
- *
- * @return an Ant1 suitable classpath
- */
- String getAnt1Classpath() {
- ClassLoader classLoader = getClass().getClassLoader();
- String path = LoaderUtils.getClasspath(classLoader);
- return path;
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Ant1InputHandler.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Ant1InputHandler.java
deleted file mode 100644
index 4461bc681..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Ant1InputHandler.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant;
-
-import org.apache.ant.common.service.InputService;
-import org.apache.ant.common.util.AntException;
-import org.apache.tools.ant.input.InputHandler;
-import org.apache.tools.ant.input.InputRequest;
-
-/**
- * Uses the core's input service to handle input
- *
- * @author Conor MacNeill
- * @created 30 April 2002
- */
-public class Ant1InputHandler implements InputHandler {
- /** Core's input service instance */
- private InputService inputService;
-
- /**
- * Constructor for the Ant1InputHandler
- *
- * @param inputService the core's input service instance to which input
- * requests will be delgated.
- */
- public Ant1InputHandler(InputService inputService) {
- this.inputService = inputService;
- }
-
- /**
- * Pass input request into the core service
- *
- * @param request the input request
- * @exception BuildException if there is a problem handling the request.
- */
- public void handleInput(InputRequest request) throws BuildException {
- try {
- inputService.handleInput(request);
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Project.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Project.java
deleted file mode 100644
index 9c106d477..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Project.java
+++ /dev/null
@@ -1,1525 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Stack;
-import java.util.Vector;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.AntLibFactory;
-import org.apache.ant.common.event.MessageLevel;
-import org.apache.ant.common.service.ComponentService;
-import org.apache.ant.common.service.DataService;
-import org.apache.ant.common.service.ExecService;
-import org.apache.ant.common.service.FileService;
-import org.apache.ant.common.service.InputService;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.DataValue;
-import org.apache.ant.common.util.PropertyUtils;
-import org.apache.tools.ant.input.InputHandler;
-import org.apache.tools.ant.types.FilterSet;
-import org.apache.tools.ant.types.FilterSetCollection;
-import org.apache.tools.ant.util.FileUtils;
-
-/**
- * Project facade
- *
- * @author Conor MacNeill
- * @created 30 January 2002
- */
-public class Project implements org.apache.ant.common.event.BuildListener {
- /**
- * A Property key which identifies the Project actiong as proxy for a a
- * project.
- */
- private static final String PROXY_KEY = "_ant.proxy";
-
- /** String which indicates Java version 1.0 */
- public static final String JAVA_1_0 = "1.0";
- /** String which indicates Java version 1.1 */
- public static final String JAVA_1_1 = "1.1";
- /** String which indicates Java version 1.2 */
- public static final String JAVA_1_2 = "1.2";
- /** String which indicates Java version 1.3 */
- public static final String JAVA_1_3 = "1.3";
- /** String which indicates Java version 1.4 */
- public static final String JAVA_1_4 = "1.4";
-
- /**
- * @see MessageLevel.ERR
- */
- public static final int MSG_ERR = MessageLevel.ERROR;
- /**
- * @see MessageLevel.WARN
- */
- public static final int MSG_WARN = MessageLevel.WARNING;
- /**
- * @see MessageLevel.INFO
- */
- public static final int MSG_INFO = MessageLevel.INFO;
- /**
- * @see MessageLevel.VERBOSE
- */
- public static final int MSG_VERBOSE = MessageLevel.VERBOSE;
- /**
- * @see MessageLevel.DEBUG
- */
- public static final int MSG_DEBUG = MessageLevel.DEBUG;
-
- /** The java version detected that Ant is running on */
- private static String javaVersion;
-
- /**
- * A static copy of a context used fro Projects which have been created on
- * the fly. It is used to access the required core services
- */
- private static AntContext sharedContext = null;
-
- /** Called to handle any input requests. */
- private InputHandler inputHandler = null;
-
- /**
- * the factory which created this project instance. This is used to define
- * new types and tasks
- */
- private AntLibFactory factory;
-
- /** Collection of Ant1 type definitions */
- private Hashtable dataClassDefinitions = new Hashtable();
- /** Collection of Ant1 task definitions */
- private Hashtable taskClassDefinitions = new Hashtable();
-
- /** The project description */
- private String description;
-
- /** The global filters of this project */
- private FilterSet globalFilterSet = new FilterSet();
-
- /** The AntContext that is used to access core services */
- private AntContext context;
-
- /** The core's FileService instance */
- private FileService fileService;
-
- /** The core's DataService instance */
- private DataService dataService;
-
- /** Th ecore's execution service */
- private ExecService execService;
-
- /** The core's Component Service instance */
- private ComponentService componentService;
-
- /** Ant1 FileUtils instance for manipulating files */
- private FileUtils fileUtils;
- /** The collection of global filters */
- private FilterSetCollection globalFilters
- = new FilterSetCollection(globalFilterSet);
-
- /** This project's listeners */
- private Vector listeners = new Vector();
-
- /** the target's we have seen */
- private Stack targetStack = new Stack();
-
- /**
- * Flag which indicates if this project object is proxing for a
- * subordinate project which has not yet been created.
- */
- private boolean proxying;
-
- /**
- * The properties which will be passed to the project instance for which
- * we are proxing.
- */
- private Map proxyProperties = new HashMap();
-
- /** The build key used to control the proxied build. */
- private Object proxyBuildKey;
-
- /** The subordinate project if proxying */
- private Project subordinate;
-
- /** The requested base dir */
- private File baseDir = null;
-
- static {
-
- // Determine the Java version by looking at available classes
- // java.lang.StrictMath was introduced in JDK 1.3
- // java.lang.ThreadLocal was introduced in JDK 1.2
- // java.lang.Void was introduced in JDK 1.1
- // Count up version until a NoClassDefFoundError ends the try
-
- try {
- javaVersion = JAVA_1_0;
- Class.forName("java.lang.Void");
- javaVersion = JAVA_1_1;
- Class.forName("java.lang.ThreadLocal");
- javaVersion = JAVA_1_2;
- Class.forName("java.lang.StrictMath");
- javaVersion = JAVA_1_3;
- Class.forName("java.lang.CharSequence");
- javaVersion = JAVA_1_4;
- } catch (ClassNotFoundException cnfe) {
- // swallow as we've hit the max class version that
- // we have
- }
- }
-
- /**
- * Create the project
- *
- * @param factory the factory object creating this project
- */
- public Project(AntLibFactory factory) {
- proxying = false;
- this.factory = factory;
- fileUtils = FileUtils.newFileUtils();
- }
-
- /**
- * The old constructor for Project instances - legacy support.
- *
- * @deprecated
- */
- public Project() {
- if (sharedContext == null) {
- throw new BuildException("Project object can no longer be "
- + "constructed outside Ant execution");
- }
- proxying = true;
- }
-
- /**
- * static query of the java version
- *
- * @return a string indicating the Java version
- */
- public static String getJavaVersion() {
- return javaVersion;
- }
-
- /**
- * returns the boolean equivalent of a string, which is considered true if
- * either "on", "true", or "yes" is found, ignoring case.
- *
- * @param s the string value to be interpreted at a boolean
- * @return the value of s as a boolean
- */
- public static boolean toBoolean(String s) {
- return PropertyUtils.toBoolean(s);
- }
-
- /**
- * Translate a path into its native (platform specific) format.
- *
- * This method uses the PathTokenizer class to separate the input path
- * into its components. This handles DOS style paths in a relatively
- * sensible way. The file separators are then converted to their platform
- * specific versions.
- *
- * @param toProcess the path to be converted
- * @return the native version of to_process or an empty string if
- * to_process is null or empty
- */
- public static String translatePath(String toProcess) {
- if (toProcess == null || toProcess.length() == 0) {
- return "";
- }
-
- StringBuffer path = new StringBuffer(toProcess.length() + 50);
- PathTokenizer tokenizer = new PathTokenizer(toProcess);
- while (tokenizer.hasMoreTokens()) {
- String pathComponent = tokenizer.nextToken();
- pathComponent = pathComponent.replace('/', File.separatorChar);
- pathComponent = pathComponent.replace('\\', File.separatorChar);
- if (path.length() != 0) {
- path.append(File.pathSeparatorChar);
- }
- path.append(pathComponent);
- }
-
- return path.toString();
- }
-
- /**
- * Configure a new project
- *
- * @param buildFile the file containing the XML build definition.
- */
- protected void configure(File buildFile) {
- try {
- // we create an execution frame and link ourselves to the Project
- // object created in that frame
- ExecService sharedExec = (ExecService)
- sharedContext.getCoreService(ExecService.class);
- org.apache.ant.common.model.Project subProject
- = sharedExec.parseXMLBuildFile(buildFile);
- proxyProperties.put(PROXY_KEY,
- new DataValue(this, DataValue.PRIORITY_USER));
- proxyBuildKey
- = sharedExec.setupBuild(subProject, proxyProperties, false);
- sharedExec.initializeBuildLibrary(proxyBuildKey, "ant.ant1compat");
- } catch (AntException e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /**
- * The old initialisation method for Projects. Not used now
- *
- * @exception BuildException if the default task list cannot be loaded
- * @deprecated
- */
- public void init() throws BuildException {
- String defs = "/org/apache/tools/ant/taskdefs/defaults.properties";
-
- try {
- Properties props = new Properties();
- InputStream in = this.getClass().getResourceAsStream(defs);
- if (in == null) {
- throw new BuildException("Can't load default task list");
- }
- props.load(in);
- in.close();
-
- Enumeration enum = props.propertyNames();
- while (enum.hasMoreElements()) {
- String key = (String) enum.nextElement();
- String value = props.getProperty(key);
- try {
- Class taskClass = Class.forName(value);
- taskClassDefinitions.put(key, taskClass);
- } catch (NoClassDefFoundError ncdfe) {
- log("Could not load a dependent class ("
- + ncdfe.getMessage() + ") for task " + key, MSG_DEBUG);
- } catch (ClassNotFoundException cnfe) {
- log("Could not load class (" + value
- + ") for task " + key, MSG_DEBUG);
- }
- }
- } catch (IOException ioe) {
- throw new BuildException("Can't load default task list");
- }
-
- String dataDefs = "/org/apache/tools/ant/types/defaults.properties";
-
- try {
- Properties props = new Properties();
- InputStream in = this.getClass().getResourceAsStream(dataDefs);
- if (in == null) {
- throw new BuildException("Can't load default datatype list");
- }
- props.load(in);
- in.close();
-
- Enumeration enum = props.propertyNames();
- while (enum.hasMoreElements()) {
- String key = (String) enum.nextElement();
- String value = props.getProperty(key);
- try {
- Class dataClass = Class.forName(value);
- dataClassDefinitions.put(key, dataClass);
- } catch (NoClassDefFoundError ncdfe) {
- log("Could not load a dependent class ("
- + ncdfe.getMessage() + ") for type " + key, MSG_DEBUG);
- } catch (ClassNotFoundException cnfe) {
- log("Could not load class (" + value
- + ") for type " + key, MSG_DEBUG);
- }
- }
- } catch (IOException ioe) {
- throw new BuildException("Can't load default datatype list");
- }
- }
-
-
- /**
- * Old method used to execute targets
- *
- * @param targetNames A vector of target name strings to execute. Must not
- * be null.
- * @exception BuildException always
- * @deprecated
- */
- public void executeTargets(Vector targetNames) throws BuildException {
- if (!proxying) {
- throw new BuildException("This interface is no longer available.");
- }
-
- try {
- List targets = new ArrayList();
- for (Iterator i = targetNames.iterator(); i.hasNext();) {
- targets.add(i.next());
- }
-
- ExecService sharedExec = (ExecService)
- sharedContext.getCoreService(ExecService.class);
- execService.runBuild(proxyBuildKey, targets);
- } catch (AntException e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /**
- * Executes the specified target and any targets it depends on.
- *
- * @param targetName The name of the target to execute. Must not be
- * null.
- *
- * @exception BuildException if the build failed
- */
- public void executeTarget(String targetName) throws BuildException {
-
- // sanity check ourselves, if we've been asked to build nothing
- // then we should complain
-
- if (targetName == null) {
- String msg = "No target specified";
- throw new BuildException(msg);
- }
-
- if (!proxying) {
- throw new BuildException("This interface is no longer available.");
- }
-
- try {
- List targets = new ArrayList();
- targets.add(targetName);
-
- ExecService sharedExec = (ExecService)
- sharedContext.getCoreService(ExecService.class);
- execService.runBuild(proxyBuildKey, targets);
- } catch (AntException e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /**
- * set the project description
- *
- * @param description text
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
-
- /**
- * Set a DataValue with the given name.
- *
- * @param name the name of the datavalue
- * @param value the datavalue itself
- * @param mutable true if a value at the same priority can be overwritten.
- */
- private synchronized void setDataValue(String name, DataValue value,
- boolean mutable) {
- if (dataService == null) {
- if (proxyProperties.containsKey(name)) {
- int priority = value.getPriority();
- DataValue current = (DataValue) proxyProperties.get(name);
- int currentPriority = current.getPriority();
- if (currentPriority > priority
- || (currentPriority == priority && !mutable)) {
- log("Ignoring override for data value " + name,
- MessageLevel.VERBOSE);
- return;
- }
- }
- proxyProperties.put(name, value);
- } else {
- try {
- dataService.setDataValue(name, value, true);
- } catch (AntException e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
- }
-
- /**
- * Set a project property
- *
- * @param name the property name
- * @param value the property value
- */
- public void setProperty(String name, String value) {
- setDataValue(name, new DataValue(value, DataValue.PRIORITY_BASE),
- true);
- }
-
- /**
- * Set a property which must be a new value
- *
- * @param name the property name
- * @param value the property value
- */
- public synchronized void setNewProperty(String name, String value) {
- setDataValue(name, new DataValue(value, DataValue.PRIORITY_BASE),
- false);
- }
-
- /**
- * Sets an inherited property of the Project.
- *
- * @param name the property name
- * @param value the property value
- */
- public synchronized void setInheritedProperty(String name, String value) {
- setDataValue(name, new DataValue(value, DataValue.PRIORITY_INHERIT),
- false);
- }
-
- /**
- * Sets a userProperty of the Project.
- *
- * @param name the property name
- * @param value the property value
- */
- public synchronized void setUserProperty(String name, String value) {
- setDataValue(name, new DataValue(value, DataValue.PRIORITY_USER),
- false);
- }
-
- /**
- * Returns a description of the type of the given element, with special
- * handling for instances of tasks and data types.
- *
- * This is useful for logging purposes.
- *
- * @param element The element to describe. Must not be null.
- * @return a description of the element type
- * @since 1.95, Ant 1.5
- */
- public String getElementName(Object element) {
- Hashtable elements = taskClassDefinitions;
- Class elementClass = element.getClass();
- String typeName = "task";
- if (!elements.contains(elementClass)) {
- elements = dataClassDefinitions;
- typeName = "data type";
- if (!elements.contains(elementClass)) {
- elements = null;
- }
- }
-
- if (elements != null) {
- Enumeration e = elements.keys();
- while (e.hasMoreElements()) {
- String name = (String) e.nextElement();
- Class clazz = (Class) elements.get(name);
- if (elementClass.equals(clazz)) {
- return "The <" + name + "> " + typeName;
- }
- }
- }
-
- return "Class " + elementClass.getName();
- }
-
- /**
- * Gets the Antlib factory of the Project
- *
- * @return The project's associated factory object
- */
- public AntLibFactory getFactory() {
- return factory;
- }
-
- /**
- * get the target hashtable
- *
- * @return hashtable, the contents of which can be cast to Target
- */
- public Hashtable getTargets() {
- return new Hashtable();// XXX can't get targets
- }
-
- /**
- * Returns the current datatype definition hashtable. The returned
- * hashtable is "live" and so should not be modified.
- *
- * @return a map of from datatype name to implementing class (String to
- * Class).
- */
- public Hashtable getDataTypeDefinitions() {
- return dataClassDefinitions;
- }
-
- /**
- * Returns the current task definition hashtable. The returned hashtable
- * is "live" and so should not be modified.
- *
- * @return a map of from task name to implementing class (String to
- * Class).
- */
- public Hashtable getTaskDefinitions() {
- return taskClassDefinitions;
- }
-
- /**
- * Gets the buildListeners of the Project
- *
- * @return A Vector of BuildListener instances
- */
- public Vector getBuildListeners() {
- return (Vector) listeners.clone();
- }
-
- /**
- * Gets the AntContext of the Project
- *
- * @return the AntContext
- */
- public AntContext getContext() {
- return context;
- }
-
- /**
- * get the project description
- *
- * @return description or null if no description has been set
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Get the Project's default Target, if any
- *
- * @return the project's default target or null if there is no default.
- * @deprecated
- */
- public String getDefaultTarget() {
- throw new BuildException("The default project target is no longer "
- + "available through this method.");
- }
-
- /**
- * Get a project property
- *
- * @param name the property name
- * @return the value of the property
- */
- public String getProperty(String name) {
- try {
- Object value = dataService.getDataValue(name);
- return value == null ? null : value.toString();
- } catch (AntException e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /**
- * Get a project property. Ant2 does not distinguish between User and
- * system proerties
- *
- * @param name the property name
- * @return the value of the property
- */
- public String getUserProperty(String name) {
- try {
- return dataService.getDataValue(name).toString();
- } catch (AntException e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /**
- * Get a reference to a project property. Note that in Ant2, properties
- * and references occupy the same namespace.
- *
- * @param refId the reference Id
- * @return the object specified by the reference id
- */
- public Object getReference(String refId) {
- try {
- return dataService.getDataValue(refId);
- } catch (AntException e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /**
- * Gets the globalFilterSet of the Project
- *
- * @return the globalFilterSet
- */
- public FilterSet getGlobalFilterSet() {
- return globalFilterSet;
- }
-
- /**
- * Gets the baseDir of the Project
- *
- * @return the baseDir
- */
- public File getBaseDir() {
- return execService.getBaseDir();
- }
-
- /**
- * Gets the coreLoader of the Project
- *
- * @return the coreLoader value
- */
- public ClassLoader getCoreLoader() {
- return getClass().getClassLoader();
- }
-
- /**
- * get a copy of the property hashtable
- *
- * @return the hashtable containing all properties, user included
- */
- public Hashtable getProperties() {
- try {
- Map dataValues = dataService.getAllDataValues();
- Hashtable result = new Hashtable();
- for (Iterator i = dataValues.keySet().iterator(); i.hasNext();) {
- String name = (String) i.next();
- DataValue dataValue = (DataValue) dataValues.get(name);
- if (dataValue.getValue() instanceof String) {
- result.put(name, dataValue.getValue());
- }
- }
-
- return result;
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-
- /**
- * get a copy of the property hashtable
- *
- * @return the hashtable containing all properties, user included
- */
- public Hashtable getUserProperties() {
- return getProperties();
- }
-
- /**
- * Get all references in the project
- *
- * @return the hashtable containing all references
- */
- public Hashtable getReferences() {
- try {
- Map dataValues = dataService.getAllDataValues();
- Hashtable result = new Hashtable();
- for (Iterator i = dataValues.keySet().iterator(); i.hasNext();) {
- String name = (String) i.next();
- DataValue dataValue = (DataValue) dataValues.get(name);
- if (!(dataValue.getValue() instanceof String)) {
- result.put(name, dataValue.getValue());
- }
- }
-
- return result;
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-
- /**
- * Register a task as the current task for a thread. If the task is null,
- * the thread's entry is removed.
- *
- * @param thread the thread on which the task is registered.
- * @param task the task to be registered.
- * @since 1.102, Ant 1.5
- */
- public void registerThreadTask(Thread thread, Task task) {
-// XXX
-// if (task != null) {
-// threadTasks.put(thread, task);
-// } else {
-// threadTasks.remove(thread);
-// }
- }
-
- /**
- * Get the current task assopciated with a thread, if any
- *
- * @param thread the thread for which the task is required.
- * @return the task which is currently registered for the given thread or
- * null if no task is registered.
- */
- public Task getThreadTask(Thread thread) {
- return null;
- // return (Task)threadTasks.get(thread); XXX
- }
-
- /**
- * build started event
- *
- * @param event build started event
- */
- public void buildStarted(org.apache.ant.common.event.BuildEvent event) {
- fireBuildStarted();
- }
-
- /**
- * build finished event
- *
- * @param event build finished event
- */
- public void buildFinished(org.apache.ant.common.event.BuildEvent event) {
- fireBuildFinished(event.getCause());
- }
-
- /**
- * target started event.
- *
- * @param event target started event.
- */
- public void targetStarted(org.apache.ant.common.event.BuildEvent event) {
- Target newTarget = new Target(this);
- org.apache.ant.common.model.Target realTarget =
- (org.apache.ant.common.model.Target) event.getSource();
- newTarget.setName(realTarget.getName());
- targetStack.push(newTarget);
- fireTargetStarted(newTarget);
- }
-
- /**
- * target finished event
- *
- * @param event target finished event
- */
- public void targetFinished(org.apache.ant.common.event.BuildEvent event) {
- org.apache.ant.common.model.Target realTarget =
- (org.apache.ant.common.model.Target) event.getSource();
- Target currentTarget = (Target) targetStack.pop();
- fireTargetFinished(currentTarget, event.getCause());
- currentTarget = null;
- }
-
- /**
- * task started event
- *
- * @param event task started event
- */
- public void taskStarted(org.apache.ant.common.event.BuildEvent event) {
- Object source = event.getSource();
- if (source instanceof Task) {
- fireTaskStarted((Task) source);
- }
- }
-
- /**
- * task finished event
- *
- * @param event task finished event
- */
- public void taskFinished(org.apache.ant.common.event.BuildEvent event) {
- Object source = event.getSource();
- if (source instanceof Task) {
- fireTaskFinished((Task) source, event.getCause());
- }
- }
-
- /**
- * message logged event
- *
- * @param event message logged event
- */
- public void messageLogged(org.apache.ant.common.event.BuildEvent event) {
- Object source = event.getSource();
- if (source instanceof Task) {
- fireMessageLogged((Task) source, event.getMessage(),
- event.getPriority());
- } else {
- fireMessageLogged(this, event.getMessage(),
- event.getPriority());
- }
- }
-
- /**
- * add a build listener to this project
- *
- * @param listener the listener to be added to the project
- */
- public void addBuildListener(BuildListener listener) {
- if (subordinate != null) {
- subordinate.addBuildListener(listener);
- } else {
- listeners.addElement(listener);
- }
- }
-
- /**
- * remove a build listener from this project
- *
- * @param listener the listener to be removed
- */
- public void removeBuildListener(BuildListener listener) {
- listeners.removeElement(listener);
- }
-
- /**
- * Add a reference to an object. Note that in Ant2 objects and properties
- * occupy the same namespace.
- *
- * @param name the reference name
- * @param reference the reference to be added.
- */
- public void addReference(String name, Object reference) {
- DataValue value = new DataValue(reference, DataValue.PRIORITY_BASE);
- setDataValue(name, value, false);
- }
-
-
- /**
- * Convienence method to copy a file from a source to a destination. No
- * filtering is performed.
- *
- * @param sourceFile the source file to be copied
- * @param destFile the destination to which the file is copied
- * @exception IOException if the file cannot be copied
- * @deprecated
- */
- public void copyFile(String sourceFile, String destFile)
- throws IOException {
- fileUtils.copyFile(sourceFile, destFile);
- }
-
- /**
- * Convienence method to copy a file from a source to a destination
- * specifying if token filtering must be used.
- *
- * @param sourceFile the source file to be copied
- * @param destFile the destination to which the file is copied
- * @param filtering true if the copy should apply filters
- * @exception IOException if the file cannot be copied
- * @deprecated
- */
- public void copyFile(String sourceFile, String destFile, boolean filtering)
- throws IOException {
- fileUtils.copyFile(sourceFile, destFile,
- filtering ? globalFilters : null);
- }
-
- /**
- * Convienence method to copy a file from a source to a destination
- * specifying if token filtering must be used and if source files may
- * overwrite newer destination files.
- *
- * @param sourceFile the source file to be copied
- * @param destFile the destination to which the file is copied
- * @param filtering true if the copy should apply filters
- * @param overwrite true if the destination can be overwritten
- * @exception IOException if the file cannot be copied
- * @deprecated
- */
- public void copyFile(String sourceFile, String destFile, boolean filtering,
- boolean overwrite) throws IOException {
- fileUtils.copyFile(sourceFile, destFile,
- filtering ? globalFilters : null, overwrite);
- }
-
- /**
- * Convienence method to copy a file from a source to a destination
- * specifying if token filtering must be used, if source files may
- * overwrite newer destination files and the last modified time of
- * destFile file should be made equal to the last
- * modified time of sourceFile.
- *
- * @param sourceFile the source file to be copied
- * @param destFile the destination to which the file is copied
- * @param filtering true if the copy should apply filters
- * @param overwrite true if the destination can be overwritten
- * @param preserveLastModified true if the last modified time of the
- * source file is preserved
- * @exception IOException if the file cannot be copied
- * @deprecated
- */
- public void copyFile(String sourceFile, String destFile, boolean filtering,
- boolean overwrite, boolean preserveLastModified)
- throws IOException {
- fileUtils.copyFile(sourceFile, destFile,
- filtering ? globalFilters : null,
- overwrite, preserveLastModified);
- }
-
- /**
- * Convienence method to copy a file from a source to a destination. No
- * filtering is performed.
- *
- * @param sourceFile the source file to be copied
- * @param destFile the destination to which the file is copied
- * @exception IOException if the file cannot be copied
- * @deprecated
- */
- public void copyFile(File sourceFile, File destFile) throws IOException {
- fileUtils.copyFile(sourceFile, destFile);
- }
-
- /**
- * Convienence method to copy a file from a source to a destination
- * specifying if token filtering must be used.
- *
- * @param sourceFile the source file to be copied
- * @param destFile the destination to which the file is copied
- * @param filtering true if the copy should apply filters
- * @exception IOException if the file cannot be copied
- * @deprecated
- */
- public void copyFile(File sourceFile, File destFile, boolean filtering)
- throws IOException {
- fileUtils.copyFile(sourceFile, destFile,
- filtering ? globalFilters : null);
- }
-
- /**
- * Convienence method to copy a file from a source to a destination
- * specifying if token filtering must be used and if source files may
- * overwrite newer destination files.
- *
- * @param sourceFile the source file to be copied
- * @param destFile the destination to which the file is copied
- * @param filtering true if the copy should apply filters
- * @param overwrite true if the destination can be overwritten
- * @exception IOException if the file cannot be copied
- * @deprecated
- */
- public void copyFile(File sourceFile, File destFile, boolean filtering,
- boolean overwrite) throws IOException {
- fileUtils.copyFile(sourceFile, destFile,
- filtering ? globalFilters : null, overwrite);
- }
-
- /**
- * Convienence method to copy a file from a source to a destination
- * specifying if token filtering must be used, if source files may
- * overwrite newer destination files and the last modified time of
- * destFile file should be made equal to the last modified
- * time of sourceFile.
- *
- * @param sourceFile the source file to be copied
- * @param destFile the destination to which the file is copied
- * @param filtering true if the copy should apply filters
- * @param overwrite true if the destination can be overwritten
- * @param preserveLastModified true if the last modified time of the
- * source file is preserved
- * @exception IOException if the file cannot be copied
- * @deprecated
- */
- public void copyFile(File sourceFile, File destFile, boolean filtering,
- boolean overwrite, boolean preserveLastModified)
- throws IOException {
- fileUtils.copyFile(sourceFile, destFile,
- filtering ? globalFilters : null, overwrite, preserveLastModified);
- }
-
-
- /**
- * Initialise this project
- *
- * @param context the context the project uses to access core services
- * @exception AntException if the project cannot be initialised.
- */
- public void init(AntContext context) throws AntException {
- initContext(context);
- Object proxy = dataService.getDataValue(PROXY_KEY);
- if (proxy != null) {
- Project proxyProject = (Project) proxy;
- proxyProject.setSubordinate(this);
- }
- init();
- }
-
- /**
- * Connect this project to its subordinate. When the subordinate project
- * is created it will call this method to inform this project. The core
- * services are then initialised using the context of the subordinate
- * project
- *
- * @param subordinate the subordinate project
- * @exception AntException if there is a problem configuring this project
- * to use the subordinate's context.
- */
- private void setSubordinate(Project subordinate) throws AntException {
- initContext(subordinate.getContext());
- // add our listeners to the subordinate
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- BuildListener listener = (BuildListener) i.next();
- subordinate.addBuildListener(listener);
- }
- if (baseDir != null) {
- execService.setBaseDir(baseDir);
- }
- this.subordinate = subordinate;
- }
-
- /**
- * Sets the base directory for the project, checking that the given
- * filename exists and is a directory.
- *
- * @param baseDir The project base directory. Must not be null
- * .
- * @exception BuildException if the directory if invalid
- */
- public void setBasedir(String baseDir) throws BuildException {
- setBaseDir(new File(baseDir));
- }
-
- /**
- * Sets the base directory for the project, checking that the given file
- * exists and is a directory.
- *
- * @param baseDir The project base directory. Must not be null
- * .
- * @exception BuildException if the specified file doesn't exist or isn't
- * a directory
- */
- public void setBaseDir(File baseDir) throws BuildException {
- try {
- if (execService != null) {
- execService.setBaseDir(baseDir);
- }
- this.baseDir = baseDir;
- proxyProperties.put("basedir", baseDir.getPath());
- } catch (AntException e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /**
- * Initialise the context related parts of this project
- *
- * @param context the context the project uses to access core services
- * @exception AntException if the project cannot be initialised.
- */
- public void initContext(AntContext context) throws AntException {
- this.context = context;
- if (sharedContext == null) {
- sharedContext = context;
- }
-
- fileService = (FileService) context.getCoreService(FileService.class);
- dataService = (DataService) context.getCoreService(DataService.class);
- execService = (ExecService) context.getCoreService(ExecService.class);
- componentService = (ComponentService)
- context.getCoreService(ComponentService.class);
-
- InputService inputService
- = (InputService) context.getCoreService(InputService.class);
- setInputHandler(new Ant1InputHandler(inputService));
- }
-
- /**
- * Output a message to the log with the default log level of MSG_INFO
- *
- * @param msg text to log
- */
-
- public void log(String msg) {
- log(msg, MSG_INFO);
- }
-
- /**
- * Output a message to the log with the given log level and an event scope
- * of project
- *
- * @param msg text to log
- * @param msgLevel level to log at
- */
- public void log(String msg, int msgLevel) {
- if (context != null) {
- context.log(msg, msgLevel);
- } else {
- sharedContext.log(msg, msgLevel);
- }
- }
-
- /**
- * Retrieves the current input handler.
- *
- * @return the Project's current input handler.
- */
- public InputHandler getInputHandler() {
- return inputHandler;
- }
-
- /**
- * Sets the input handler
- *
- * @param handler the new input handler to use.
- */
- public void setInputHandler(InputHandler handler) {
- inputHandler = handler;
- }
-
- /**
- * Output a message to the log with the given log level and an event scope
- * of a task
- *
- * @param task task to use in the log
- * @param msg text to log
- * @param msgLevel level to log at
- */
- public void log(Task task, String msg, int msgLevel) {
- if (context != null) {
- context.log(msg, msgLevel);
- } else {
- sharedContext.log(msg, msgLevel);
- }
- }
-
-
- /**
- * Returns the canonical form of a filename.
- *
- * If the specified file name is relative it is resolved with respect to
- * the given root directory.
- *
- * @param fileName The name of the file to resolve. Must not be
- * null.
- * @param rootDir The directory to resolve relative file names with
- * respect to. May be null, in which case the current
- * directory is used.
- * @return the resolved File.
- * @deprecated
- */
- public File resolveFile(String fileName, File rootDir) {
- return fileUtils.resolveFile(rootDir, fileName);
- }
-
- /**
- * Resolve a file relative to the project's basedir
- *
- * @param fileName the file name
- * @return the file as a File resolved relative to the project's basedir
- */
- public File resolveFile(String fileName) {
- try {
- return fileService.resolveFile(fileName);
- } catch (AntException e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /**
- * Replace property references (${} values) in the given string
- *
- * @param value the string in which property references are replaced
- * @return the string with the properties replaced.
- */
- public String replaceProperties(String value) {
- try {
- return dataService.replacePropertyRefs(value);
- } catch (AntException e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /**
- * define a new task
- *
- * @param taskName the anme of the task in build files
- * @param taskClass the class that implements the task
- * @exception BuildException if the task cannot be defined
- */
- public void addTaskDefinition(String taskName, Class taskClass)
- throws BuildException {
- try {
- componentService.taskdef(factory, taskClass.getClassLoader(),
- taskName, taskClass.getName());
- taskClassDefinitions.put(taskName, taskClass);
- } catch (AntException e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /**
- * Add a new type definition
- *
- * @param typeName the name of the type
- * @param typeClass the class which implements the type
- */
- public void addDataTypeDefinition(String typeName, Class typeClass) {
- try {
- componentService.typedef(factory, typeClass.getClassLoader(),
- typeName, typeClass.getName());
- dataClassDefinitions.put(typeName, typeClass);
- } catch (AntException e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /**
- * Create a Task. This faced hard codes a few well known tasks at this
- * time
- *
- * @param taskType the name of the task to be created.
- * @return the created task instance
- * @exception BuildException if there is a build problem
- */
- public Task createTask(String taskType) throws BuildException {
- Task task = null;
- Class taskClass = (Class) taskClassDefinitions.get(taskType);
-
- if (taskClass == null) {
- return null;
- }
-
- try {
- Object taskObject = componentService.createComponent(taskType);
- if (taskObject instanceof Task) {
- task = (Task) taskObject;
- } else {
- TaskAdapter adapter = new TaskAdapter();
- adapter.setProxy(taskObject);
- task = adapter;
- }
- task.setTaskType(taskType);
- task.setTaskName(taskType);
- return task;
- } catch (Throwable e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /**
- * Creates a new instance of a data type.
- *
- * @param typeName The name of the data type to create an instance of.
- * Must not be null.
- * @return an instance of the specified data type, or null if
- * the data type name is not recognised.
- * @exception BuildException if the data type name is recognised but
- * instance creation fails.
- */
- public Object createDataType(String typeName) throws BuildException {
- Class typeClass = (Class) dataClassDefinitions.get(typeName);
-
- if (typeClass == null) {
- return null;
- }
-
- try {
- return componentService.createComponent(typeName);
- } catch (Throwable e) {
- throw new BuildException(e.getMessage(), e);
- }
- }
-
- /** send build started event to the listeners */
- protected void fireBuildStarted() {
- BuildEvent event = new BuildEvent(this);
- Vector listeners = getBuildListeners();
- for (int i = 0; i < listeners.size(); i++) {
- BuildListener listener = (BuildListener) listeners.elementAt(i);
- listener.buildStarted(event);
- }
- }
-
- /**
- * send build finished event to the listeners
- *
- * @param exception exception which indicates failure if not null
- */
- protected void fireBuildFinished(Throwable exception) {
- BuildEvent event = new BuildEvent(this);
- event.setException(exception);
- Vector listeners = getBuildListeners();
- for (int i = 0; i < listeners.size(); i++) {
- BuildListener listener = (BuildListener) listeners.elementAt(i);
- listener.buildFinished(event);
- }
- }
-
-
- /**
- * send target started event to the listeners
- *
- * @param target the target which has started
- */
- protected void fireTargetStarted(Target target) {
- BuildEvent event = new BuildEvent(target);
- Vector listeners = getBuildListeners();
- for (int i = 0; i < listeners.size(); i++) {
- BuildListener listener = (BuildListener) listeners.elementAt(i);
- listener.targetStarted(event);
- }
- }
-
- /**
- * send build finished event to the listeners
- *
- * @param exception exception which indicates failure if not null
- * @param target the target which is just finished
- */
- protected void fireTargetFinished(Target target, Throwable exception) {
- BuildEvent event = new BuildEvent(target);
- event.setException(exception);
- Vector listeners = getBuildListeners();
- for (int i = 0; i < listeners.size(); i++) {
- BuildListener listener = (BuildListener) listeners.elementAt(i);
- listener.targetFinished(event);
- }
- }
-
- /**
- * fire a task started event
- *
- * @param task the task which has started
- */
- protected void fireTaskStarted(Task task) {
- // register this as the current task on the current thread.
- // threadTasks.put(Thread.currentThread(), task);
- BuildEvent event = new BuildEvent(task);
- Vector listeners = getBuildListeners();
- for (int i = 0; i < listeners.size(); i++) {
- BuildListener listener = (BuildListener) listeners.elementAt(i);
- listener.taskStarted(event);
- }
- }
-
- /**
- * Fire a task finished event
- *
- * @param task the task which has finsihed
- * @param exception the exception associated with the task
- */
- protected void fireTaskFinished(Task task, Throwable exception) {
- // threadTasks.remove(Thread.currentThread());
- //System.out.flush();
- // System.err.flush();
- BuildEvent event = new BuildEvent(task);
- event.setException(exception);
- Vector listeners = getBuildListeners();
- for (int i = 0; i < listeners.size(); i++) {
- BuildListener listener = (BuildListener) listeners.elementAt(i);
- listener.taskFinished(event);
- }
- }
-
- /**
- * Fire a message event from the project
- *
- * @param project the project sending the event
- * @param message the message
- * @param priority the messsage priority
- */
- protected void fireMessageLogged(Project project, String message,
- int priority) {
- BuildEvent event = new BuildEvent(project);
- fireMessageLoggedEvent(event, message, priority);
- }
-
- /**
- * Fire a message event from the project
- *
- * @param message the message
- * @param priority the messsage priority
- * @param target the target sending the message
- */
- protected void fireMessageLogged(Target target, String message,
- int priority) {
- BuildEvent event = new BuildEvent(target);
- fireMessageLoggedEvent(event, message, priority);
- }
-
- /**
- * Fire a message event from the project
- *
- * @param message the message
- * @param priority the messsage priority
- * @param task the task sending the message
- */
- protected void fireMessageLogged(Task task, String message,
- int priority) {
- BuildEvent event = new BuildEvent(task);
- fireMessageLoggedEvent(event, message, priority);
- }
-
- /**
- * Fire a message event from the project
- *
- * @param message the message
- * @param priority the messsage priority
- * @param event the message event
- */
- private void fireMessageLoggedEvent(BuildEvent event, String message,
- int priority) {
- event.setMessage(message, priority);
- Vector listeners = getBuildListeners();
- for (int i = 0; i < listeners.size(); i++) {
- BuildListener listener = (BuildListener) listeners.elementAt(i);
- listener.messageLogged(event);
- }
- }
-
- /**
- * Get the name of the project.
- *
- * @return the project name
- */
- public String getName() {
- return execService.getProjectName();
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/ProjectComponent.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/ProjectComponent.java
deleted file mode 100644
index cbb99da79..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/ProjectComponent.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant;
-
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.util.AntException;
-
-/**
- * ProjectComponent facade
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public abstract class ProjectComponent {
- /** The project in which the project component operates */
- protected Project project;
- /** The core context for this component */
- private AntContext context;
- /** The type of the component bneing created */
- private String componentType;
-
- /**
- * Sets the project of the ProjectComponent
- *
- * @param project the project object with which this component is
- * associated
- */
- public void setProject(Project project) {
- this.project = project;
- }
-
- /**
- * Gets the project of the ProjectComponent
- *
- * @return the project
- */
- public Project getProject() {
- return project;
- }
-
- /**
- * Gets the componentType of the ProjectComponent
- *
- * @return the componentType value
- */
- public String getComponentType() {
- return componentType;
- }
-
-
- /**
- * Get the context associated with this component
- *
- * @return the AntContext
- */
- public AntContext getAntContext() {
- return context;
- }
-
- /**
- * Initialise this component
- *
- * @param context the core context for this component
- * @param componentType the component type of this component
- * @exception AntException if the component cannot be initialized
- */
- public void init(AntContext context, String componentType)
- throws AntException {
- this.context = context;
- this.componentType = componentType;
-
- }
-
- /**
- * Log a message as a build event
- *
- * @param message the message to be logged
- * @param level the priority level of the message
- */
- public void log(String message, int level) {
- if (context != null) {
- context.log(message, level);
- }
- }
-
- /**
- * Log a message as a build event
- *
- * @param message the message to be logged
- */
- public void log(String message) {
- log(message, Project.MSG_INFO);
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/ProjectHelper.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/ProjectHelper.java
deleted file mode 100644
index ea86edecb..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/ProjectHelper.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.io.File;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.service.DataService;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.PropertyUtils;
-
-/**
- * Ant1 ProjectHelper facade
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public class ProjectHelper {
- /**
- * This method will parse a string containing ${value} style property
- * values into two lists. The first list is a collection of text
- * fragments, while the other is a set of string property names null
- * entries in the first list indicate a property reference from the
- * second list.
- *
- * @param value the string to be parsed
- * @param fragments the fragments parsed out of the string
- * @param propertyRefs the property refs to be replaced
- */
- public static void parsePropertyString(String value, Vector fragments,
- Vector propertyRefs) {
- try {
- PropertyUtils.parsePropertyString(value, fragments, propertyRefs);
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-
- /**
- * Replace ${} style constructions in the given value with the string
- * value of the corresponding data types.
- *
- * @param value the string to be scanned for property references.
- * @param project the project object which contains the property values
- * @return the string with the property references replaced with their
- * project values
- * @exception BuildException if there is a problem replacing the
- * property values.
- */
- public static String replaceProperties(Project project, String value)
- throws BuildException {
- try {
- AntContext context = project.getContext();
- DataService dataService
- = (DataService) context.getCoreService(DataService.class);
- return dataService.replacePropertyRefs(value);
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-
- /**
- * Replace ${} style constructions in the given value with the string
- * value of the corresponding data types.
- *
- * @param value the string to be scanned for property references.
- * @param project the project object
- * @param keys the collection of property values to use
- * @return the string with the property references replaced with their
- * project values
- */
- public static String replaceProperties(Project project, String value,
- Hashtable keys) {
- try {
- AntContext context = project.getContext();
- DataService dataService
- = (DataService) context.getCoreService(DataService.class);
- return dataService.replacePropertyRefs(value, keys);
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-
- /**
- * Old method to build a project.
- *
- * @param project The project to configure. Must not be null.
- * @param buildFile An XML file giving the project's configuration.
- * Must not be null.
- *
- * @exception BuildException always
- * @deprecated
- */
- public static void configureProject(Project project, File buildFile)
- throws BuildException {
- project.configure(buildFile);
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/RuntimeConfigurable.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/RuntimeConfigurable.java
deleted file mode 100644
index 9769905be..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/RuntimeConfigurable.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
- * .
- */
-package org.apache.tools.ant;
-
-import org.xml.sax.AttributeList;
-
-/**
- * Implementation shell of the corresponding Ant1 class
- *
- * @author Conor MacNeill
- * @created 26 June 2002
- */
-public class RuntimeConfigurable {
-
- /**
- * Sole constructor creating a wrapper for the specified object.
- *
- * @param proxy The element to configure. Must not be null.
- * @param elementTag The tag name generating this element. Should not be
- * null.
- */
- public RuntimeConfigurable(Object proxy, String elementTag) {
- }
-
- /**
- * 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.
- */
- void setProxy(Object proxy) {
- }
-
- /**
- * Sets the attributes for the wrapped element.
- *
- * @param attributes List of attributes defined in the XML for this
- * element. May be null.
- */
- public void setAttributes(AttributeList 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.
- */
- public AttributeList getAttributes() {
- return null;
- }
-
- /**
- * 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) {
- }
-
- /**
- * 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.
- */
- RuntimeConfigurable getChild(int index) {
- return null;
- }
-
- /**
- * 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) {
- }
-
- /**
- * 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) {
- }
-
- /**
- * 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 null;
- }
-
- /**
- * 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 {
- maybeConfigure(p, true);
- }
-
- /**
- * Configures the wrapped element. The attributes and text for the wrapped
- * element are configured. 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.
- * @param configureChildren Whether to configure child elements as well.
- * if true, child elements will be configured after the wrapped
- * element.
- * @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, boolean configureChildren)
- throws BuildException {
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Target.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Target.java
deleted file mode 100644
index 533a3296b..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Target.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant;
-
-/**
- * Ant1 Target facade.
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public class Target {
- /** The project to which this target belongs */
- private Project project;
-
- /** The name of this target */
- private String name;
-
- /**
- * Construct a Target that is part of the project
- *
- * @param project the target's project
- */
- public Target(Project project) {
- this.project = project;
- }
-
- /**
- * set the name of the target
- *
- * @param name the new name value
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * get the project to which this target belongs
- *
- * @return the target's project.
- */
- public Project getProject() {
- return project;
- }
-
- /**
- * Gets the name of the Target
- *
- * @return the target's name
- */
- public String getName() {
- return name;
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Task.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Task.java
deleted file mode 100644
index 05a69ae31..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Task.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant;
-
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.service.ExecService;
-import org.apache.ant.common.util.AntException;
-
-/**
- * Ant1 Task facade
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public abstract class Task extends ProjectComponent
- implements org.apache.ant.common.antlib.Task {
- /** the name of this task */
- protected String taskName;
- /** The target with which this target is associated */
- protected Target target = null;
- /** The type of this target */
- protected String taskType = null;
- /** The description of this task */
- protected String description = null;
- /** The location within the build file of this project component */
- protected Location location;
-
- /**
- * Called by the project to let the task do its work. This method may be
- * called more than once, if the task is invoked more than once.
- * For example,
- * if target1 and target2 both depend on target3, then running
- * "ant target1 target2" will run all tasks in target3 twice.
- *
- * @exception BuildException if something goes wrong with the build
- */
- public void execute() throws BuildException {}
-
- /**
- * Set the name to use in logging messages.
- *
- * @param name the name to use in logging messages.
- */
- public void setTaskName(String name) {
- this.taskName = name;
- }
-
-
- /**
- * Sets the target object of this task.
- *
- * @param target Target in whose scope this task belongs.
- */
- public void setOwningTarget(Target target) {
- this.target = target;
- }
-
-
- /**
- * Has this task been marked invalid?
- *
- * @since Ant 1.5
- */
- protected final boolean isInvalid() {
- return false;
- }
-
- public void maybeConfigure() throws BuildException {
- // XXX
- throw new BuildException("Not supported");
- }
-
- /**
- * Returns the wrapper used for runtime configuration.
- *
- * @return the wrapper used for runtime configuration. This
- * method will generate a new wrapper (and cache it)
- * if one isn't set already.
- */
- public RuntimeConfigurable getRuntimeConfigurableWrapper() {
- // XXX
- throw new BuildException("Not supported");
- }
-
- /**
- * Sets a description of the current action. It will be usefull in
- * commenting what we are doing.
- *
- * @param desc the new description value
- */
- public void setDescription(String desc) {
- description = desc;
- }
-
- /**
- * Get the name to use in logging messages.
- *
- * @return the name to use in logging messages.
- */
- public String getTaskName() {
- return taskName;
- }
-
-
- /**
- * Get the Target to which this task belongs
- *
- * @return the task's target.
- */
- public Target getOwningTarget() {
- return target;
- }
-
- /**
- * Gets the description of the Task
- *
- * @return the task's description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Gets the location of the ProjectComponent's associated model element
- * in the build file
- *
- * @return the location of the associated model element
- */
- public Location getLocation() {
- return location;
- }
-
-
- /**
- * Add a nested task to this Ant1 task.
- *
- * @param task The task to be added
- * @exception AntException if the task cannot be added.
- */
- public void addNestedTask(org.apache.ant.common.antlib.Task task)
- throws AntException {
-
- if (!(this instanceof TaskContainer)) {
- throw new BuildException("Can't add tasks to this task");
- }
- // wrap the Ant2 task in a TaskAdapter
- TaskContainer container = (TaskContainer) this;
- if (task instanceof Task) {
- container.addTask((Task) task);
- } else {
- TaskAdapter adapter = new TaskAdapter();
- adapter.setProxy(task);
- adapter.setProject(getProject());
- adapter.init(task.getAntContext(), task.getComponentType());
- container.addTask(adapter);
- }
- }
-
- /**
- * Initialise this component
- *
- * @param context the core context for this component
- * @param componentType the component type of this component
- * @exception AntException if the component cannot be initialized
- */
- public void init(AntContext context, String componentType)
- throws AntException {
- super.init(context, componentType);
-
- taskType = componentType;
- taskName = componentType;
-
- org.apache.ant.common.util.Location contextLocation
- = context.getLocation();
-
- if (contextLocation
- == org.apache.ant.common.util.Location.UNKNOWN_LOCATION) {
- location = Location.UNKNOWN_LOCATION;
- } else {
- location = new Location(contextLocation.getSource(),
- contextLocation.getLineNumber(),
- contextLocation.getColumnNumber());
- }
- init();
- }
-
-
- /** Initialise this task */
- public void init() {
- }
-
- /** Validate this component */
- public void validateComponent() {
- // no default validation for Ant1 tasks
- }
-
- /** Execute this task sending the appropriate build events */
- public final void perform() {
- try {
- AntContext context = getAntContext();
- ExecService execService
- = (ExecService) context.getCoreService(ExecService.class);
- execService.executeTask(this);
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-
- /**
- * Handle Output produced by the task. When a task prints to System.out
- * the container may catch this and redirect the content back to the
- * task by invoking this method. This method must NOT call System.out,
- * directly or indirectly.
- *
- * @param line The line of content produce by the task
- */
- public void handleSystemOut(String line) {
- handleOutput(line);
- }
-
- /**
- * Handle error information produced by the task. When a task prints to
- * System.err the container may catch this and redirect the content back
- * to the task by invoking this method. This method must NOT call
- * System.err, directly or indirectly.
- *
- * @param line The line of error info produce by the task
- */
- public void handleSystemErr(String line) {
- // default behaviout is to log at WARN level
- handleErrorOutput(line);
- }
-
- /**
- * Handle output captured for this task
- *
- * @param line the captured output
- */
- protected void handleOutput(String line) {
- log(line, Project.MSG_INFO);
- }
-
- /**
- * Handle error output captured for this task
- *
- * @param line the captured error output
- */
- protected void handleErrorOutput(String line) {
- log(line, Project.MSG_ERR);
- }
-
- /**
- * Set the name with which the task has been invoked.
- *
- * @param type the name the task has been invoked as.
- */
- void setTaskType(String type) {
- this.taskType = type;
- }
-
- /**
- * Sets the file location where this task was defined.
- *
- * @param location the new location value
- */
- public void setLocation(Location location) {
- this.location = location;
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/TaskContainer.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/TaskContainer.java
deleted file mode 100644
index 89ed5b8c5..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/TaskContainer.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant;
-
-/**
- * TaskContainer facade
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public interface TaskContainer
- extends org.apache.ant.common.antlib.TaskContainer {
- /**
- * Add a task to this container
- *
- * @param task the task to be added
- */
- void addTask(Task task);
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/input/InputRequest.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/input/InputRequest.java
deleted file mode 100644
index a6df90309..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/input/InputRequest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-
-package org.apache.tools.ant.input;
-
-/**
- * Encapsulates an input request.
- *
- * @author Stefan Bodewig
- * @version $Revision$
- * @since Ant 1.5
- */
-public class InputRequest extends org.apache.ant.common.input.InputRequest {
- /**
- * @param prompt The prompt to show to the user. Must not be null.
- */
- public InputRequest(String prompt) {
- super(prompt);
- }
-}
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/taskdefs/Ant.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/taskdefs/Ant.java
deleted file mode 100644
index 31120bf9e..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/taskdefs/Ant.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant.taskdefs;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.ant.antlib.system.AntBase;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.AntLibFactory;
-import org.apache.ant.common.service.ComponentService;
-import org.apache.ant.common.util.AntException;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-/**
- * Ant facade over system version of Ant
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public class Ant extends Task {
- /** The core Ant implementation to actually use */
- private org.apache.ant.antlib.system.Ant realAnt = null;
-
- /** The properties created by this task */
- private List properties = new ArrayList();
-
- /**
- * If true, inherit all properties from parent Project If false, inherit
- * only userProperties and those defined inside the ant call itself
- *
- * @param value true if the sub-build should receive all properties from
- * this build
- */
- public void setInheritAll(boolean value) {
- realAnt.setInheritAll(value);
- }
-
- /**
- * If true, inherit all references from parent Project If false, inherit
- * only those defined inside the ant call itself
- *
- * @param value true if the subbuild should receive all references from
- * the current build.
- */
- public void setInheritRefs(boolean value) {
- realAnt.setInheritRefs(value);
- }
-
- /**
- * The directory which will be the base directory for the build
- *
- * @param d the base directory for the new build
- */
- public void setDir(File d) {
- realAnt.setDir(d);
- }
-
- /**
- * set the build file, it can be either absolute or relative. If it is
- * absolute, dir will be ignored, if it is relative it will be
- * resolved relative to dir .
- *
- * @param s the name of the ant file either absolute or relative to the
- * sub-build's basedir
- */
- public void setAntfile(String s) {
- realAnt.setAntFile(s);
- }
-
- /**
- * set the target to execute. If none is defined it will execute the
- * default target of the build file
- *
- * @param s the target to eb executed in the sub-build
- */
- public void setTarget(String s) {
- realAnt.setTarget(s);
- }
-
- /**
- * Set the output file in which Ant stores output
- *
- * @param s name of the file to store output.
- */
- public void setOutput(String s) {
- // realAnt.setOutput(s);
- }
-
- /** Initialize the task */
- public void init() {
- AntContext context = getAntContext();
- try {
- ComponentService componentService = getComponentService();
- AntLibFactory factory = getProject().getFactory();
- realAnt = (org.apache.ant.antlib.system.Ant)
- componentService.createComponent("ant.system", "ant");
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-
-
- /**
- * Do the execution.
- *
- * @exception BuildException if the execution of the sub-build has a
- * problem
- */
- public void execute() throws BuildException {
- for (Iterator i = properties.iterator(); i.hasNext();) {
- Property property = (Property) i.next();
- AntBase.Property newProperty = new AntBase.Property();
- newProperty.setName(property.getName());
- newProperty.setValue(property.getValue());
- realAnt.addProperty(newProperty);
- }
- try {
- realAnt.execute();
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-
- /**
- * Create a nested property element.
- *
- * @return the Property object to be configured.
- */
- public Property createProperty() {
- Property property = new Property();
- properties.add(property);
- return property;
- }
-
- /**
- * create a reference element that identifies a data type that should be
- * carried over to the new project.
- *
- * @param r the reference to be added to the call
- */
- public void addReference(AntBase.Reference r) {
- try {
- realAnt.addReference(r);
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-
- /**
- * Gets the componentService
- *
- * @return the componentService instance provided by the core
- * @exception AntException if the service is not available.
- */
- private ComponentService getComponentService() throws AntException {
- AntContext context = getAntContext();
- return (ComponentService)
- context.getCoreService(ComponentService.class);
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/taskdefs/CallTarget.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/taskdefs/CallTarget.java
deleted file mode 100644
index aae5dfd2e..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/taskdefs/CallTarget.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant.taskdefs;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.ant.antlib.system.AntBase;
-import org.apache.ant.antlib.system.AntCall;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.AntLibFactory;
-import org.apache.ant.common.service.ComponentService;
-import org.apache.ant.common.util.AntException;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-/**
- * CallTarget facade over AntCall
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public class CallTarget extends Task {
- /** The core AntCall implementation to actually use */
- private AntCall antCall = null;
-
- /** The properties created by this task */
- private List properties = new ArrayList();
-
- /**
- * If true, inherit all properties from parent Project If false, inherit
- * only userProperties and those defined inside the antcall call itself
- *
- * @param inherit the new inheritAll value
- */
- public void setInheritAll(boolean inherit) {
- antCall.setInheritAll(inherit);
- }
-
- /**
- * Sets the target of the CallTarget
- *
- * @param target the new target value
- */
- public void setTarget(String target) {
- antCall.setTarget(target);
- }
-
- /** Initialize the task */
- public void init() {
- AntContext context = getAntContext();
- try {
- ComponentService componentService = getComponentService();
- AntLibFactory factory = getProject().getFactory();
- antCall = (AntCall) componentService.createComponent("ant.system",
- "antcall");
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-
- /** execute the call */
- public void execute() {
- for (Iterator i = properties.iterator(); i.hasNext();) {
- Property property = (Property) i.next();
- AntBase.Property newProperty = new AntBase.Property();
- newProperty.setName(property.getName());
- newProperty.setValue(property.getValue());
- antCall.addProperty(newProperty);
- }
- try {
- antCall.execute();
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-
- /**
- * Create a nested param element.
- *
- * @return the Property object to be configured.
- */
- public Property createParam() {
- Property property = new Property();
- properties.add(property);
- return property;
- }
-
- /**
- * create a reference element that identifies a data type that should be
- * carried over to the new project.
- *
- * @param r the reference to be added to the call
- */
- public void addReference(AntBase.Reference r) {
- try {
- antCall.addReference(r);
- } catch (AntException e) {
- throw new BuildException(e);
- }
- }
-
- /**
- * Gets the componentService
- *
- * @return the componentService instance provided by the core
- * @exception AntException if the service is not available.
- */
- private ComponentService getComponentService() throws AntException {
- AntContext context = getAntContext();
- return
- (ComponentService) context.getCoreService(ComponentService.class);
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/types/DataType.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/types/DataType.java
deleted file mode 100644
index 297eaeaed..000000000
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/types/DataType.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant.types;
-import java.util.Stack;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-
-import org.apache.tools.ant.ProjectComponent;
-
-/**
- * Ant1 DataType facade
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public abstract class DataType extends ProjectComponent
- implements org.apache.ant.common.antlib.DataType {
-
- /** The description the user has set. */
- protected String description = null;
- /** Value to the refid attribute. */
- protected Reference ref = null;
- /**
- * Are we sure we don't hold circular references?
- *
- * Subclasses are responsible for setting this value to false if we'd
- * need to investigate this condition (usually because a child element
- * has been added that is a subclass of DataType).
- */
- protected boolean checked = true;
-
- /**
- * Sets a description of the current data type. It will be useful in
- * commenting what we are doing.
- *
- * @param desc the new description value
- */
- public void setDescription(String desc) {
- description = desc;
- }
-
- /**
- * Set the value of the refid attribute.
- *
- * Subclasses may need to check whether any other attributes have been
- * set as well or child elements have been created and thus override
- * this method. if they do the must call super.setRefid.
- *
- *
- * @param ref the new refid value
- */
- public void setRefid(Reference ref) {
- this.ref = ref;
- checked = false;
- }
-
- /**
- * Sets the id of the DataType
- *
- * @param id the name under which the data type is to be referenced
- */
- public void setId(String id) {
- project.addReference(id, this);
- }
-
- /**
- * Return the description for the current data type.
- *
- * @return the data type's description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Has the refid attribute of this element been set?
- *
- * @return true if this data type is a refeence to another instance
- */
- public boolean isReference() {
- return ref != null;
- }
-
- /** Validate this component */
- public void validateComponent() {
- // no default validation for Ant1 types
- }
-
-
- /**
- * Performs the check for circular references and returns the referenced
- * object.
- *
- * @param requiredClass the class which the object being referenced must
- * support
- * @param dataTypeName the name of the data type
- * @return the refenced object
- */
- protected Object getCheckedRef(Class requiredClass, String dataTypeName) {
- if (!checked) {
- Stack stk = new Stack();
- stk.push(this);
- dieOnCircularReference(stk, getProject());
- }
-
- Object o = ref.getReferencedObject(getProject());
- if (!(requiredClass.isAssignableFrom(o.getClass()))) {
- String msg = ref.getRefId() + " doesn\'t denote a " + dataTypeName;
- throw new BuildException(msg);
- } else {
- return o;
- }
- }
-
- /**
- * Check to see whether any DataType we hold references to is included
- * in the Stack (which holds all DataType instances that directly or
- * indirectly reference this instance, including this instance itself).
- *
- *
- * If one is included, throw a BuildException created by {@link
- * #circularReference circularReference}.
- *
- * This implementation is appropriate only for a DataType that cannot
- * hold other DataTypes as children.
- *
- * The general contract of this method is that it shouldn't do anything
- * if {@link #checked checked} is true and set it to true
- * on exit.
- *
- * @param stk stack used to check for a circular reference
- * @param p the project
- * @exception BuildException if this data type is a reference to an
- * instance which depends on this data type
- */
- protected void dieOnCircularReference(Stack stk, Project p)
- throws BuildException {
-
- if (checked || !isReference()) {
- return;
- }
- Object o = ref.getReferencedObject(p);
-
- if (o instanceof DataType) {
- if (stk.contains(o)) {
- throw circularReference();
- } else {
- stk.push(o);
- ((DataType) o).dieOnCircularReference(stk, p);
- stk.pop();
- }
- }
- checked = true;
- }
-
- /**
- * Creates an exception that indicates that refid has to be the only
- * attribute if it is set.
- *
- * @return an appropriate excpetion instance
- */
- protected BuildException tooManyAttributes() {
- return new BuildException("You must not specify more than "
- + "one attribute when using refid");
- }
-
- /**
- * Creates an exception that indicates that this XML element must not
- * have child elements if the refid attribute is set.
- *
- * @return an appropriate excpetion instance
- */
- protected BuildException noChildrenAllowed() {
- return new BuildException("You must not specify nested "
- + "elements when using refid");
- }
-
- /**
- * Creates an exception that indicates the user has generated a loop of
- * data types referencing each other.
- *
- * @return an appropriate excpetion instance
- */
- protected BuildException circularReference() {
- return new BuildException("This data type contains a "
- + "circular reference.");
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/monitor/antlib.xml b/proposal/mutant/src/java/antlibs/monitor/antlib.xml
deleted file mode 100644
index a83a6e1a1..000000000
--- a/proposal/mutant/src/java/antlibs/monitor/antlib.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
diff --git a/proposal/mutant/src/java/antlibs/monitor/org/apache/ant/antlib/monitor/MonitorAspect.java b/proposal/mutant/src/java/antlibs/monitor/org/apache/ant/antlib/monitor/MonitorAspect.java
deleted file mode 100644
index f8a34c2ba..000000000
--- a/proposal/mutant/src/java/antlibs/monitor/org/apache/ant/antlib/monitor/MonitorAspect.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.monitor;
-
-import org.apache.ant.common.antlib.AbstractAspect;
-import org.apache.ant.common.antlib.Task;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.model.BuildElement;
-import org.apache.ant.common.model.NamespaceValueCollection;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.event.MessageLevel;
-import java.util.Date;
-import java.io.PrintStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * A monitoring aspect to help understand memory and performance
- * characteristics.
- *
- * @author Conor MacNeill
- */
-public class MonitorAspect extends AbstractAspect {
- /** The log into which monitoring info is written */
- private static PrintStream monitorLog;
-
- /**
- * Create a monitoring aspect instance. There will be one instance per
- * active frame but they all share the same log output.
- */
- public MonitorAspect() {
- synchronized (MonitorAspect.class) {
- if (monitorLog == null) {
- try {
- monitorLog
- = new PrintStream(new FileOutputStream("monitor.log"));
- monitorLog.println("Logging started at " + new Date());
- } catch (IOException e) {
- log("Unable to open monitor log", MessageLevel.WARNING);
- }
- }
- }
- }
-
- /**
- * This join point is activated just prior to task execution.
- *
- * @param task the task being executed.
- * @param namespaceValues a collection of namesapce attribute values for use
- * during the task execution - may be null if no namespace values are
- * provided.
- * @return an object which indicates that this aspect wishes to
- * be notified after execution has been completed, in which case the obkect
- * is returned to provide the aspect its context. If this returns null
- * the aspect's postExecuteTask method will not be invoked.
- * @exception AntException if the aspect cannot process the task.
- */
- public Object preExecuteTask(Task task,
- NamespaceValueCollection namespaceValues)
- throws AntException {
- System.gc();
- AntContext taskContext = task.getAntContext();
- BuildElement model = taskContext.getModel();
- String name = (model == null) ? task.getClass().getName()
- : model.getType();
- return new MonitorRecord(name, taskContext.getLocation());
- }
-
- /**
- * This join point is activated after a task has executed. The aspect
- * may override the task's failure cause by returning a new failure.
- *
- * @param context the context the aspect provided in preExecuteTask.
- * @param failureCause the current failure reason for the task.
- *
- * @return a new failure reason or null if the task is not to fail.
- */
- public Throwable postExecuteTask(Object context, Throwable failureCause) {
- MonitorRecord record = (MonitorRecord) context;
- System.gc();
- record.print(monitorLog);
- return failureCause;
- }
-}
diff --git a/proposal/mutant/src/java/antlibs/monitor/org/apache/ant/antlib/monitor/MonitorRecord.java b/proposal/mutant/src/java/antlibs/monitor/org/apache/ant/antlib/monitor/MonitorRecord.java
deleted file mode 100644
index bda03dadf..000000000
--- a/proposal/mutant/src/java/antlibs/monitor/org/apache/ant/antlib/monitor/MonitorRecord.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.monitor;
-
-import org.apache.ant.common.util.Location;
-import java.io.PrintStream;
-
-/**
- * A record of some performance values at a particular time
- *
- * @author Conor MacNeill
- */
-public class MonitorRecord {
- /** The element name being monitored */
- private String elementName;
-
- /** The location in the build file */
- private Location location;
-
- /** System clock when task started */
- private long startMillis;
-
- /** Starting memory when task started */
- private long startMemory;
-
- /**
- * Get the current used memory from the runtime
- *
- * @return the amount of memory in use.
- */
- private long getMemoryUsage() {
- Runtime rt = Runtime.getRuntime();
- return rt.totalMemory() - rt.freeMemory();
- }
-
- /**
- * Create a monitoring record.
- *
- * @param elementName the name of the element.
- * @param location the build file location of the element.
- */
- public MonitorRecord(String elementName, Location location) {
- this.elementName = elementName;
- this.location = location;
- startMillis = System.currentTimeMillis();
- startMemory = getMemoryUsage();
- }
-
- /**
- * Print a summary of the monitor
- *
- * @param stream the stream onto which the summary is printed.
- */
- public void print(PrintStream stream) {
- long timeDiff = System.currentTimeMillis() - startMillis;
- long memDiff = getMemoryUsage() - startMemory;
- stream.println(location + elementName + " took " + timeDiff
- + " milliseconds, memory used at start " + startMemory
- + " which changed by " + memDiff);
- }
-}
diff --git a/proposal/mutant/src/java/antlibs/script/antlib.xml b/proposal/mutant/src/java/antlibs/script/antlib.xml
deleted file mode 100644
index c573eba65..000000000
--- a/proposal/mutant/src/java/antlibs/script/antlib.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
diff --git a/proposal/mutant/src/java/antlibs/script/org/apache/ant/antlib/script/ScriptBase.java b/proposal/mutant/src/java/antlibs/script/org/apache/ant/antlib/script/ScriptBase.java
deleted file mode 100644
index 724afc3d2..000000000
--- a/proposal/mutant/src/java/antlibs/script/org/apache/ant/antlib/script/ScriptBase.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.script;
-import com.ibm.bsf.BSFEngine;
-import com.ibm.bsf.BSFException;
-import com.ibm.bsf.BSFManager;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.apache.ant.common.antlib.AbstractTask;
-import org.apache.ant.common.antlib.DeferredTask;
-import org.apache.ant.common.antlib.AntContext;
-
-/**
- * Task to import a component or components from a library
- *
- * @author Conor MacNeill
- * @created 27 January 2002
- */
-public class ScriptBase extends AbstractTask implements DeferredTask {
- /** The script factory instance to be used by this script */
- private ScriptFactory factory;
- /** the name to which this script has been defined */
- private String scriptName;
-
- /** the attribute values set by the core */
- private Map attributes = new HashMap();
-
- /** Any embedded set by the core */
- private String text = "";
-
- /** A list of the nested element names which have been configured */
- private List nestedElementNames = new ArrayList();
- /** A list of the nested elements objects which have been configured */
- private List nestedElements = new ArrayList();
-
- /**
- * Set the given attribute
- *
- * @param name the name of the attribute
- * @param attributeValue the new attribute value
- */
- public void setAttribute(String name, String attributeValue) {
- attributes.put(name, attributeValue);
- }
-
- /**
- * Add a nested element
- *
- * @param nestedElementName the nested element's name
- * @param value the object being added
- */
- public void addElement(String nestedElementName, Object value) {
- nestedElementNames.add(nestedElementName);
- nestedElements.add(value);
- }
-
-
- /**
- * Execute the script
- *
- * @exception ScriptException if tghe script execution fails
- */
- public void execute() throws ScriptException {
- String language = factory.getScriptLanguage(scriptName);
- String script = factory.getScript(scriptName);
-
- try {
- BSFManager manager = new BSFManager();
- manager.declareBean("self", this, getClass());
- manager.declareBean("context", getAntContext(), AntContext.class);
-
- // execute the script
- BSFEngine engine = manager.loadScriptingEngine(language);
-
- engine.exec(scriptName, 0, 0, script);
- for (Iterator i = attributes.keySet().iterator(); i.hasNext();) {
- String attributeName = (String) i.next();
- String value = (String) attributes.get(attributeName);
- StringBuffer setter = new StringBuffer(attributeName);
- setter.setCharAt(0, Character.toUpperCase(setter.charAt(0)));
- engine.call(null, "set" + setter, new Object[]{value});
- }
-
- Iterator i = nestedElementNames.iterator();
- Iterator j = nestedElements.iterator();
- while (i.hasNext()) {
- String nestedName = (String) i.next();
- Object nestedElement = j.next();
- StringBuffer adder = new StringBuffer(nestedName);
- adder.setCharAt(0, Character.toUpperCase(adder.charAt(0)));
- engine.call(null, "add" + adder, new Object[]{nestedElement});
- }
-
- engine.call(null, "execute", new Object[]{});
- } catch (BSFException e) {
- Throwable t = e;
- Throwable te = e.getTargetException();
- if (te != null) {
- if (te instanceof ScriptException) {
- throw (ScriptException) te;
- } else {
- t = te;
- }
- }
- throw new ScriptException(t);
- }
- }
-
- /**
- * Defines the script.
- *
- * @param text Sets the value for the script variable.
- */
- public void addText(String text) {
- this.text += text;
- }
-
- /**
- * Sets the factory of the ScriptBase
- *
- * @param factory the script factory this script instance will use
- */
- protected void setFactory(ScriptFactory factory) {
- this.factory = factory;
- }
-
- /**
- * set the name of the script
- *
- * @param scriptName the script's defined name
- */
- protected void setScriptName(String scriptName) {
- this.scriptName = scriptName;
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antlibs/script/org/apache/ant/antlib/script/ScriptDef.java b/proposal/mutant/src/java/antlibs/script/org/apache/ant/antlib/script/ScriptDef.java
deleted file mode 100644
index 702e1469d..000000000
--- a/proposal/mutant/src/java/antlibs/script/org/apache/ant/antlib/script/ScriptDef.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.script;
-
-import org.apache.ant.common.antlib.AbstractTask;
-import org.apache.ant.common.util.AntException;
-
-/**
- * Define a task using a script
- *
- * @author Conor MacNeill
- * @created 11 February 2002
- */
-public class ScriptDef extends AbstractTask {
- /** The script factor to use */
- private ScriptFactory factory;
-
- /** the name by which this script will be activated */
- private String name;
-
- /** the scripting language used by the script */
- private String language;
-
- /** the script itself */
- private String script = "";
-
- /**
- * set the name under which this script will be activated in a build
- * file
- *
- * @param name the name of the script
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Set the scripting language used by this script
- *
- * @param language the scripting language used by this script.
- */
- public void setLanguage(String language) {
- this.language = language;
- }
-
- /**
- * Define the script. The script itself is stored in the factory where
- * it is retried by the ScriptBase instance
- *
- * @exception AntException if the script cannot be defined
- */
- public void execute() throws AntException {
- // tell the factory about this script, under this name.
- factory.defineScript(name, language, script);
- }
-
- /**
- * Defines the script.
- *
- * @param text Sets the value for the script variable.
- */
- public void addText(String text) {
- this.script += text;
- }
-
- /**
- * Set the script factory that will be used to store the script for
- * later execution
- *
- * @param factory the script factory used to store script information.
- */
- protected void setFactory(ScriptFactory factory) {
- this.factory = factory;
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antlibs/script/org/apache/ant/antlib/script/ScriptException.java b/proposal/mutant/src/java/antlibs/script/org/apache/ant/antlib/script/ScriptException.java
deleted file mode 100644
index 0b5c5dd31..000000000
--- a/proposal/mutant/src/java/antlibs/script/org/apache/ant/antlib/script/ScriptException.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.script;
-
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.util.AntException;
-
-/**
- * A Script related exception
- *
- * @author Conor MacNeill
- */
-public class ScriptException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public ScriptException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public ScriptException(String msg, Location location) {
- super(msg, location);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public ScriptException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public ScriptException(String msg, Throwable cause,
- Location location) {
- super(msg, cause, location);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public ScriptException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public ScriptException(Throwable cause, Location location) {
- super(cause, location);
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/script/org/apache/ant/antlib/script/ScriptFactory.java b/proposal/mutant/src/java/antlibs/script/org/apache/ant/antlib/script/ScriptFactory.java
deleted file mode 100644
index a0cc25a40..000000000
--- a/proposal/mutant/src/java/antlibs/script/org/apache/ant/antlib/script/ScriptFactory.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.script;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.StandardLibFactory;
-import org.apache.ant.common.service.ComponentService;
-import org.apache.ant.common.util.AntException;
-
-/**
- * The ScriptFactory class is a factory for the Scripting tasks. It stores
- * the scripts as they are defined
- *
- * @author Conor MacNeill
- * @created 11 February 2002
- */
-public class ScriptFactory extends StandardLibFactory {
- /**
- * An inner class used to record information about defined scripts.
- *
- * @author Conor MacNeill
- * @created 11 February 2002
- */
- private static class ScriptInfo {
- /** the scripting langauge to use */
- private String language;
- /** the script itself */
- private String script;
-
- /**
- * Constructor for the ScriptInfo object
- *
- * @param language the language the script is written in
- * @param script the script
- */
- public ScriptInfo(String language, String script) {
- this.language = language;
- this.script = script;
- }
-
- /**
- * Gets the language of the Script
- *
- * @return the language value
- */
- public String getLanguage() {
- return language;
- }
-
- /**
- * Gets the script.
- *
- * @return the script text
- */
- public String getScript() {
- return script;
- }
- }
-
- /** The core's Component Service instance */
- private ComponentService componentService;
-
- /** the scripts that have been defined */
- private Map scripts = new HashMap();
-
- /**
- * Initialise the factory
- *
- * @param context the factory's context
- * @exception AntException if the factory cannot be initialized
- */
- public void init(AntContext context) throws AntException {
- super.init(context);
- componentService = (ComponentService)
- context.getCoreService(ComponentService.class);
- try {
- Class.forName("com.ibm.bsf.BSFManager");
- } catch (ClassNotFoundException e) {
- throw new ScriptException("The script Ant library requires "
- + "bsf.jar to be available");
- } catch (NoClassDefFoundError e) {
- throw new ScriptException("The script Ant library requires "
- + "bsf.jar to be available. The class " + e.getMessage()
- + "appears to be missing");
- }
- }
-
- /**
- * Create an instance of the given component class
- *
- * @param componentClass the class for which an instance is required
- * @param localName the name within the library undeer which the task is
- * defined
- * @return an instance of the required class
- * @exception InstantiationException if the class cannot be instantiated
- * @exception IllegalAccessException if the instance cannot be accessed
- * @exception AntException if there is a problem creating the task
- */
- public Object createComponent(Class componentClass, String localName)
- throws InstantiationException, IllegalAccessException, AntException {
- Object component = super.createComponent(componentClass, localName);
-
- if (component instanceof ScriptDef) {
- ScriptDef scriptDef = (ScriptDef) component;
- scriptDef.setFactory(this);
- } else if (component instanceof ScriptBase) {
- ScriptBase scriptBase = (ScriptBase) component;
- scriptBase.setFactory(this);
- scriptBase.setScriptName(localName);
- }
- return component;
- }
-
- /**
- * Get the script language of a script
- *
- * @param scriptName the name the script is defined under
- * @return the script language name
- */
- protected String getScriptLanguage(String scriptName) {
- ScriptInfo scriptInfo = (ScriptInfo) scripts.get(scriptName);
- return scriptInfo.getLanguage();
- }
-
- /**
- * Get a script.
- *
- * @param scriptName the name the script is defined under
- * @return the script text
- */
- protected String getScript(String scriptName) {
- ScriptInfo scriptInfo = (ScriptInfo) scripts.get(scriptName);
- return scriptInfo.getScript();
- }
-
- /**
- * Define a script
- *
- * @param name the name the script is to be defined under
- * @param language the language of the scripr
- * @param script the script text
- * @exception AntException if the script cannot be defined
- */
- protected void defineScript(String name, String language, String script)
- throws AntException {
- ScriptInfo scriptDefinition = new ScriptInfo(language, script);
- scripts.put(name, scriptDefinition);
- componentService.taskdef(this, ScriptBase.class.getClassLoader(),
- name, ScriptBase.class.getName());
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/antlib.xml b/proposal/mutant/src/java/antlibs/system/antlib.xml
deleted file mode 100644
index dc9282b53..000000000
--- a/proposal/mutant/src/java/antlibs/system/antlib.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Ant.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Ant.java
deleted file mode 100644
index ace4cc2fb..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Ant.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-import java.io.File;
-import java.io.PrintStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import org.apache.ant.common.model.Project;
-import org.apache.ant.common.service.ExecService;
-import org.apache.ant.common.service.FileService;
-import org.apache.ant.common.service.MagicProperties;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.FileUtils;
-import org.apache.ant.common.logger.DefaultLogger;
-import org.apache.ant.common.event.MessageLevel;
-
-/**
- * The Ant task - used to execute a different build file
- *
- * @author Conor MacNeill
- * @created 4 February 2002
- */
-public class Ant extends AntBase {
- /** The ant file to be run */
- private String antFileName;
- /** the base directory to use for the run */
- private File baseDir;
- /** File to capture any output */
- private String output;
-
-
- /**
- * sets the file containing the XML representation model to build
- *
- * @param antFileName the file to build
- */
- public void setAntFile(String antFileName) {
- this.antFileName = antFileName;
- }
-
-
- /**
- * Set the base directory for the execution of the build
- *
- * @param baseDir the base directory for the build
- */
- public void setDir(File baseDir) {
- this.baseDir = baseDir;
- }
-
-
- /**
- * The output file for capturing the build output
- *
- * @param output the output file for capturing the build output
- */
- public void setOutput(String output) {
- this.output = output;
- }
-
-
- /**
- * Run the sub-build
- *
- * @exception AntException if the build can't be run
- */
- public void execute() throws AntException {
- if (baseDir == null) {
- baseDir = getExecService().getBaseDir();
- }
-
- File antFile = null;
-
- if (antFileName == null) {
- antFile = new File(baseDir, "build.ant");
- if (!antFile.exists()) {
- antFile = new File(baseDir, "build.xml");
- }
- } else {
- antFile
- = FileUtils.newFileUtils().resolveFile(baseDir, antFileName);
- }
-
- setProperty(MagicProperties.BASEDIR, baseDir.getAbsolutePath());
-
- ExecService execService = getExecService();
- Project model = execService.parseXMLBuildFile(antFile);
- Object key = execService.setupBuild(model, getDataValues(), true);
-
- setSubBuildKey(key);
-
- if (output != null) {
- FileService fileService
- = (FileService) getCoreService(FileService.class);
-
- File outfile = null;
- if (baseDir != null) {
- outfile = FileUtils.newFileUtils().resolveFile(baseDir, output);
- } else {
- outfile = fileService.resolveFile(output);
- }
- try {
- PrintStream out
- = new PrintStream(new FileOutputStream(outfile));
- DefaultLogger logger = new DefaultLogger();
- logger.setMessageOutputLevel(MessageLevel.INFO);
- logger.setOutputPrintStream(out);
- logger.setErrorPrintStream(out);
- execService.addBuildListener(key, logger);
- } catch (IOException ex) {
- log("Ant: Can't set output to " + output,
- MessageLevel.INFO);
- }
- }
-
- execService.runBuild(key, getTargets());
- setSubBuildKey(null);
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/AntAspect.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/AntAspect.java
deleted file mode 100644
index f68a13e74..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/AntAspect.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-
-import org.apache.ant.common.antlib.AbstractAspect;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.Task;
-import org.apache.ant.common.antlib.AspectException;
-import org.apache.ant.common.service.DataService;
-import org.apache.ant.common.service.ComponentService;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.model.BuildElement;
-import org.apache.ant.common.model.NamespaceValueCollection;
-import org.apache.ant.common.util.AttributeCollection;
-import org.apache.ant.common.constants.Namespace;
-import org.apache.ant.common.util.DataValue;
-
-/**
- * The Ant aspect - handles all ant aspects
- *
- * @author Conor MacNeill
- */
-public class AntAspect extends AbstractAspect {
- /** The core's data service implementation */
- private DataService dataService = null;
-
- /** The core's component service */
- private ComponentService componentService = null;
-
- /**
- * Initialise the aspect with a context.
- *
- * @param context the aspect's context
- * @exception AntException if the aspect cannot be initialised
- */
- public void init(AntContext context) throws AntException {
- super.init(context);
- dataService = (DataService) context.getCoreService(DataService.class);
- componentService
- = (ComponentService) context.getCoreService(ComponentService.class);
- }
-
-
- /**
- * This join point is activated before a component has been created.
- * The aspect can return an object to be used rather than the core creating
- * the object.
- *
- * @param component the component that has been created. This will be null
- * unless another aspect has created the component
- * @param model the Build model that applies to the component
- *
- * @return a component to use.
- * @exception AntException if the aspect cannot process the component.
- */
- public Object preCreateComponent(Object component, BuildElement model)
- throws AntException {
- String refId
- = model.getNamespaceAttributeValue(Namespace.ANT_META_URI, "refid");
- if (refId != null) {
- if (model.getAttributeNames().hasNext() ||
- model.getNestedElements().hasNext() ||
- model.getText().length() != 0) {
- throw new AspectException("Element <" + model.getType()
- + "> is defined by reference and hence may not specify "
- + "any attributes, nested elements or content",
- model.getLocation());
- }
- Object referredComponent = dataService.getDataValue(refId);
- if (referredComponent == null) {
- throw new AspectException("The given ant:refid value '"
- + refId + "' is not defined", model.getLocation());
- }
- return referredComponent;
- }
- return component;
- }
-
- /**
- * This join point is activated after a component has been created and
- * configured. If the aspect wishes, an object can be returned in place
- * of the one created by Ant.
- *
- * @param component the component that has been created.
- * @param model the Build model used to create the component.
- *
- * @return a replacement for the component if desired. If null is returned
- * the current component is used.
- * @exception AntException if the component cannot be processed.
- */
- public Object postCreateComponent(Object component, BuildElement model)
- throws AntException {
- String typeId
- = model.getNamespaceAttributeValue(Namespace.ANT_META_URI, "id");
-
- if (typeId != null) {
- dataService.setDataValue(typeId,
- new DataValue(component, DataValue.PRIORITY_BASE), true);
- }
-
- return super.postCreateComponent(component, model);
- }
-
- /**
- * This join point is activated just prior to task execution.
- *
- * @param task the task being executed.
- * @param namespaceValues a collection of namespace attribute values for use
- * during the task execution.
- *
- * @return an objectwhich indicates that this aspect wishes to
- * be notified after execution has been completed, in which case the obkect
- * is returned to provide the aspect its context. If this returns null
- * the aspect's postExecuteTask method will not be invoked.
- * @exception AntException if the aspect cannot process the task.
- */
- public Object preExecuteTask(Task task,
- NamespaceValueCollection namespaceValues)
- throws AntException {
- AntAspectContext aspectContext = new AntAspectContext();
- AttributeCollection antAspectValues
- = namespaceValues.getAttributes(Namespace.ANT_META_URI);
- if (antAspectValues == null) {
- return null;
- }
-
- componentService.configureAttributes(aspectContext, antAspectValues,
- true);
- if (aspectContext.isRequired()) {
- return aspectContext;
- }
- return null;
- }
-
- /**
- * This join point is activated after a task has executed. The aspect
- * may override the task's failure cause by returning a new failure.
- *
- * @param context the context the aspect provided in preExecuteTask.
- * @param failureCause the current failure reason for the task.
- *
- * @return a new failure reason or null if the task is not to fail.
- */
- public Throwable postExecuteTask(Object context, Throwable failureCause) {
- AntAspectContext aspectContext = (AntAspectContext) context;
- if (!aspectContext.getFailOnError()) {
- return null;
- }
- return super.postExecuteTask(context, failureCause);
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/AntAspectContext.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/AntAspectContext.java
deleted file mode 100644
index 00ec71df4..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/AntAspectContext.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-
-/**
- * The context for the Ant Aspect
- *
- * @author Conor MacNeill
- */
-public class AntAspectContext {
- /** Indicates if the task's execution should not fail */
- private boolean failOnError = true;
-
- /**
- * Set the flag covering whether a task failure halts the build.
- *
- * @param failOnError false if the build should continue.
- */
- public void setFailOnError(boolean failOnError) {
- this.failOnError = failOnError;
- }
-
- /**
- * Indicate whether a task failure halts the build.
- *
- * @return true if a task error causes the build to fail.
- */
- public boolean getFailOnError() {
- return failOnError;
- }
-
- /**
- * Indicate if this aspect context is required - i.e. whether the
- * aspect needs to be reactivated after task execution
- *
- * @return true if the context should be used and the aspect reactivated
- * after task execution.
- */
- public boolean isRequired() {
- return failOnError != true;
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/AntBase.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/AntBase.java
deleted file mode 100644
index 3c7849f9c..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/AntBase.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.apache.ant.common.service.DataService;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.DataValue;
-
-/**
- * Common Base class for the Ant and AntCall tasks
- *
- * @author Conor MacNeill
- * @created 4 February 2002
- */
-public abstract class AntBase extends SubBuild {
-
- /**
- * flag which indicates if all current properties should be passed to the
- * subbuild
- */
- private boolean inheritAll = true;
-
- /**
- * flag which indicates if all current references should be passed to the
- * subbuild
- */
- private boolean inheritRefs = false;
-
- /**
- * The key to the subbuild with which the Ant task can manage the subbuild
- */
- private Object subbuildKey;
-
- /** The name of the target to be evaluated in the sub-build */
- private String targetName;
-
- /**
- * Get the properties to be used with the sub-build
- *
- * @return the properties the sub-build will start with
- * @exception AntException if the data values cannot be combined with
- * existing values.
- */
- protected Map getDataValues() throws AntException {
- DataService dataService = getDataService();
- int priority = inheritAll ? DataValue.PRIORITY_BASE
- : DataValue.PRIORITY_INHERIT;
-
- Map values = new HashMap(super.getDataValues());
- dataService.mergeDataValues(values, dataService.getAllDataValues(),
- priority);
- return values;
- }
-
-
- /**
- * Get the list of targets to be executed
- *
- * @return A List of string target names.
- */
- protected List getTargets() {
- List targets = new ArrayList();
-
- if (targetName != null) {
- targets.add(targetName);
- }
- return targets;
- }
-
-
- /**
- * Handle error information produced by the task. When a task prints to
- * System.err the container may catch this and redirect the content back
- * to the task by invoking this method. This method must NOT call
- * System.err, directly or indirectly.
- *
- * @param line The line of error info produce by the task
- * @exception AntException if the output cannot be handled.
- */
- public void handleSystemErr(String line) throws AntException {
- if (subbuildKey == null) {
- super.handleSystemErr(line);
- } else {
- getExecService().handleBuildOutput(subbuildKey, line, true);
- }
- }
-
-
- /**
- * Handle Output produced by the task. When a task prints to System.out
- * the container may catch this and redirect the content back to the task
- * by invoking this method. This method must NOT call System.out, directly
- * or indirectly.
- *
- * @param line The line of content produce by the task
- * @exception AntException if the output cannot be handled.
- */
- public void handleSystemOut(String line) throws AntException {
- if (subbuildKey == null) {
- super.handleSystemOut(line);
- } else {
- getExecService().handleBuildOutput(subbuildKey, line, false);
- }
- }
-
-
- /**
- * Indicate if all properties should be passed
- *
- * @param inheritAll true if all properties should be passed
- */
- public void setInheritAll(boolean inheritAll) {
- this.inheritAll = inheritAll;
- }
-
-
- /**
- * Indicate if all references are to be passed to the subbuild
- *
- * @param inheritRefs true if the sub-build should be given all the
- * current references
- */
- public void setInheritRefs(boolean inheritRefs) {
- this.inheritRefs = inheritRefs;
- }
-
-
- /**
- * Set the key of the subbuild
- *
- * @param key the key returned by the Ant core for managing the subbuild
- */
- protected void setSubBuildKey(Object key) {
- this.subbuildKey = key;
- }
-
-
- /**
- * Sets the target to be executed in the subbuild
- *
- * @param targetName the name of the target to build
- */
- public void setTarget(String targetName) {
- this.targetName = targetName;
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/AntCall.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/AntCall.java
deleted file mode 100644
index d7b2d7b6e..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/AntCall.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.service.MagicProperties;
-
-/**
- * The Ant task - used to execute a different build file
- *
- * @author Conor MacNeill
- * @created 4 February 2002
- */
-public class AntCall extends AntBase {
- /**
- * Execute the sub-build
- *
- * @exception AntException if the build fails
- */
- public void execute() throws AntException {
- setProperty(MagicProperties.BASEDIR,
- getExecService().getBaseDir().getAbsolutePath());
-
- Object key = getExecService().setupBuild(getDataValues(), true);
- setSubBuildKey(key);
- getExecService().runBuild(key, getTargets());
- setSubBuildKey(null);
- }
-
- /**
- * Alias to add a property to the sub-build
- *
- * @param param descriptor for the property to be passed
- */
- public void addParam(Property param) {
- super.addProperty(param);
- }
-
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/FileConverter.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/FileConverter.java
deleted file mode 100644
index a0ad496e0..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/FileConverter.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-
-import java.io.File;
-import org.apache.ant.common.antlib.AbstractConverter;
-import org.apache.ant.common.antlib.ConverterException;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.service.FileService;
-
-/**
- * A converter to convert to File objects, resolving against the
- * project's basedir
- *
- * @author Conor MacNeill
- * @created 21 January 2002
- */
-public class FileConverter extends AbstractConverter {
-
- /**
- * Get the list of classes this converter is able to convert to.
- *
- * @return an array of Class objects representing the classes this
- * converter handles.
- */
- public Class[] getTypes() {
- return new Class[]{File.class};
- }
-
- /**
- * Convert a string from the value given to an instance of the given
- * type.
- *
- * @param value The value to be converted
- * @param type the desired type of the converted object
- * @return the value of the converted object
- * @exception ConverterException if the conversion cannot be made
- */
- public Object convert(String value, Class type) throws ConverterException {
- try {
- FileService fileService
- = (FileService) getContext().getCoreService(FileService.class);
- return fileService.resolveFile(value);
- } catch (AntException e) {
- throw new ConverterException("Unable to resolve file: "
- + value, e);
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Import.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Import.java
deleted file mode 100644
index a5145ab33..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Import.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-
-import org.apache.ant.common.antlib.AbstractTask;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.ValidationException;
-import org.apache.ant.common.service.ComponentService;
-import org.apache.ant.common.util.AntException;
-
-/**
- * Task to import a component or components from a library
- *
- * @author Conor MacNeill
- * @created 27 January 2002
- */
-public class Import extends AbstractTask {
- /** The Ant LIbrary Id from which the component must be imported */
- private String libraryId = null;
- /** The name of the component to be imported */
- private String name = null;
- /**
- * A ref is used to import a task which has been declared in another
- * project
- */
- private String ref = null;
- /** The alias that is to be used for the name */
- private String alias = null;
-
- /**
- * Sets the libraryId of the Import
- *
- * @param libraryId the new libraryId value
- */
- public void setLibraryId(String libraryId) {
- this.libraryId = libraryId;
- }
-
- /**
- * Sets the name of the Import
- *
- * @param name the new name value
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Set the reference name of a task defined in a referenced frame
- *
- * @param ref the new ref value
- */
- public void setRef(String ref) {
- this.ref = ref;
- }
-
- /**
- * Sets the alias of the Import
- *
- * @param alias the new alias value
- */
- public void setAlias(String alias) {
- this.alias = alias;
- }
-
- /**
- * Validate this task is properly configured
- *
- * @exception ValidationException if the task is not configured correctly
- */
- public void validateComponent() throws ValidationException {
- if (ref != null) {
- if (libraryId != null || name != null) {
- throw new ValidationException("The \"ref\" attribute can only "
- + "be used when \"libraryId\" and \"name\" attributes are "
- + "not present");
- }
- } else {
- if (libraryId == null) {
- throw new ValidationException("You must specify a library "
- + "identifier with the \"libraryid\" attribute");
- }
- if (alias != null && name == null) {
- throw new ValidationException("You may only specify an alias"
- + " when you specify the \"name\" or \"ref\" attributes");
- }
- }
- }
-
- /**
- * Do the work and import the component or components
- *
- * @exception AntException if the components cannot be imported
- */
- public void execute() throws AntException {
- AntContext context = getAntContext();
- ComponentService componentService = (ComponentService)
- context.getCoreService(ComponentService.class);
- if (ref != null) {
- componentService.importFrameComponent(ref, alias);
- } else if (name == null) {
- componentService.importLibrary(libraryId);
- } else {
- componentService.importComponent(libraryId, name, alias);
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/LibPath.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/LibPath.java
deleted file mode 100644
index f6f17fd1e..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/LibPath.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.ant.common.antlib.AbstractTask;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.ValidationException;
-import org.apache.ant.common.service.ComponentService;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.event.MessageLevel;
-import org.apache.ant.init.InitUtils;
-
-/**
- * Task to add an additional classpath to the given library
- *
- * @author Conor MacNeill
- * @created 27 January 2002
- */
-public class LibPath extends AbstractTask {
- /** The id of the library for which this additional path is being set */
- private String libraryId;
- /**
- * This is the location, either file or URL of the library or libraries
- * to be loaded
- */
- private URL url;
-
- /**
- * Sets the libraryId of the LibPath
- *
- * @param libraryId the new libraryId value
- */
- public void setLibraryId(String libraryId) {
- this.libraryId = libraryId;
- }
-
- /**
- * Sets the URL of the library to be loaded
- *
- * @param url the URL from which the library is to be loaded
- * @exception ValidationException if the URL cannot be set
- */
- public void setURL(URL url) throws ValidationException {
- checkNullURL();
- this.url = url;
- }
-
- /**
- * Set the file from which the library should be loaded.
- *
- * @param file the file from which the library should be loaded
- * @exception ValidationException if the file attribute cannot be set
- */
- public void setFile(File file) throws ValidationException {
- checkNullURL();
- try {
- this.url = InitUtils.getFileURL(file);
- } catch (MalformedURLException e) {
- throw new ValidationException(e);
- }
- }
-
- /**
- * Set the dir in which to search for AntLibraries.
- *
- * @param dir the dir from which all Ant Libraries found will be loaded.
- * @exception ValidationException if the dir attribute cannot be set
- */
- public void setDir(File dir) throws ValidationException {
- checkNullURL();
- try {
- this.url = InitUtils.getFileURL(dir);
- } catch (MalformedURLException e) {
- throw new ValidationException(e);
- }
- }
-
- /**
- * Validate this task is configured correctly
- *
- * @exception ValidationException if the task is not configured correctly
- */
- public void validateComponent() throws ValidationException {
- if (libraryId == null) {
- throw new ValidationException("You must specify the id of the"
- + "library for which you are providing additional classpaths");
- }
- if (url == null) {
- throw new ValidationException("You must provide an additional "
- + "classpath using one of the file, dir or url attributes");
- }
- }
-
- /**
- * Add the libpath to the set of paths associated with the library
- *
- * @exception AntException if the library path cannot be addded to
- * the library
- */
- public void execute() throws AntException {
- AntContext context = getAntContext();
- ComponentService componentService = (ComponentService)
- context.getCoreService(ComponentService.class);
- log("Adding lib path " + url + " for " + libraryId,
- MessageLevel.DEBUG);
- componentService.addLibPath(libraryId, url);
- }
-
- /**
- * Check if any of the location specifying attributes have already been
- * set.
- *
- * @exception ValidationException if the search URL has already been set
- */
- private void checkNullURL() throws ValidationException {
- if (url != null) {
- throw new ValidationException("Location of library has already "
- + "been set. Please use only one of file, dir or url "
- + "attributes");
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/LoadLib.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/LoadLib.java
deleted file mode 100644
index 1461483d6..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/LoadLib.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.apache.ant.common.antlib.AbstractTask;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.service.ComponentService;
-import org.apache.ant.common.antlib.ValidationException;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.init.InitUtils;
-
-/**
- * Load an AntLibrary and optionally import all its components
- *
- * @author Conor MacNeill
- * @created 29 January 2002
- */
-public class LoadLib extends AbstractTask {
- /** Flag which indicates if all components should be imported */
- private boolean importAll;
-
- /**
- * This is the location, either file or URL of the library or libraries
- * to be loaded
- */
- private URL url;
-
- /**
- * Sets the URL of the library to be loaded
- *
- * @param url the URL from which the library is to be loaded
- * @exception ValidationException if the URL cannot be set
- */
- public void setURL(URL url) throws ValidationException {
- checkNullURL();
- this.url = url;
- }
-
- /**
- * Set the file from which the library should be loaded.
- *
- * @param file the file from which the library should be loaded
- * @exception ValidationException if the file attribute cannot be set
- */
- public void setFile(File file) throws ValidationException {
- checkNullURL();
- try {
- this.url = InitUtils.getFileURL(file);
- } catch (MalformedURLException e) {
- throw new ValidationException(e);
- }
- }
-
- /**
- * Set the dir in which to search for AntLibraries.
- *
- * @param dir the dir from which all Ant Libraries found will be loaded.
- * @exception ValidationException if the dir attribute cannot be set
- */
- public void setDir(File dir) throws ValidationException {
- checkNullURL();
- try {
- this.url = InitUtils.getFileURL(dir);
- } catch (MalformedURLException e) {
- throw new ValidationException(e);
- }
- }
-
- /**
- * Indicate whether all components from the library should be imported
- *
- * @param importAll true if all components in the library should be
- * imported.
- */
- public void setImportAll(boolean importAll) {
- this.importAll = importAll;
- }
-
- /**
- * Validate this task is configured correctly
- *
- * @exception ValidationException if the task is not configured correctly
- */
- public void validateComponent() throws ValidationException {
- if (url == null) {
- throw new ValidationException("A location from which to load "
- + "libraries must be provided");
- }
- }
-
-
- /**
- * Load the library or libraries and optiinally import their components
- *
- * @exception AntException if the library or libraries cannot be
- * loaded.
- */
- public void execute() throws AntException {
- AntContext context = getAntContext();
- ComponentService componentService = (ComponentService)
- context.getCoreService(ComponentService.class);
- componentService.loadLib(url, importAll);
- }
-
- /**
- * Check if any of the location specifying attributes have already been
- * set.
- *
- * @exception ValidationException if the search URL has already been set
- */
- private void checkNullURL() throws ValidationException {
- if (url != null) {
- throw new ValidationException("Location of library has already "
- + "been set. Please use only one of file, dir or url "
- + "attributes");
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Parallel.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Parallel.java
deleted file mode 100644
index bb21b773c..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Parallel.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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", "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
- * .
- */
-package org.apache.ant.antlib.system;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.ant.common.antlib.AbstractTask;
-import org.apache.ant.common.antlib.AntContext;
-
-import org.apache.ant.common.antlib.Task;
-import org.apache.ant.common.antlib.TaskContainer;
-import org.apache.ant.common.service.ExecService;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.Location;
-
-/**
- * Implements a multi threaded task execution.
- *
- * @author Thomas Christen chr@active.ch
- * @author Conor MacNeill
- * @created 27 February 2002
- */
-public class Parallel extends AbstractTask
- implements TaskContainer {
-
- /**
- * Class which stores information about the thread to which each task is
- * associated
- *
- * @author Conor MacNeill
- * @created 27 February 2002
- */
- private class TaskThread extends Thread {
- /** The exception thrown, if any, by the task running in this thread */
- private Throwable exception;
- /** The task running is this thread */
- private Task task;
- /** An identifier for the thread */
- private int taskNumber;
-
- /**
- * Construct a new TaskThread
- *
- * @param task the Task to be executed in a seperate thread
- * @param taskNumber the thread's identifier
- */
- TaskThread(int taskNumber, Task task) {
- this.task = task;
- this.taskNumber = taskNumber;
- }
-
- /**
- * Get the exception thrown by the task, if any.
- *
- * @return the Throwable instance thrown by the task or null if
- * nothing was thrown.
- */
- public Throwable getException() {
- return exception;
- }
-
- /**
- * Executes the task within a thread and takes care about Exceptions
- * raised within the task.
- */
- public void run() {
- try {
- AntContext context = getAntContext();
- ExecService execService
- = (ExecService) context.getCoreService(ExecService.class);
- execService.executeTask(task);
- } catch (Throwable t) {
- exception = t;
- }
- }
- }
-
- /** Collection holding the nested tasks */
- private List nestedTasks = new ArrayList();
-
-
- /**
- * Add a nested task to execute parallel (asynchron).
- *
- * @param nestedTask Nested task to be executed in parallel
- */
- public void addNestedTask(Task nestedTask) {
- nestedTasks.add(nestedTask);
- }
-
- /**
- * Block execution until the specified time or for a specified amount of
- * milliseconds and if defined, execute the wait status.
- *
- * @exception AntException if any of the nested tasks throws an
- * exception
- */
- public void execute() throws AntException {
- TaskThread[] threads = new TaskThread[nestedTasks.size()];
- int threadNumber = 0;
- for (Iterator i = nestedTasks.iterator(); i.hasNext(); threadNumber++) {
- Task nestedTask = (Task) i.next();
- threads[threadNumber] = new TaskThread(threadNumber, nestedTask);
- }
-
- // now start all threads
- for (int i = 0; i < threads.length; ++i) {
- threads[i].start();
- }
-
- // now join to all the threads
- for (int i = 0; i < threads.length; ++i) {
- try {
- threads[i].join();
- } catch (InterruptedException ie) {
- // who would interrupt me at a time like this?
- }
- }
-
- // now did any of the threads throw an exception
- StringBuffer exceptionMessage = new StringBuffer();
- String lSep = System.getProperty("line.separator");
- int numExceptions = 0;
- Throwable firstException = null;
- Location firstLocation = Location.UNKNOWN_LOCATION;
- for (int i = 0; i < threads.length; ++i) {
- Throwable t = threads[i].getException();
- if (t != null) {
- numExceptions++;
- if (firstException == null) {
- firstException = t;
- }
- if (t instanceof AntException &&
- firstLocation == Location.UNKNOWN_LOCATION) {
- firstLocation = ((AntException) t).getLocation();
- }
- exceptionMessage.append(lSep);
- exceptionMessage.append(t.getMessage());
- }
- }
-
- if (numExceptions == 1) {
- if (firstException instanceof AntException) {
- throw (AntException) firstException;
- } else {
- throw new SystemException(firstException);
- }
- } else if (numExceptions > 1) {
- throw new SystemException(exceptionMessage.toString(),
- firstLocation);
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/PrimitiveConverter.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/PrimitiveConverter.java
deleted file mode 100644
index ca52e3d58..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/PrimitiveConverter.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-
-import org.apache.ant.common.antlib.AbstractConverter;
-import org.apache.ant.common.util.PropertyUtils;
-import org.apache.ant.common.antlib.ConverterException;
-
-/**
- * A converter to convert to Java's primitie types
- *
- * @author Conor MacNeill
- */
-public class PrimitiveConverter extends AbstractConverter {
-
- /**
- * Get the list of classes this converter is able to convert to.
- *
- * @return an array of Class objects representing the classes this
- * converter handles.
- */
- public Class[] getTypes() {
- return new Class[] {
- Character.class, Character.TYPE, Byte.TYPE, Short.TYPE,
- Integer.TYPE, Long.TYPE, Float.TYPE, Double.TYPE,
- Boolean.class, Boolean.TYPE};
- }
-
- /**
- * Convert a string from the value given to an instance of the given
- * type.
- *
- * @param value The value to be converted
- * @param type the desired type of the converted object
- * @return the value of the converted object
- * @exception ConverterException if the conversion cannot be made
- */
- public Object convert(String value, Class type) throws ConverterException {
- if (type.equals(Character.class)
- || type.equals(Character.TYPE)) {
- return new Character(value.charAt(0));
- } else if (type.equals(Byte.TYPE)) {
- return new Byte(value);
- } else if (type.equals(Short.TYPE)) {
- return new Short(value);
- } else if (type.equals(Integer.TYPE)) {
- return new Integer(value);
- } else if (type.equals(Long.TYPE)) {
- return new Long(value);
- } else if (type.equals(Float.TYPE)) {
- return new Float(value);
- } else if (type.equals(Double.TYPE)) {
- return new Double(value);
- } else if (type.equals(Boolean.class)
- || type.equals(Boolean.TYPE)) {
- return new Boolean(PropertyUtils.toBoolean(value));
- }
- throw new ConverterException("This converter does not handle "
- + type.getName());
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Ref.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Ref.java
deleted file mode 100644
index b37950c74..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Ref.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.model.Project;
-import org.apache.ant.common.service.DataService;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.DataValue;
-
-/**
- * A Task to create a project reference.
- *
- * @author Conor MacNeill
- * @created 17 April 2002
- */
-public class Ref extends SubBuild {
-
- /** The project file containing the project to be referenced. */
- private File projectFile;
-
- /** THe name under which this project is to be referenced. */
- private String name;
-
- /**
- * Initialise this task
- *
- * @param context core's context
- * @param componentType the component type of this component (i.e its
- * defined name in the build file)
- * @exception AntException if we can't access the data service
- */
- public void init(AntContext context, String componentType)
- throws AntException {
- super.init(context, componentType);
- }
-
-
- /**
- * Sets the file containing the XML representation model of the referenced
- * project
- *
- * @param projectFile the file to build
- */
- public void setProject(File projectFile) {
- this.projectFile = projectFile;
- }
-
-
- /**
- * Set the name under which the project will be referenced
- *
- * @param name the reference label
- */
- public void setName(String name) {
- this.name = name;
- }
-
-
- /**
- * Get the properties to be used with the references
- *
- * @return the properties the sub-build will start with
- * @exception AntException if the data values cannot be retrieved.
- */
- protected Map getDataValues() throws AntException {
- DataService dataService = getDataService();
-
- Map values = new HashMap(super.getDataValues());
- dataService.mergeDataValues(values, dataService.getAllDataValues(),
- DataValue.PRIORITY_USER);
- return values;
- }
-
- /**
- * Create the project reference
- *
- * @exception AntException if the project cannot be referenced.
- */
- public void execute() throws AntException {
- Project model = getExecService().parseXMLBuildFile(projectFile);
-
- getExecService().createProjectReference(name, model, getDataValues());
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Sequential.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Sequential.java
deleted file mode 100644
index 22458f38a..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Sequential.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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", "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
- * .
- */
-package org.apache.ant.antlib.system;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.apache.ant.common.antlib.AbstractTask;
-import org.apache.ant.common.antlib.AntContext;
-
-import org.apache.ant.common.antlib.Task;
-import org.apache.ant.common.antlib.TaskContainer;
-import org.apache.ant.common.service.ExecService;
-import org.apache.ant.common.util.AntException;
-
-/**
- * Implements a single threaded task execution.
- *
- *
- *
- * @author Thomas Christen chr@active.ch
- * @created 27 February 2002
- */
-public class Sequential extends AbstractTask
- implements TaskContainer {
-
- /** Collection holding the nested tasks */
- private List nestedTasks = new ArrayList();
-
-
- /**
- * Add a nested task to Sequential.
- *
- *
- */
- public void addNestedTask(Task nestedTask) {
- nestedTasks.add(nestedTask);
- }
-
- /**
- * Execute all nestedTasks.
- *
- * @exception AntException if any of the nested tasks throws an
- * exception
- */
- public void execute() throws AntException {
- AntContext context = getAntContext();
- ExecService execService
- = (ExecService) context.getCoreService(ExecService.class);
- for (Iterator i = nestedTasks.iterator(); i.hasNext();) {
- Task nestedTask = (Task) i.next();
- execService.executeTask(nestedTask);
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/SubBuild.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/SubBuild.java
deleted file mode 100644
index bc8efa64d..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/SubBuild.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.ant.common.antlib.AbstractComponent;
-import org.apache.ant.common.antlib.AbstractTask;
-import org.apache.ant.common.antlib.AntContext;
-import org.apache.ant.common.antlib.ValidationException;
-import org.apache.ant.common.service.DataService;
-import org.apache.ant.common.service.ExecService;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.DataValue;
-
-/**
- * Common Base class all tasks that can pass references and property overrides
- * to a subbuild
- *
- * @author Conor MacNeill
- * @created 22 April 2002
- */
-public abstract class SubBuild extends AbstractTask {
-
- /**
- * Simple Property value storing class
- *
- * @author Conor MacNeill
- * @created 5 February 2002
- */
- public static class Property extends AbstractComponent {
- /** The property name */
- private String name;
-
- /** The property value */
- private String value;
-
-
- /**
- * Gets the name of the Property
- *
- * @return the name value
- */
- public String getName() {
- return name;
- }
-
-
- /**
- * Gets the value of the Property
- *
- * @return the value value
- */
- public String getValue() {
- return value;
- }
-
-
- /**
- * Sets the name of the Property
- *
- * @param name the new name value
- */
- public void setName(String name) {
- this.name = name;
- }
-
-
- /**
- * Sets the value of the Property
- *
- * @param value the new value value
- */
- public void setValue(String value) {
- this.value = value;
- }
-
-
- /**
- * Validate this data type instance
- *
- * @exception ValidationException if either attribute has not been set
- */
- public void validateComponent() throws ValidationException {
- if (name == null) {
- throw new ValidationException("\"name\" attribute of "
- + " must be supplied");
- }
- if (value == null) {
- throw new ValidationException("\"value\" attribute of "
- + " must be supplied");
- }
- }
- }
-
-
- /**
- * A simple class to store information about references being passed
- *
- * @author Conor MacNeill
- * @created 5 February 2002
- */
- public static class Reference extends AbstractComponent {
- /** The id of the reference to be passed */
- private String refId;
- /** The id to be used in the sub-build for this reference */
- private String toRefId;
-
-
- /**
- * Gets the refId of the Reference
- *
- * @return the refId value
- */
- public String getRefId() {
- return refId;
- }
-
-
- /**
- * Gets the toId of the Reference
- *
- * @return the toId value
- */
- public String getToRefId() {
- return toRefId;
- }
-
-
- /**
- * Sets the refId of the Reference
- *
- * @param refId the new refId value
- */
- public void setRefId(String refId) {
- this.refId = refId;
- }
-
-
- /**
- * Sets the toId of the Reference
- *
- * @param toRefId the new toId value
- */
- public void setToRefId(String toRefId) {
- this.toRefId = toRefId;
- }
-
-
- /**
- * Validate this data type instance
- *
- * @exception ValidationException if the refid attribute has not been
- * set
- */
- public void validateComponent() throws ValidationException {
- if (refId == null) {
- throw new ValidationException("\"refid\" attribute of "
- + " must be supplied");
- }
- }
- }
-
-
- /** The core's data service for manipulating the properties */
- private DataService dataService;
-
- /** The core's ExecutionService for running builds and external programs */
- private ExecService execService;
-
- /** The data values which will be passed to the sub-build */
- private Map dataValues = new HashMap();
-
-
- /**
- * Add a property to be passed to the subbuild
- *
- * @param property descriptor for the property to be passed
- */
- public void addProperty(Property property) {
- DataValue value
- = new DataValue(property.getValue(), DataValue.PRIORITY_INHERIT);
- dataValues.put(property.getName(), value);
- }
-
-
- /**
- * Add a reference to be passed
- *
- * @param reference the descriptor of the reference to be passed
- * @exception AntException if the reference does not reference a valid
- * object
- */
- public void addReference(Reference reference) throws AntException {
- String refId = reference.getRefId();
-
- if (!dataService.isDataValueSet(refId)) {
- throw new ValidationException("RefId \"" + refId + "\" is not set");
- }
- Object value = dataService.getDataValue(refId);
- String toId = reference.getToRefId();
-
- if (toId == null) {
- toId = refId;
- }
-
- dataValues.put(toId, new DataValue(value, DataValue.PRIORITY_INHERIT));
- }
-
-
- /**
- * Get the core's execution service
- *
- * @return the core's execution service.
- */
- protected ExecService getExecService() {
- return execService;
- }
-
-
- /**
- * Get the core's date service
- *
- * @return the core's data service.
- */
- protected DataService getDataService() {
- return dataService;
- }
-
-
- /**
- * Get the properties to be used with the sub-build
- *
- * @return the data values the sub-build will start with
- * @exception AntException if the datavalues cannot be retrieved.
- */
- protected Map getDataValues() throws AntException {
- return dataValues;
- }
-
-
- /**
- * Initialise this task
- *
- * @param context core's context
- * @param componentType the component type of this component (i.e its
- * defined name in the build file)
- * @exception AntException if we can't access the data service
- */
- public void init(AntContext context, String componentType)
- throws AntException {
- super.init(context, componentType);
- dataService = (DataService) getCoreService(DataService.class);
- execService = (ExecService) getCoreService(ExecService.class);
- }
-
-
- /**
- * Set a property for the subbuild
- *
- * @param propertyName the property name
- * @param propertyValue the value of the property
- */
- protected void setProperty(String propertyName, Object propertyValue) {
- DataValue value
- = new DataValue(propertyValue, DataValue.PRIORITY_INHERIT);
- dataValues.put(propertyName, value);
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/SystemException.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/SystemException.java
deleted file mode 100644
index c1f5131c8..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/SystemException.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.util.AntException;
-
-/**
- * A System task related exception
- *
- * @author Conor MacNeill
- */
-public class SystemException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public SystemException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public SystemException(String msg, Location location) {
- super(msg, location);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public SystemException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public SystemException(String msg, Throwable cause,
- Location location) {
- super(msg, cause, location);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public SystemException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public SystemException(Throwable cause, Location location) {
- super(cause, location);
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Taskdef.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Taskdef.java
deleted file mode 100644
index ca56d51fc..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Taskdef.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-
-import org.apache.ant.common.antlib.AbstractTask;
-
-/**
- * Define a new task for use in the build file
- *
- * @author Conor MacNeill
- * @created 27 January 2002
- */
-public class Taskdef extends AbstractTask {
- /** Define the new task */
- public void execute() {
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Typedef.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Typedef.java
deleted file mode 100644
index e3a10eef7..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/Typedef.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-
-import org.apache.ant.common.antlib.AbstractTask;
-
-/**
- * Define a new type to be used in the build
- *
- * @author Conor MacNeill
- * @created 27 January 2002
- */
-public class Typedef extends AbstractTask {
- /** define the type */
- public void execute() {
- }
-}
-
diff --git a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/URLConverter.java b/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/URLConverter.java
deleted file mode 100644
index 3348b7caa..000000000
--- a/proposal/mutant/src/java/antlibs/system/org/apache/ant/antlib/system/URLConverter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.antlib.system;
-
-import java.net.URL;
-import java.net.MalformedURLException;
-import org.apache.ant.common.antlib.AbstractConverter;
-import org.apache.ant.common.antlib.ConverterException;
-
-/**
- * A converter to convert to URLs relative to the project base dir
- *
- * @author Conor MacNeill
- */
-public class URLConverter extends AbstractConverter {
-
- /**
- * Get the list of classes this converter is able to convert to.
- *
- * @return an array of Class objects representing the classes this
- * converter handles.
- */
- public Class[] getTypes() {
- return new Class[]{URL.class};
- }
-
- /**
- * Convert a string from the value given to an instance of the given
- * type.
- *
- * @param value The value to be converted
- * @param type the desired type of the converted object
- * @return the value of the converted object
- * @exception ConverterException if the conversion cannot be made
- */
- public Object convert(String value, Class type) throws ConverterException {
- try {
- return new URL(value);
- } catch (MalformedURLException e) {
- throw new ConverterException(e);
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/bootstrap/org/apache/ant/bootstrap/Bootstrap.java b/proposal/mutant/src/java/bootstrap/org/apache/ant/bootstrap/Bootstrap.java
deleted file mode 100644
index 641b8a39c..000000000
--- a/proposal/mutant/src/java/bootstrap/org/apache/ant/bootstrap/Bootstrap.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.bootstrap;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import org.apache.ant.init.ClassLocator;
-
-/**
- * The Bootstrap class initailses the boot strap build, then loads the
- * Builder class to perform the bootstrap build.
- *
- * @author Conor MacNeill
- * @created 18 February 2002
- */
-public class Bootstrap {
- /**
- * The main program - adds tools.jar and runs build
- *
- * @param args The command line arguments
- * @exception Exception if there is a bootstrap problem
- */
- public static void main(String[] args) throws Exception {
- System.out.println("Bootstrapping mutant");
- URL bootstrapURL = ClassLocator.getClassLocationURL(Bootstrap.class);
- URL builderURL = new URL(bootstrapURL, "../builder/");
- URL toolsJarURL = ClassLocator.getToolsJarURL();
-
- URL[] urls = new URL[]{builderURL, toolsJarURL};
- ClassLoader builderLoader = new URLClassLoader(urls);
- // org.apache.ant.init.LoaderUtils.dumpLoader(System.out,
- // builderLoader);
-
- Class builderClass = Class.forName("org.apache.ant.builder.Builder",
- true, builderLoader);
- final Class[] param = {Class.forName("[Ljava.lang.String;")};
- final Method main = builderClass.getMethod("main", param);
- final Object[] argument = {args};
- main.invoke(null, argument);
- }
-}
-
diff --git a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Ant1CompatBuilder.java b/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Ant1CompatBuilder.java
deleted file mode 100644
index c03ef7331..000000000
--- a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Ant1CompatBuilder.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.apache.ant.builder;
-public class Ant1CompatBuilder {
- protected void _init(BuildHelper helper) {
- helper.setProperty("debug", "true");
- helper.setProperty("deprecation", "false");
- helper.setProperty("optimize", "true");
- helper.setProperty("junit.fork", "false");
- helper.setProperty("junit.filtertrace", "off");
- helper.setProperty("junit.summary", "no");
- helper.setProperty("ant1base.dir", "../..");
- helper.setProperty("ant1src.dir", "${ant1base.dir}/src");
- helper.setProperty("ant1java.dir", "${ant1src.dir}/main");
- helper.setProperty("ant1etc.dir", "${ant1src.dir}/etc");
- helper.setProperty("ant1.tests.dir", "${ant1src.dir}/etc/testcases");
- helper.setProperty("src.dir", "src");
- helper.setProperty("java.dir", "${src.dir}/java");
- helper.setProperty("lib.dir", "lib");
- helper.setProperty("tests.dir", "${ant1src.dir}/testcases");
- helper.setProperty("tests.etc.dir", "${src.dir}/etc/testcases");
- helper.setProperty("bin.dir", "bin");
- helper.setProperty("dist.dir", "dist");
- helper.setProperty("dist.lib.dir", "${dist.dir}/lib");
- helper.setProperty("dist.core.dir", "${dist.lib.dir}/core");
- helper.setProperty("dist.antlibs.dir", "${dist.lib.dir}/antlibs");
- helper.setProperty("dist.syslibs.dir", "${dist.core.dir}/syslibs");
- helper.setProperty("ant.package", "org/apache/tools/ant");
- helper.setProperty("optional.package", "${ant.package}/taskdefs/optional");
- helper.setProperty("optional.type.package", "${ant.package}/types/optional");
- helper.setProperty("util.package", "${ant.package}/util");
- helper.setProperty("regexp.package", "${util.package}/regexp");
- helper.setProperty("build.tests", "${bin.dir}/testcases");
- helper.createPath("classpath");
- helper.addFileSetToPath("classpath",
- "${dist.core.dir}/parser", "*.jar");
- helper.addPathElementToPath("classpath", "${dist.core.dir}/start/init.jar");
- helper.addPathElementToPath("classpath", "${dist.core.dir}/common/common.jar");
- helper.addPathElementToPath("classpath", "${dist.syslibs.dir}/system.jar");
- helper.createPath("tests-classpath");
- helper.addPathElementToPath("tests-classpath", "${build.classes}");
- helper.addPathElementToPath("tests-classpath", "${build.tests}");
- helper.addPathElementToPath("tests-classpath", "${tests.dir}");
- helper.addPathElementToPath("tests-classpath", "${tests.etc.dir}");
- helper.addPathToPath("tests-classpath", "classpath");
- }
- protected void check_for_optional_packages(BuildHelper helper) {
- helper.runDepends(this, "check_for_optional_packages", "");
- System.out.println("check_for_optional_packages: ");
- helper.setProperty("build.tests.resolved", "");
- }
- protected void ant1compat(BuildHelper helper) {
- helper.runDepends(this, "ant1compat", "check_for_optional_packages");
- System.out.println("ant1compat: ");
- helper.mkdir("${bin.dir}/ant1src_copy");
- helper.mkdir("${bin.dir}/ant1compat");
- helper.copyFilesetRef("ant1src_tocopy", "${bin.dir}/ant1src_copy");
- helper.javac("${bin.dir}/ant1src_copy:${java.dir}/antlibs/ant1compat", "${bin.dir}/ant1compat", "classpath");
- helper.copyFileset("${bin.dir}/ant1src_copy", "${bin.dir}/ant1compat");
- helper.copyFileset("${ant1etc.dir}", "${bin.dir}/ant1compat/${optional.package}/junit/xsl");
- helper.mkdir("${dist.antlibs.dir}");
- helper.jar("${bin.dir}/ant1compat", "${dist.antlibs.dir}/ant1compat.jar",
- "${java.dir}/antlibs/ant1compat", "antlib.xml", null, null);
- }
- protected void compile_tests(BuildHelper helper) {
- helper.runDepends(this, "compile_tests", "check_for_optional_packages");
- System.out.println("compile-tests: ");
- helper.mkdir("${build.tests}");
- helper.javac("${tests.dir}", "${build.tests}", "tests-classpath");
- helper.copyFilesetRef("ant1testcases_tocopy", "${tests.etc.dir}");
- }
- protected void dump_info(BuildHelper helper) {
- helper.runDepends(this, "dump_info", "dump_sys_properties,run_which");
- System.out.println("dump-info: ");
- }
- protected void dump_sys_properties(BuildHelper helper) {
- helper.runDepends(this, "dump_sys_properties", "xml_check");
- System.out.println("dump-sys-properties: ");
- }
- protected void xml_check(BuildHelper helper) {
- helper.runDepends(this, "xml_check", "check_for_optional_packages");
- System.out.println("xml-check: ");
- }
- protected void run_which(BuildHelper helper) {
- helper.runDepends(this, "run_which", "check_for_optional_packages");
- System.out.println("run-which: ");
- }
- protected void probe_offline(BuildHelper helper) {
- helper.runDepends(this, "probe_offline", "");
- System.out.println("probe-offline: ");
- }
- protected void test(BuildHelper helper) {
- helper.runDepends(this, "test", "run_tests");
- System.out.println("test: ");
- }
- protected void run_tests(BuildHelper helper) {
- helper.runDepends(this, "run_tests", "dump_info,compile_tests,probe_offline");
- System.out.println("run-tests: ");
- }
- protected void run_single_test(BuildHelper helper) {
- helper.runDepends(this, "run_single_test", "compile_tests");
- System.out.println("run-single-test: ");
- }
- protected void clean(BuildHelper helper) {
- helper.runDepends(this, "clean", "");
- System.out.println("clean: ");
- }
-}
diff --git a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/BuildHelper.java b/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/BuildHelper.java
deleted file mode 100644
index 221108025..000000000
--- a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/BuildHelper.java
+++ /dev/null
@@ -1,643 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.builder;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.jar.Attributes;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-
-/**
- * A helper class which allows the build files which have been converted to
- * code to be built.
- *
- * @author Conor MacNeill
- * @created 16 February 2002
- */
-public class BuildHelper {
-
- /**
- * Simple data class for storing info about a fileset.
- *
- * @author Conor MacNeill
- * @created 18 February 2002
- */
- private static class FileSetInfo {
- /** The root directory of this fileset */
- private File root;
- /** the list of files in the file set */
- private File[] files;
-
- }
-
-
- /** The properties which have been defined in the build */
- private Map properties = new HashMap();
-
- /** Path objects created in the build */
- private Map paths = new HashMap();
-
- /** Filesets created in the build */
- private Map filesets = new HashMap();
-
- /** The targets which have been run */
- private Set runTargets = new HashSet();
-
- /**
- * Set a property for the build
- *
- * @param propertyName the name of the property
- * @param propertyValue the value of the property
- */
- protected void setProperty(String propertyName, String propertyValue) {
- if (!properties.containsKey(propertyName)) {
- String value = resolve(propertyValue);
-
- properties.put(propertyName, value);
- }
- }
-
- /**
- * Set the parent helper when creating a new build context
- *
- * @param parentHelper the parent helper
- */
- protected void setParent(BuildHelper parentHelper) {
- // grab the parent's properties
- Map parentProperties = parentHelper.properties;
- for (Iterator i = parentProperties.keySet().iterator(); i.hasNext();) {
- String propertyName = (String) i.next();
- String propertyValue = (String) parentProperties.get(propertyName);
- setProperty(propertyName, propertyValue);
- }
- }
-
-
- /**
- * Create a Jar
- *
- * @param basedir the base directpory from which files are added to the
- * jar
- * @param metaInfDir the directory containing the META-INF for the jar
- * @param metaInfIncludes the files to be included in the META-INF area of
- * the jar
- * @param jarFile the file in which the Jar is created
- * @param classpath Class-Path attribute in manifest
- * @param mainClass Main-Class attribute in manifest
- */
- protected void jar(String basedir, String jarFile, String metaInfDir,
- String metaInfIncludes,
- String classpath, String mainClass) {
- try {
- File base = new File(resolve(basedir));
- File jar = new File(resolve(jarFile));
- System.out.println(" [jar] Creating jar " + jar);
-
- Manifest manifest = new Manifest();
- Attributes attributes = manifest.getMainAttributes();
- attributes.putValue("Manifest-Version", "1.0");
- attributes.putValue("Created-By", "Mutant Bootstrap");
-
- if (classpath != null) {
- attributes.putValue("Class-Path", classpath);
- }
- if (mainClass != null) {
- attributes.putValue("Main-Class", mainClass);
- }
-
- JarOutputStream jos
- = new JarOutputStream(new FileOutputStream(jar), manifest);
-
- addToJar(jos, base, null);
- if (metaInfDir != null) {
- File[] metaFileSet = buildFileSet(metaInfDir, metaInfIncludes);
-
- addFilesToJar(jos, new File(resolve(metaInfDir)),
- metaFileSet, "META-INF");
- }
- jos.close();
- } catch (IOException e) {
- e.printStackTrace();
- throw new RuntimeException("Unable to Jar file");
- }
- }
-
-
- /**
- * Compile a set of files
- *
- * @param srcDir the source directory
- * @param destDir where the compiled classes will go
- * @param classpathRef the id of a path object with the classpath for the
- * build
- */
- protected void javac(String srcDir, String destDir, String classpathRef) {
- List javaFiles = new ArrayList();
- String src = resolve(srcDir);
- StringTokenizer tokenizer = new StringTokenizer(src, ":");
-
- while (tokenizer.hasMoreTokens()) {
- File srcLocation = new File(tokenizer.nextToken());
-
- getJavaFiles(srcLocation, javaFiles);
- }
-
- File dest = new File(resolve(destDir));
- int numArgs = javaFiles.size() + 2;
-
- if (classpathRef != null) {
- numArgs += 2;
- }
- String[] args = new String[numArgs];
- int index = 0;
-
- args[index++] = "-d";
- args[index++] = dest.getPath();
- if (classpathRef != null) {
- String path = (String) paths.get(resolve(classpathRef));
-
- args[index++] = "-classpath";
- args[index++] = path;
- }
- for (Iterator i = javaFiles.iterator(); i.hasNext();) {
- args[index++] = ((File) i.next()).getPath();
- }
-
- // System.out.println("Javac Arguments");
- // for (int i = 0; i < args.length; ++i) {
- // System.out.println(" " + args[i]);
- // }
-
- try {
- Class c = Class.forName("com.sun.tools.javac.Main");
- Object compiler = c.newInstance();
- Method compile = c.getMethod("compile",
- new Class[]{(new String[]{}).getClass()});
-
- compile.invoke(compiler, new Object[]{args});
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException("Compile failed");
- }
- }
-
-
- /**
- * Copy a directory
- *
- * @param fromDir the source directory name
- * @param toDir the destination directory name
- */
- protected void copyFileset(String fromDir, String toDir) {
- File from = new File(resolve(fromDir));
- File to = new File(resolve(toDir));
-
- copyDir(from, to);
- }
-
-
- /**
- * Add a fileset to this build helper
- *
- * @param name the name of the fileset (its id)
- * @param root the root directory of the fileset
- * @param files the files in the fileset
- */
- protected void addFileSet(String name, File root, File[] files) {
- FileSetInfo info = new FileSetInfo();
-
- info.root = root;
- info.files = files;
- filesets.put(name, info);
- }
-
-
- /**
- * Copy a fileset given a reference to the source fileset
- *
- * @param toDir the name of the destination directory
- * @param fileSetRef the fileset to be copied
- */
- protected void copyFilesetRef(String fileSetRef, String toDir) {
- FileSetInfo fileset = (FileSetInfo) filesets.get(resolve(fileSetRef));
-
- if (fileset != null) {
- File to = new File(resolve(toDir));
-
- copyFileList(fileset.root, fileset.files, to);
- }
- }
-
-
- /**
- * Make a directory
- *
- * @param dirName the name of the directory path to be created.
- */
- protected void mkdir(String dirName) {
- File dir = new File(resolve(dirName));
-
- dir.mkdirs();
- }
-
-
- /**
- * Create a path object
- *
- * @param pathName the name of the path object in the build
- */
- protected void createPath(String pathName) {
- String path = "";
-
- paths.put(pathName, path);
- }
-
-
- /**
- * Add a fileset to a path
- *
- * @param pathName the name of the path
- * @param filesetDir the base directory of the fileset
- * @param filesetIncludes the files to be included in the fileset
- */
- protected void addFileSetToPath(String pathName, String filesetDir,
- String filesetIncludes) {
- File[] files = buildFileSet(filesetDir, filesetIncludes);
- String currentPath = (String) paths.get(pathName);
-
- if (files != null) {
- for (int i = 0; i < files.length; ++i) {
- if (currentPath == null || currentPath.length() == 0) {
- currentPath = files[i].getPath();
- } else {
- currentPath = currentPath + File.pathSeparator
- + files[i].getPath();
- }
- }
- }
- paths.put(pathName, currentPath);
- }
-
-
- /**
- * Add a new element to a path
- *
- * @param pathName the name of the path object to be updated
- * @param location the location to be added to the path
- */
- protected void addPathElementToPath(String pathName, String location) {
- String pathElement = resolve(location).replace('/', File.separatorChar);
- String currentPath = (String) paths.get(pathName);
-
- if (currentPath == null || currentPath.length() == 0) {
- currentPath = pathElement;
- } else {
- currentPath = currentPath + File.pathSeparator + pathElement;
- }
- paths.put(pathName, currentPath);
- }
-
-
- /**
- * Add an existing path to another path
- *
- * @param pathName the name of the path to which the path is to be added
- * @param pathNameToAdd the name of the path to be added.
- */
- protected void addPathToPath(String pathName, String pathNameToAdd) {
- String pathToAdd = (String) paths.get(pathNameToAdd);
-
- if (pathToAdd == null || pathToAdd.length() == 0) {
- return;
- }
-
- String currentPath = (String) paths.get(pathName);
-
- if (currentPath == null || currentPath.length() == 0) {
- currentPath = pathToAdd;
- } else {
- currentPath = currentPath + File.pathSeparator + pathToAdd;
- }
- paths.put(pathName, currentPath);
- }
-
-
- /**
- * Get the set of Java files to be compiled
- *
- * @param srcDir the directory to search (recursively searched)
- * @param javaFiles the list of files to which Java files are added
- */
- private void getJavaFiles(File srcDir, List javaFiles) {
- File[] files = srcDir.listFiles();
-
- for (int i = 0; i < files.length; ++i) {
- if (files[i].isDirectory()) {
- getJavaFiles(files[i], javaFiles);
- } else if (files[i].getPath().endsWith(".java")) {
- javaFiles.add(files[i]);
- }
- }
- }
-
-
- /**
- * Copy a file
- *
- * @param from the source location
- * @param dest the destination location
- */
- private void copyFile(File from, File dest) {
- if (from.exists()) {
- dest.getParentFile().mkdirs();
- try {
- FileInputStream in = new FileInputStream(from);
- FileOutputStream out = new FileOutputStream(dest);
- byte[] buf = new byte[1024 * 16];
- int count = 0;
-
- count = in.read(buf, 0, buf.length);
- while (count != -1) {
- out.write(buf, 0, count);
- count = in.read(buf, 0, buf.length);
- }
-
- in.close();
- out.close();
- } catch (IOException ioe) {
- ioe.printStackTrace();
- throw new RuntimeException("Unable to copy files");
- }
- }
- }
-
-
- /**
- * Copy a list of files from one directory to another, preserving the
- * relative paths
- *
- * @param root the root of the source directory
- * @param files the files to be copied
- * @param to the destination directory
- */
- private void copyFileList(File root, File[] files, File to) {
- for (int i = 0; i < files.length; ++i) {
- if (files[i].getName().equals("CVS")) {
- continue;
- }
- String name
- = files[i].getPath().substring(root.getPath().length() + 1);
- File dest = new File(to, name);
-
- if (files[i].isDirectory()) {
- copyDir(files[i], dest);
- } else {
- copyFile(files[i], dest);
- }
- }
- }
-
-
- /**
- * Copy a directory
- *
- * @param from the source directory
- * @param to the destination directory
- */
- private void copyDir(File from, File to) {
- to.mkdirs();
-
- File[] files = from.listFiles();
-
- copyFileList(from, files, to);
- }
-
-
- /**
- * Add a directory to a Jar
- *
- * @param jos the JarOutputStream representing the Jar being created
- * @param dir the directory to be added to the jar
- * @param prefix the prefix in the jar at which the directory is to be
- * added
- * @exception IOException if the files cannot be added to the jar
- */
- private void addToJar(JarOutputStream jos, File dir, String prefix)
- throws IOException {
- File[] files = dir.listFiles();
-
- addFilesToJar(jos, dir, files, prefix);
- }
-
-
- /**
- * Add a set of files to a jar
- *
- * @param jos the JarOutputStream representing the Jar being created
- * @param dir the directory fro which the files are taken
- * @param prefix the prefix in the jar at which the directory is to be
- * added
- * @param files the list of files to be added to the jar
- * @exception IOException if the files cannot be added to the jar
- */
- private void addFilesToJar(JarOutputStream jos, File dir,
- File[] files, String prefix) throws IOException {
- for (int i = 0; i < files.length; i++) {
- String name = files[i].getPath().replace('\\', '/');
-
- name = name.substring(dir.getPath().length() + 1);
- if (prefix != null) {
- name = prefix + "/" + name;
- }
- ZipEntry ze = new ZipEntry(name);
-
- jos.putNextEntry(ze);
- if (files[i].isDirectory()) {
- addToJar(jos, files[i], name);
- } else {
- FileInputStream fis = new FileInputStream(files[i]);
- int count = 0;
- byte[] buf = new byte[8 * 1024];
-
- count = fis.read(buf, 0, buf.length);
- while (count != -1) {
- jos.write(buf, 0, count);
- count = fis.read(buf, 0, buf.length);
- }
- fis.close();
- }
- }
- }
-
-
- /**
- * Build a simple fileset. Only simple inclusion filtering is supported -
- * no complicated patterns.
- *
- * @param filesetDir the base directory of the fileset
- * @param filesetIncludes the simple includes spec for the fileset
- * @return the fileset expressed as an array of File instances.
- */
- private File[] buildFileSet(String filesetDir, String filesetIncludes) {
- if (filesetDir == null) {
- return new File[0];
- }
- final String includes = resolve(filesetIncludes);
-
- if (includes.indexOf("**") != -1) {
- throw new RuntimeException("Simple fileset cannot handle ** "
- + "style includes");
- }
- int index = 0;
-
- if (includes.charAt(0) == '*') {
- index = 1;
- }
- if (includes.indexOf("*", index) != -1) {
- throw new RuntimeException("Simple fileset cannot handle * "
- + "style includes except at start");
- }
-
- File base = new File(resolve(filesetDir));
-
- return base.listFiles(
- new FilenameFilter() {
- public boolean accept(File dir, String name) {
- if (includes.startsWith("*")) {
- return name.endsWith(includes.substring(1));
- } else {
- return name.equals(includes);
- }
- }
- });
- }
-
-
- /**
- * Run a target in the build
- *
- * @param builder The builder object created from the original XML build
- * file.
- * @param target The target to run.
- */
- private void runTarget(Object builder, String target) {
- try {
- // use reflection to get a method with the given name
- Method targetMethod
- = builder.getClass().getDeclaredMethod(target,
- new Class[]{BuildHelper.class});
- targetMethod.invoke(builder, new Object[]{this});
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException("Unable to run target \""
- + target + "\"");
- }
- }
-
- /**
- * Run the dependencies of the given target.
- *
- * @param builder The builder object created from the original XML build
- * file.
- * @param targetName the target whose dependencies should be run
- * @param depends the comma separated list of dependencies.
- */
- public void runDepends(Object builder, String targetName, String depends) {
- StringTokenizer tokenizer = new StringTokenizer(depends, ", ");
- while (tokenizer.hasMoreTokens()) {
- String target = tokenizer.nextToken();
- // has this target been run
- if (!runTargets.contains(target)) {
- runTarget(builder, target);
- }
- }
- runTargets.add(targetName);
- }
-
- /**
- * Resolve the property references in a string
- *
- * @param propertyValue the string to be resolved
- * @return the string with property references replaced by their current
- * value.
- */
- protected String resolve(String propertyValue) {
- String newValue = propertyValue;
-
- while (newValue.indexOf("${") != -1) {
- int index = newValue.indexOf("${");
- int endIndex = newValue.indexOf("}", index);
- String propertyName = newValue.substring(index + 2, endIndex);
- String repValue = (String) properties.get(propertyName);
-
- newValue = newValue.substring(0, index) +
- repValue + newValue.substring(endIndex + 1);
- }
- return newValue;
- }
-}
-
diff --git a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java b/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
deleted file mode 100644
index 97d199840..000000000
--- a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.builder;
-import java.io.File;
-import java.util.ArrayList;
-
-import java.util.List;
-
-/**
- * The Builder object builds the code for bootstrap purposes. It invokes the
- * mathods of the required targets in the converted build files.
- *
- * @author Conor MacNeill
- * @created 18 February 2002
- */
-public class Builder {
- /** The root of the Ant1 source tree */
- private static final File ANT1_SRC_ROOT = new File("../../src/main");
- /** the root of the Ant package in the Ant1 source tree */
- private static final File PACKAGE_ROOT
- = new File(ANT1_SRC_ROOT, "org/apache/tools/ant");
- /** The zip utilities root */
- private static final File ZIP_ROOT
- = new File(ANT1_SRC_ROOT, "org/apache/tools/zip");
-
- /** the taskdefs root */
- private static final File TASKDEFS_ROOT
- = new File(PACKAGE_ROOT, "taskdefs");
- /** the types root */
- private static final File TYPES_ROOT
- = new File(PACKAGE_ROOT, "types");
- /** the filters root */
- private static final File FILTERS_ROOT
- = new File(PACKAGE_ROOT, "filters");
- /** the util root */
- private static final File UTIL_ROOT
- = new File(PACKAGE_ROOT, "util");
- /** the input root */
- private static final File INPUT_ROOT
- = new File(PACKAGE_ROOT, "input");
- /** the input root */
-
- /** the root forthe depend task's support classes */
- private static final File DEPEND_ROOT
- = new File(TASKDEFS_ROOT, "optional/depend");
-
- /**
- * The main program - create a builder and run the build
- *
- * @param args the command line arguments - not currently used
- */
- public static void main(String[] args) {
- Builder builder = new Builder();
- builder.runBuild(args);
- }
-
- /**
- * Add all the java files from a given directory.
- *
- * @param files the list to which the files are to be added.
- * @param dir the directory from which the Java files are added.
- * @param recurse true if subdirectories should be searched.
- */
- private void addJavaFiles(List files, File dir, boolean recurse) {
- File[] javaFiles = dir.listFiles();
-
- if (javaFiles != null) {
- for (int i = 0; i < javaFiles.length; ++i) {
- if (javaFiles[i].isDirectory() && recurse) {
- addJavaFiles(files, javaFiles[i], recurse);
- } else if (javaFiles[i].getName().endsWith(".java")) {
- files.add(javaFiles[i]);
- }
- }
- }
- }
-
- /**
- * Get the Ant1 files currently required to build a bootstrap build.
- *
- * @return an array of files which need to be copied into the bootstrap
- * build.
- */
- private File[] getAnt1Files() {
- List files = new ArrayList();
- addJavaFiles(files, TASKDEFS_ROOT, false);
- addJavaFiles(files, new File(TASKDEFS_ROOT, "compilers"), true);
- addJavaFiles(files, new File(TASKDEFS_ROOT, "condition"), true);
- addJavaFiles(files, DEPEND_ROOT, true);
- addJavaFiles(files, TYPES_ROOT, true);
- addJavaFiles(files, FILTERS_ROOT, false);
- addJavaFiles(files, UTIL_ROOT, false);
- addJavaFiles(files, new File(UTIL_ROOT, "depend"), false);
- addJavaFiles(files, new File(UTIL_ROOT, "facade"), true);
- addJavaFiles(files, ZIP_ROOT, true);
- addJavaFiles(files, INPUT_ROOT, true);
-
- files.add(new File(PACKAGE_ROOT, "BuildException.java"));
- files.add(new File(PACKAGE_ROOT, "Location.java"));
- files.add(new File(PACKAGE_ROOT, "AntClassLoader.java"));
- files.add(new File(PACKAGE_ROOT, "BuildListener.java"));
- files.add(new File(PACKAGE_ROOT, "BuildEvent.java"));
- files.add(new File(PACKAGE_ROOT, "DirectoryScanner.java"));
- files.add(new File(PACKAGE_ROOT, "FileScanner.java"));
- files.add(new File(PACKAGE_ROOT, "PathTokenizer.java"));
- files.add(new File(PACKAGE_ROOT, "TaskAdapter.java"));
- files.add(new File(PACKAGE_ROOT, "MatchingTask.java"));
- files.add(new File(PACKAGE_ROOT, "defaultManifest.mf"));
-
- files.add(new File(TASKDEFS_ROOT, "defaults.properties"));
- files.add(new File(TYPES_ROOT, "defaults.properties"));
-
- files.add(new File(UTIL_ROOT, "regexp/Regexp.java"));
- files.add(new File(UTIL_ROOT, "regexp/RegexpMatcher.java"));
- files.add(new File(UTIL_ROOT, "regexp/RegexpFactory.java"));
- files.add(new File(UTIL_ROOT, "regexp/RegexpMatcherFactory.java"));
- files.add(new File(FILTERS_ROOT, "util/ChainReaderHelper.java"));
-
- // these should not be included
- files.remove(new File(TYPES_ROOT, "DataType.java"));
- files.remove(new File(TASKDEFS_ROOT, "Ant.java"));
- files.remove(new File(TASKDEFS_ROOT, "CallTarget.java"));
- files.remove(new File(TASKDEFS_ROOT, "AntStructure.java"));
- files.remove(new File(TASKDEFS_ROOT, "Recorder.java"));
- files.remove(new File(TASKDEFS_ROOT, "RecorderEntry.java"));
- files.remove(new File(TASKDEFS_ROOT, "SendEmail.java"));
- files.remove(new File(TASKDEFS_ROOT, "Do.java"));
- files.remove(new File(INPUT_ROOT, "InputRequest.java"));
-
- // not needed for bootstrap
- files.remove(new File(TASKDEFS_ROOT, "Java.java"));
- files.remove(new File(TASKDEFS_ROOT, "Tar.java"));
- files.remove(new File(TASKDEFS_ROOT, "Untar.java"));
- files.remove(new File(TASKDEFS_ROOT, "BZip2.java"));
- files.remove(new File(TASKDEFS_ROOT, "BUnzip2.java"));
- files.remove(new File(TASKDEFS_ROOT, "Rmic.java"));
- files.remove(new File(TASKDEFS_ROOT, "SendEmail.java"));
-
-
- return (File[]) files.toArray(new File[0]);
- }
-
- /**
- * Run the build
- *
- * @param args the command line arguments for the build - currently not
- * used.
- */
- private void runBuild(String[] args) {
- BuildHelper mainBuild = new BuildHelper();
- mainBuild.setProperty("dist.dir", "bootstrap");
- MutantBuilder mutantBuilder = new MutantBuilder();
- mutantBuilder._init(mainBuild);
- mutantBuilder.dist_lite(mainBuild);
-
- Ant1CompatBuilder ant1Builder = new Ant1CompatBuilder();
- BuildHelper ant1Build = new BuildHelper();
- ant1Build.setProperty("dist.dir", "bootstrap");
- ant1Build.addFileSet("ant1src_tocopy", ANT1_SRC_ROOT, getAnt1Files());
- ant1Builder._init(ant1Build);
- ant1Builder.ant1compat(ant1Build);
- }
-}
-
diff --git a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/MutantBuilder.java b/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/MutantBuilder.java
deleted file mode 100644
index 6c076bd54..000000000
--- a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/MutantBuilder.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.apache.ant.builder;
-public class MutantBuilder {
- protected void _init(BuildHelper helper) {
- helper.setProperty("src.dir", "src");
- helper.setProperty("lib.dir", "lib");
- helper.setProperty("java.dir", "${src.dir}/java");
- helper.setProperty("script.dir", "${src.dir}/script");
- helper.setProperty("conf.dir", "${src.dir}/conf");
- helper.setProperty("bin.dir", "bin");
- helper.setProperty("dist.dir", "dist");
- helper.setProperty("dist.bin", "${dist.dir}/bin");
- helper.setProperty("dist.conf", "${dist.dir}/conf");
- helper.setProperty("javadocs.dir", "${dist.dir}/docs/manual/api");
- helper.setProperty("dist.lib.dir", "${dist.dir}/lib");
- helper.setProperty("dist.core.dir", "${dist.lib.dir}/core");
- helper.setProperty("dist.frontend.dir", "${dist.lib.dir}/frontend");
- helper.setProperty("dist.antlibs.dir", "${dist.lib.dir}/antlibs");
- helper.setProperty("dist.syslibs.dir", "${dist.core.dir}/syslibs");
- helper.setProperty("debug", "true");
- helper.setProperty("chmod.fail", "true");
- helper.createPath("classpath.parser");
- helper.addFileSetToPath("classpath.parser",
- "${lib.dir}/parser", "*.jar");
- helper.createPath("classpath.common");
- helper.addPathElementToPath("classpath.common", "${dist.core.dir}/start/init.jar");
- helper.createPath("classpath.antcore");
- helper.addPathElementToPath("classpath.antcore", "${dist.core.dir}/common/common.jar");
- helper.addPathToPath("classpath.antcore", "classpath.common");
- helper.addPathToPath("classpath.antcore", "classpath.parser");
- helper.createPath("classpath.frontend");
- helper.addPathElementToPath("classpath.frontend", "${dist.core.dir}/antcore/antcore.jar");
- helper.addPathToPath("classpath.frontend", "classpath.antcore");
- helper.createPath("classpath.start");
- helper.addPathElementToPath("classpath.start", "${dist.core.dir}/start/init.jar");
- }
- protected void buildsetup(BuildHelper helper) {
- helper.runDepends(this, "buildsetup", "");
- System.out.println("buildsetup: ");
- helper.mkdir("${bin.dir}");
- helper.mkdir("${dist.core.dir}");
- helper.copyFileset("${lib.dir}/parser", "${dist.core.dir}/parser");
- }
- protected void initjar(BuildHelper helper) {
- helper.runDepends(this, "initjar", "buildsetup");
- System.out.println("initjar: ");
- helper.mkdir("${bin.dir}/init");
- helper.mkdir("${dist.core.dir}/start");
- helper.javac("${java.dir}/init", "${bin.dir}/init", null);
- helper.jar("${bin.dir}/init", "${dist.core.dir}/start/init.jar",
- null, null, null, null);
- }
- protected void common(BuildHelper helper) {
- helper.runDepends(this, "common", "initjar");
- System.out.println("common: ");
- helper.mkdir("${bin.dir}/common");
- helper.mkdir("${dist.core.dir}/common");
- helper.javac("${java.dir}/common", "${bin.dir}/common", "classpath.common");
- helper.jar("${bin.dir}/common", "${dist.core.dir}/common/common.jar",
- null, null, null, null);
- }
- protected void antcore(BuildHelper helper) {
- helper.runDepends(this, "antcore", "common");
- System.out.println("antcore: ");
- helper.mkdir("${bin.dir}/antcore");
- helper.mkdir("${dist.core.dir}/antcore");
- helper.javac("${java.dir}/antcore", "${bin.dir}/antcore", "classpath.antcore");
- helper.jar("${bin.dir}/antcore", "${dist.core.dir}/antcore/antcore.jar",
- null, null, null, null);
- }
- protected void frontend(BuildHelper helper) {
- helper.runDepends(this, "frontend", "antcore, startjar");
- System.out.println("frontend: ");
- helper.mkdir("${bin.dir}/frontend");
- helper.mkdir("${dist.frontend.dir}");
- helper.javac("${java.dir}/frontend", "${bin.dir}/frontend", "classpath.frontend");
- helper.jar("${bin.dir}/frontend", "${dist.frontend.dir}/cli.jar",
- null, null, null, "org.apache.ant.cli.Commandline");
- }
- protected void startjar(BuildHelper helper) {
- helper.runDepends(this, "startjar", "initjar");
- System.out.println("startjar: ");
- helper.mkdir("${bin.dir}/start");
- helper.mkdir("${dist.core.dir}/start");
- helper.javac("${java.dir}/start", "${bin.dir}/start", "classpath.start");
- helper.jar("${bin.dir}/start", "${dist.core.dir}/start/start.jar",
- null, null, "init.jar", "org.apache.ant.start.Main");
- helper.jar("${bin.dir}/start", "${dist.core.dir}/start/ant.jar",
- null, null, "start.jar", "org.apache.tools.ant.Main");
- }
- protected void antlibs(BuildHelper helper) {
- helper.runDepends(this, "antlibs", "common");
- System.out.println("antlibs: ");
- {
- BuildHelper subHelper = new BuildHelper();
- subHelper.setProperty("libname", helper.resolve("system"));
- subHelper.setProperty("antlibdir", helper.resolve("${dist.syslibs.dir}"));
- subHelper.setParent(helper);
- _init(subHelper);
- buildlib(subHelper);
- }
- {
- BuildHelper subHelper = new BuildHelper();
- subHelper.setProperty("libname", helper.resolve("monitor"));
- subHelper.setProperty("antlibdir", helper.resolve("${dist.syslibs.dir}"));
- subHelper.setParent(helper);
- _init(subHelper);
- buildlib(subHelper);
- }
- }
- protected void buildlib(BuildHelper helper) {
- helper.runDepends(this, "buildlib", "");
- System.out.println("buildlib: ");
- helper.setProperty("antlib.build.dir", "${bin.dir}/antlibs/${libname}");
- helper.setProperty("antlib.src.dir", "${java.dir}/antlibs/${libname}");
- helper.mkdir("${antlib.build.dir}");
- helper.mkdir("${antlibdir}");
- helper.createPath("classpath.antlibs");
- helper.addPathElementToPath("classpath.antlibs", "${dist.core.dir}/common/common.jar");
- helper.addPathToPath("classpath.antlibs", "classpath.common");
- helper.javac("${antlib.src.dir}", "${antlib.build.dir}", "classpath.antlibs");
- helper.jar("${antlib.build.dir}", "${antlibdir}/${libname}.jar",
- "${antlib.src.dir}", "antlib.xml", null, null);
- }
- protected void setup_bin(BuildHelper helper) {
- helper.runDepends(this, "setup_bin", "");
- System.out.println("setup-bin: ");
- helper.mkdir("${dist.bin}");
- helper.copyFileset("${script.dir}/", "${dist.bin}");
- }
- protected void setup_conf(BuildHelper helper) {
- helper.runDepends(this, "setup_conf", "");
- System.out.println("setup-conf: ");
- helper.mkdir("${dist.conf}");
- helper.copyFileset("${conf.dir}/", "${dist.conf}");
- }
- protected void clean(BuildHelper helper) {
- helper.runDepends(this, "clean", "");
- System.out.println("clean: ");
- }
- protected void checkstyle(BuildHelper helper) {
- helper.runDepends(this, "checkstyle", "");
- System.out.println("checkstyle: ");
- helper.mkdir("${bin.dir}/check");
- }
- protected void javadocs(BuildHelper helper) {
- helper.runDepends(this, "javadocs", "");
- System.out.println("javadocs: ");
- helper.mkdir("${javadocs.dir}");
- }
- protected void test(BuildHelper helper) {
- helper.runDepends(this, "test", "");
- System.out.println("test: ");
- }
- protected void jars(BuildHelper helper) {
- helper.runDepends(this, "jars", "initjar, startjar, antcore, frontend, antlibs");
- System.out.println("jars: ");
- }
- protected void dist_lite(BuildHelper helper) {
- helper.runDepends(this, "dist_lite", "jars, setup_bin, setup_conf");
- System.out.println("dist-lite: ");
- }
- protected void dist(BuildHelper helper) {
- helper.runDepends(this, "dist", "dist_lite, javadocs");
- System.out.println("dist: ");
- }
-}
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractAspect.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractAspect.java
deleted file mode 100644
index b00aeddae..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractAspect.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.model.BuildElement;
-import org.apache.ant.common.model.NamespaceValueCollection;
-
-/**
- * An implementation of the Aspect interface providing default behaviour.
- *
- * @author Conor MacNeill
- */
-public class AbstractAspect implements Aspect {
- /**
- * The Ant context for this aspect which can be used to access core
- * services.
- */
- private AntContext context;
-
- /**
- * Initialise the aspect with a context.
- *
- * @param context the aspect's context
- * @exception AntException if the aspect cannot be initialised
- */
- public void init(AntContext context) throws AntException {
- this.context = context;
- }
-
- /**
- * Get this aspect's context
- *
- * @return the aspect context
- */
- protected AntContext getAntContext() {
- return context;
- }
-
- /**
- * This join point is activated before a component is to be created.
- * The aspect can return an object to be used rather than the core creating
- * the object.
- *
- * @param component the component that has been created. This will be null
- * unless another aspect has created the component
- * @param model the Build model that applies to the component
- *
- * @return a component to use.
- * @exception AntException if the aspect cannot process the component.
- */
- public Object preCreateComponent(Object component, BuildElement model)
- throws AntException {
- return component;
- }
-
- /**
- * This join point is activated after a component has been created and
- * configured. If the aspect wishes, an object can be returned in place
- * of the one created by Ant.
- *
- * @param component the component that has been created.
- * @param model the Build model used to create the component.
- *
- * @return a replacement for the component if desired. If null is returned
- * the current component is used.
- * @exception AntException if the aspect cannot process the component.
- */
- public Object postCreateComponent(Object component, BuildElement model)
- throws AntException {
- return component;
- }
-
- /**
- * This join point is activated just prior to task execution.
- *
- * @param task the task being executed.
- * @param namespaceValues a collection of namespace attribute values for use
- * during the task execution - may be null if no namespace values are
- * provided.
- * @return an object which indicates that this aspect wishes to
- * be notified after execution has been completed, in which case the obkect
- * is returned to provide the aspect its context. If this returns null
- * the aspect's postExecuteTask method will not be invoked.
- * @exception AntException if the aspect cannot process the task.
- */
- public Object preExecuteTask(Task task,
- NamespaceValueCollection namespaceValues)
- throws AntException {
- return null;
- }
-
- /**
- * This join point is activated after a task has executed. The aspect
- * may override the task's failure cause by returning a new failure.
- *
- * @param context the context the aspect provided in preExecuteTask.
- * @param failureCause the current failure reason for the task.
- *
- * @return a new failure reason or null if the task is not to fail.
- */
- public Throwable postExecuteTask(Object context, Throwable failureCause) {
- return failureCause;
- }
-
- /**
- * This point is activated when the task is to receive output that has
- * been sent to output stream and redirected into the task.
- *
- * @param context the context the aspect provided in preExecuteTask.
- * @param line the content sent to the output stream.
- *
- * @return the line to be forwarded onto the task.
- */
- public String taskOutput(Object context, String line) {
- return line;
- }
-
- /**
- * This point is activated when the task is to receive error content that
- * has been sent to error stream and redirected into the task.
- *
- * @param context the context the aspect provided in preExecuteTask.
- * @param line the content sent to the error stream.
- *
- * @return the line to be forwarded onto the task.
- */
- public String taskError(Object context, String line) {
- return line;
- }
-
- /**
- * Log a message as a build event
- *
- * @param message the message to be logged
- * @param level the priority level of the message
- */
- protected void log(String message, int level) {
- context.log(message, level);
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractComponent.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractComponent.java
deleted file mode 100644
index 23184905c..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractComponent.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-
-import org.apache.ant.common.util.AntException;
-
-/**
- * Abstract implementation of the ExecutionComponent
- *
- * @author Conor MacNeill
- * @created 5 February 2002
- */
-public abstract class AbstractComponent implements ExecutionComponent {
- /** The components's context */
- private AntContext context;
-
- /**
- * the type of the component. The type is the name of the component in
- * the build file. This may be different from the name under which this
- * componenent is known in its library due to aliasing
- */
- private String componentType;
-
- /**
- * Get this component's context
- *
- * @return the component context
- */
- public AntContext getAntContext() {
- return context;
- }
-
- /**
- * Gets the componentType of the AbstractComponent
- *
- * @return the componentType value
- */
- public String getComponentType() {
- return componentType;
- }
-
- /**
- * Initialise the component. The component may use the AntContext to
- * request services from the Ant core.
- *
- * @param context the component's context
- * @param componentType the type of the component
- * @exception AntException if initialisation fails
- */
- public void init(AntContext context, String componentType)
- throws AntException {
- this.context = context;
- this.componentType = componentType;
- }
-
- /**
- * Validate the component. This is called after the element has been
- * configured from its build model. The element may perform validation
- * of its configuration
- *
- * @exception ValidationException if validation fails
- */
- public void validateComponent() throws ValidationException {
- // no validation by default
- }
-
- /**
- * Short cut to get a core service instance
- *
- * @param serviceClass the required interface of which an instance is
- * required
- * @return the core's instance of the requested service
- * @exception AntException if the core does not support the
- * requested service
- */
- protected Object getCoreService(Class serviceClass)
- throws AntException {
- return context.getCoreService(serviceClass);
- }
-
- /**
- * Log a message as a build event
- *
- * @param message the message to be logged
- * @param level the priority level of the message
- */
- protected void log(String message, int level) {
- context.log(message, level);
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractConverter.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractConverter.java
deleted file mode 100644
index 2673a7746..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractConverter.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-
-
-/**
- * Abstract implementation of the Converter interface
- *
- * @author Conor MacNeill
- */
-public abstract class AbstractConverter implements Converter {
- /** The converters's context */
- private AntContext context;
-
- /**
- * Initialise the converter. The converter may use the AntContext to request
- * services from the Ant core.
- *
- * @param context the Converter's context
- */
- public void init(AntContext context) {
- this.context = context;
- }
-
- /**
- * Get this converter's context
- *
- * @return the converter context
- */
- protected AntContext getContext() {
- return context;
- }
-
- /**
- * This method allows a converter to indicate whether it can create
- * the given type which is a sub-type of one of the converter's main
- * types indicated in getTypes. Most converters can return false here.
- *
- * @param subType the sub-type
- * @return true if this converter can convert a string representation to
- * the given subclass of one of its main class
- */
- public boolean canConvertSubType(Class subType) {
- return false;
- }
-
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractTask.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractTask.java
deleted file mode 100644
index 57a69c793..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AbstractTask.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-import org.apache.ant.common.event.MessageLevel;
-import org.apache.ant.common.util.AntException;
-
-/**
- * Abstract implementation of the Task interface
- *
- * @author Conor MacNeill
- * @created 16 January 2002
- */
-public abstract class AbstractTask extends AbstractComponent implements Task {
- /** The name of this task. */
- private String taskName;
-
- /**
- * Sets the taskName of the AbstractTask
- *
- * @param taskName the new taskName value
- */
- public final void setTaskName(String taskName) {
- this.taskName = taskName;
- }
-
- /**
- * Gets the taskName of the AbstractTask
- *
- * @return the taskName value
- */
- public final String getTaskName() {
- return taskName;
- }
-
- /**
- * Handle Output produced by the task. When a task prints to System.out
- * the container may catch this and redirect the content back to the
- * task by invoking this method. This method must NOT call System.out,
- * directly or indirectly.
- *
- * @param line The line of content produce by the task
- * @exception AntException if the output cannot be handled.
- */
- public void handleSystemOut(String line) throws AntException {
- // default behaviout is to log at INFO level
- log(line, MessageLevel.INFO);
- }
-
- /**
- * Handle error information produced by the task. When a task prints to
- * System.err the container may catch this and redirect the content back
- * to the task by invoking this method. This method must NOT call
- * System.err, directly or indirectly.
- *
- * @param line The line of error info produce by the task
- * @exception AntException if the output cannot be handled.
- */
- public void handleSystemErr(String line) throws AntException {
- // default behaviout is to log at WARN level
- log(line, MessageLevel.WARNING);
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AntContext.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AntContext.java
deleted file mode 100644
index dc62c05bd..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AntContext.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.model.BuildElement;
-
-/**
- * The AntContext is the interface through which the Ant container and the
- * Ant components communicate. Common operations are provided directly in
- * this interface. Other core services are available through the generic
- * service objects supported by the core.
- *
- * @author Conor MacNeill
- * @created 14 January 2002
- */
-public interface AntContext {
- /**
- * Log a message
- *
- * @param message the message to be logged
- * @param level the priority level of the message
- */
- void log(String message, int level);
-
- /**
- * Get a instance of the specified service interface with which to
- * interact with the core.
- *
- * @param serviceInterfaceClass the class object for the required
- * interface
- * @return an instance of the requested interface
- * @exception AntException if the core service is not supported
- */
- Object getCoreService(Class serviceInterfaceClass)
- throws AntException;
-
- /**
- * Gets the location associated with the AntContext
- *
- * @return the location which may be the unknown location
- */
- Location getLocation();
-
- /**
- * Get the build model associated with this context if any
- *
- * @return the build model which may be null if there is no associated
- * model
- */
- BuildElement getModel();
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AntLibFactory.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AntLibFactory.java
deleted file mode 100644
index 697f7bb69..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AntLibFactory.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-import org.apache.ant.common.util.AntException;
-
-/**
- * An Ant Library Factory is a class is used to create instances of the
- * classes in the AntLibrary. An separate instance of the factory will be
- * created by each ExecutiuonFrame which uses this library. The factory will
- * be created before any instances are required.
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public interface AntLibFactory {
- /**
- * Initialise the factory
- *
- * @param context the factory's context
- * @exception AntException if the factory cannot be initialized
- */
- void init(AntContext context) throws AntException;
-
- /**
- * Create an instance of the given component class
- *
- * @param componentClass the class for which an instance is required
- * @param localName the name within the library under which the task is
- * defined
- * @return an instance of the required class
- * @exception InstantiationException if the class cannot be instantiated
- * @exception IllegalAccessException if the instance cannot be accessed
- * @exception AntException if there is a problem creating the task
- */
- Object createComponent(Class componentClass, String localName)
- throws InstantiationException, IllegalAccessException,
- AntException;
-
- /**
- * Create an instance of the given class
- *
- * @param requiredClass the class for which an instance is
- * required
- * @return a instance of the required class
- * @exception InstantiationException if the class cannot be instantiated
- * @exception IllegalAccessException if the instance cannot be accessed
- * @exception AntException if there is a problem creating the
- * converter
- */
- Object createInstance(Class requiredClass)
- throws InstantiationException, IllegalAccessException,
- AntException;
-
-
- /**
- * Register an element which has been created as the result of calling a
- * create method.
- *
- * @param createdElement the element that the component created
- * @exception AntException if there is a problem registering the
- * element
- */
- void registerCreatedElement(Object createdElement)
- throws AntException;
-
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/Aspect.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/Aspect.java
deleted file mode 100644
index 5d8f4203f..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/Aspect.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.model.BuildElement;
-import org.apache.ant.common.model.NamespaceValueCollection;
-
-/**
- * An aspect is a component which is activated across all task and
- * component operations. It allows a single implmentation to be applied
- * to a number of tasks without requiring changes to the task implementations.
- *
- * @author Conor MacNeill
- */
-public interface Aspect {
- /**
- * Initialise the aspect with a context.
- *
- * @param context the aspect's context
- * @exception AntException if the aspect cannot be initialised
- */
- void init(AntContext context)
- throws AntException;
-
-
- /**
- * This join point is activated before a component has been created.
- * The aspect can return an object to be used rather than the core creating
- * the object.
- *
- * @param component the component that has been created. This will be null
- * unless another aspect has created the component
- * @param model the Build model that applies to the component
- *
- * @return a component to use.
- * @exception AntException if the aspect cannot process the component.
- */
- Object preCreateComponent(Object component, BuildElement model)
- throws AntException;
-
- /**
- * This join point is activated after a component has been created and
- * configured. If the aspect wishes, an object can be returned in place
- * of the one created by Ant.
- *
- * @param component the component that has been created.
- * @param model the Build model used to create the component.
- *
- * @return a component to use
- * @exception AntException if the aspect cannot process the component.
- */
- Object postCreateComponent(Object component, BuildElement model)
- throws AntException;
-
- /**
- * This join point is activated just prior to task execution.
- *
- * @param task the task being executed.
- * @param namespaceValues a collection of namespace attribute values for use
- * during the task execution - may be null if no namespace values are
- * provided.
- * @return an object which indicates that this aspect wishes to
- * be notified after execution has been completed, in which case the obkect
- * is returned to provide the aspect its context. If this returns null
- * the aspect's postExecuteTask method will not be invoked.
- * @exception AntException if the aspect cannot process the task.
- */
- Object preExecuteTask(Task task, NamespaceValueCollection namespaceValues)
- throws AntException;
-
- /**
- * This join point is activated after a task has executed. The aspect
- * may override the task's failure cause by returning a new failure.
- *
- * @param context the context the aspect provided in preExecuteTask.
- * @param failureCause the current failure reason for the task.
- *
- * @return a new failure reason or null if the task is not to fail.
- */
- Throwable postExecuteTask(Object context, Throwable failureCause);
-
- /**
- * This point is activated when the task is to receive output that has
- * been sent to output stream and redirected into the task.
- *
- * @param context the context the aspect provided in preExecuteTask.
- * @param line the content sent to the output stream.
- *
- * @return the line to be forwarded onto the task.
- */
- String taskOutput(Object context, String line);
-
- /**
- * This point is activated when the task is to receive error content that
- * has been sent to error stream and redirected into the task.
- *
- * @param context the context the aspect provided in preExecuteTask.
- * @param line the content sent to the error stream.
- *
- * @return the line to be forwarded onto the task.
- */
- String taskError(Object context, String line);
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AspectException.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AspectException.java
deleted file mode 100644
index 4912ecb6b..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/AspectException.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.util.AntException;
-
-/**
- * An Aspect Exception is used by Aspects to indicate problems
- *
- * @author Conor MacNeill
- */
-public class AspectException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public AspectException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public AspectException(String msg, Location location) {
- super(msg, location);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public AspectException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public AspectException(String msg, Throwable cause,
- Location location) {
- super(msg, cause, location);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public AspectException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public AspectException(Throwable cause, Location location) {
- super(cause, location);
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/Converter.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/Converter.java
deleted file mode 100644
index 5dbb794e1..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/Converter.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-
-/**
- * Convert between a string and a data type
- *
- * @author Conor MacNeill
- * @created 19 January 2002
- */
-public interface Converter {
- /**
- * Convert a string from the value given to an instance of the given
- * type.
- *
- * @param value The value to be converted
- * @param type the desired type of the converted object
- * @return the value of the converted object
- * @exception ConverterException if the conversion cannot be made
- */
- Object convert(String value, Class type) throws ConverterException;
-
- /**
- * Initialise the converter. The converter may use the AntContext to
- * request services from the Ant core.
- *
- * @param context the Converter's AntContext
- */
- void init(AntContext context);
-
- /**
- * Get the list of classes this converter is able to convert to.
- *
- * @return an array of Class objects representing the classes this
- * converter handles.
- */
- Class[] getTypes();
-
-
- /**
- * This method allows a converter to indicate whether it can create
- * the given type which is a sub-type of one of the converter's main
- * types indicated in getTypes. Most converters can return false here.
- *
- * @param subType the sub-type
- * @return true if this converter can convert a string representation to
- * the given subclass of one of its main class
- */
- boolean canConvertSubType(Class subType);
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/ConverterException.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/ConverterException.java
deleted file mode 100644
index e2775a366..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/ConverterException.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.util.AntException;
-
-/**
- * A Converter Exception indicates a problem converting a value.
- *
- * @author Conor MacNeill
- */
-public class ConverterException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public ConverterException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public ConverterException(String msg, Location location) {
- super(msg, location);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public ConverterException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public ConverterException(String msg, Throwable cause,
- Location location) {
- super(msg, cause, location);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public ConverterException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public ConverterException(Throwable cause, Location location) {
- super(cause, location);
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/DataType.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/DataType.java
deleted file mode 100644
index d9411607c..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/DataType.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-
-/**
- * This is the interface used to descibe Ant types. A class used as a
- * datatype which implements this interface will be given an AntContext
- * instance through which it may interact with the Ant core.
- *
- * @author Conor MacNeill
- * @created 20 January 2002
- */
-public interface DataType extends ExecutionComponent {
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/DeferredTask.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/DeferredTask.java
deleted file mode 100644
index 46dd8b228..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/DeferredTask.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-
-/**
- * A deferred task is one where the task task responsibility for configuring
- * itself at execution time. The attributes and nested elements are stored
- * by the task for later use
- *
- * @author Conor MacNeill
- * @created 11 February 2002
- */
-public interface DeferredTask extends Task {
- /**
- * Sets the attribute of the DeferredTask
- *
- * @param name the attribute name
- * @param attributeValue the new attribute value
- */
- void setAttribute(String name, String attributeValue);
-
- /**
- * Add a nested element
- *
- * @param nestedElementName the name of the nested element
- * @param value the object which is the nested element
- */
- void addElement(String nestedElementName, Object value);
-
- /**
- * Add any text content
- *
- * @param text the value of the content
- */
- void addText(String text);
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/ExecutionComponent.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/ExecutionComponent.java
deleted file mode 100644
index 1e33271be..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/ExecutionComponent.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-import org.apache.ant.common.util.AntException;
-
-/**
- * An execution component is a component from an AntLibrary which is used in
- * the execution of an Ant build. A component can have a context.
- *
- * @author Conor MacNeill
- * @created 1 February 2002
- */
-public interface ExecutionComponent {
- /**
- * Initialise the component. The component may use the AntContext to request
- * services from the Ant core.
- *
- * @param context the Component's context
- * @param componentType the type of the component
- * @exception AntException if the component cannot be initialised
- */
- void init(AntContext context, String componentType)
- throws AntException;
-
- /**
- * Validate the component. This is called after the element has been
- * configured from its build model. The element may perform validation
- * of its configuration
- *
- * @exception ValidationException if the component is not validly
- * configured
- */
- void validateComponent() throws ValidationException;
-
- /**
- * Get the AntContext associated with this component
- *
- * @return the component's context
- */
- AntContext getAntContext();
-
- /**
- * Get the type of the component in the build file
- *
- * @return the type of the component
- */
- String getComponentType();
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/StandardLibFactory.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/StandardLibFactory.java
deleted file mode 100644
index 6d54d650f..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/StandardLibFactory.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-import org.apache.ant.common.util.AntException;
-
-/**
- * Standard Ant Library Factory
- *
- * @author Conor MacNeill
- * @created 1 February 2002
- * @see AntLibFactory
- */
-public class StandardLibFactory implements AntLibFactory {
- /** The context the factory can use to interact with the core */
- private AntContext context;
-
- /**
- * Create an instance of the given component class
- *
- * @param componentClass the class for which an instance is required
- * @param localName the name within the library under which the task is
- * defined
- * @return an instance of the required class
- * @exception InstantiationException if the class cannot be instantiated
- * @exception IllegalAccessException if the instance cannot be accessed
- * @exception AntException if there is a problem creating the task
- */
- public Object createComponent(Class componentClass, String localName)
- throws InstantiationException, IllegalAccessException,
- AntException {
- return componentClass.newInstance();
- }
-
- /**
- * Initilaise the factory
- *
- * @param context the factory's context
- * @exception AntException if the factory cannot be initialized
- */
- public void init(AntContext context) throws AntException {
- this.context = context;
- }
-
- /**
- * Create an instance of the given class
- *
- * @param requiredClass the class for which an instance is
- * required
- * @return a instance of the required class
- * @exception InstantiationException if the class cannot be instantiated
- * @exception IllegalAccessException if the instance cannot be accessed
- * @exception AntException if there is a problem creating the
- * converter
- */
- public Object createInstance(Class requiredClass)
- throws InstantiationException, IllegalAccessException,
- AntException {
- return requiredClass.newInstance();
- }
-
- /**
- * Register an element which has been created as the result of calling a
- * create method.
- *
- * @param createdElement the element that the component created
- * @exception AntException if there is a problem registering the
- * element
- */
- public void registerCreatedElement(Object createdElement)
- throws AntException {
- // do nothing
- }
-
- /**
- * Gets the context of the factory
- *
- * @return the context object
- */
- protected AntContext getContext() {
- return context;
- }
-
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/Task.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/Task.java
deleted file mode 100644
index e77ac014e..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/Task.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-import org.apache.ant.common.util.AntException;
-
-/**
- * The Task interface defines the methods that a Task must implement.
- *
- * @author Conor MacNeill
- * @created 16 January 2002
- */
-public interface Task extends ExecutionComponent {
- /**
- * Execute the task.
- *
- * @exception AntException if the task has a problem executing.
- */
- void execute() throws AntException;
-
- /**
- * Sets the taskName of the Task
- *
- * @param name the new taskName value
- */
- void setTaskName(String name);
-
- /**
- * Gets the taskName of the Task
- *
- * @return the taskName value
- */
- String getTaskName();
-
- /**
- * Handle Output produced by the task. When a task prints to System.out
- * the container may catch this and redirect the content back to the
- * task by invoking this method. This method must NOT call System.out,
- * directly or indirectly.
- *
- * @param line The line of content produce by the task
- * @exception AntException if the output cannot be handled.
- */
- void handleSystemOut(String line) throws AntException;
-
- /**
- * Handle error information produced by the task. When a task prints to
- * System.err the container may catch this and redirect the content back
- * to the task by invoking this method. This method must NOT call
- * System.err, directly or indirectly.
- *
- * @param line The line of error info produce by the task
- * @exception AntException if the output cannot be handled.
- */
- void handleSystemErr(String line) throws AntException;
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/TaskContainer.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/TaskContainer.java
deleted file mode 100644
index 914e0a44e..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/TaskContainer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-import org.apache.ant.common.util.AntException;
-
-/**
- * A TaskContainer is an object which can contain and manage ExecutionTasks.
- *
- * @author Conor MacNeill
- * @created 19 January 2002
- */
-public interface TaskContainer {
- /**
- * Add a task to the container.
- *
- * @param task the task tobe added
- * @exception AntException if the container cannot add the task
- */
- void addNestedTask(Task task) throws AntException;
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/ValidationException.java b/proposal/mutant/src/java/common/org/apache/ant/common/antlib/ValidationException.java
deleted file mode 100644
index ffbcc8324..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/antlib/ValidationException.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.antlib;
-
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.util.AntException;
-
-/**
- * A validation exception is thrown by tasks when they are not configured
- * correctly
- *
- * @author Conor MacNeill
- */
-public class ValidationException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public ValidationException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public ValidationException(String msg, Location location) {
- super(msg, location);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public ValidationException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public ValidationException(String msg, Throwable cause,
- Location location) {
- super(msg, cause, location);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public ValidationException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public ValidationException(Throwable cause, Location location) {
- super(cause, location);
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/constants/Namespace.java b/proposal/mutant/src/java/common/org/apache/ant/common/constants/Namespace.java
deleted file mode 100644
index 7a2c1bd47..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/constants/Namespace.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.constants;
-
-/**
- * Namespace constants
- *
- * @author Conor MacNeill
- * @created 14 June 2002
- */
-public class Namespace {
- /** The Ant namespace used to identify Ant metadata */
- public static final String ANT_META_URI
- = "http://jakarta.apache.org/ant";
-
- /** The XML Schema namespace */
- public static final String XSI_URI
- = "http://www.w3.org/2001/XMLSchema-instance";
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/event/BuildEvent.java b/proposal/mutant/src/java/common/org/apache/ant/common/event/BuildEvent.java
deleted file mode 100644
index 15758eab8..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/event/BuildEvent.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.event;
-
-import java.util.EventObject;
-
-/**
- * A BuildEvent indicates the occurence of a significant event in the build.
- * All build events come from an Frame or an ExecutionManager.
- * There are a number of different types of event and they will generally be
- * associated with some build element from the build model.
- *
- * @author Conor MacNeill
- * @created 15 January 2002
- */
-public class BuildEvent extends EventObject {
-
- /** Build Started Event type */
- public static final int BUILD_STARTED = 1;
- /** Build Finished Event Type */
- public static final int BUILD_FINISHED = 2;
- /** Start of target event type */
- public static final int TARGET_STARTED = 3;
- /** Target finished event type */
- public static final int TARGET_FINISHED = 4;
- /** Start of task event type */
- public static final int TASK_STARTED = 5;
- /** end of task event type */
- public static final int TASK_FINISHED = 6;
- /** message event type */
- public static final int MESSAGE = 7;
- /** Project started event type */
- public static final int PROJECT_STARTED = 8;
- /** Project finished event type */
- public static final int PROJECT_FINISHED = 9;
-
- /** The type of this event */
- private int eventType;
- /** The cause of this event if appropriate */
- private Throwable cause = null;
- /** message associated wuth this event */
- private String message = null;
- /** The priority of this message */
- private int messagePriority;
-
- /**
- * Create a build event.
- *
- * @param eventType the type of the buildEvent.
- * @param source the element with which this event is associated
- */
- public BuildEvent(Object source, int eventType) {
- super(source);
- this.eventType = eventType;
- }
-
- /**
- * Create a build event with an associated exception.
- *
- * @param eventType the type of the buildEvent.
- * @param cause An exception if associated with the event
- * @param source the object with which this event is associated
- */
- public BuildEvent(Object source, int eventType,
- Throwable cause) {
- this(source, eventType);
- this.cause = cause;
- }
-
- /**
- * Create a build event for a message
- *
- * @param source the object with which the event is associated.
- * @param message the message associated with this event
- * @param priority the message priority
- */
- public BuildEvent(Object source, String message,
- int priority) {
- super(source);
- this.eventType = MESSAGE;
- this.message = message;
- this.messagePriority = priority;
- }
-
- /**
- * Get the type of this event
- *
- * @return the event type
- */
- public int getEventType() {
- return eventType;
- }
-
- /**
- * Returns the logging message. This field will only be set for
- * "messageLogged" events.
- *
- * @return the message value
- */
- public String getMessage() {
- return message;
- }
-
- /**
- * Returns the priority of the logging message. This field will only be
- * set for "messageLogged" events.
- *
- * @return the priority value
- */
- public int getPriority() {
- return messagePriority;
- }
-
- /**
- * Returns the exception that was thrown, if any. This field will only
- * be set for "taskFinished", "targetFinished", and "buildFinished"
- * events.
- *
- * @return the cause value
- */
- public Throwable getCause() {
- return cause;
- }
-
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/event/BuildListener.java b/proposal/mutant/src/java/common/org/apache/ant/common/event/BuildListener.java
deleted file mode 100644
index 63a13841a..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/event/BuildListener.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.event;
-
-import java.util.EventListener;
-
-/**
- * Classes that implement this interface will be notified when things
- * happend during a build.
- *
- * @author Conor MacNeill
- * @created 15 January 2002
- * @see BuildEvent
- */
-public interface BuildListener extends EventListener {
- /**
- * Fired before any targets are started.
- *
- * @param event the build event for this notification
- */
- void buildStarted(BuildEvent event);
-
- /**
- * Fired after the last target has finished. This event will still be
- * thrown if an error occured during the build.
- *
- * @param event the build event for this notification
- */
- void buildFinished(BuildEvent event);
-
- /**
- * Fired when a target is started.
- *
- * @param event the build event for this notification
- */
- void targetStarted(BuildEvent event);
-
- /**
- * Fired when a target has finished. This event will still be thrown if
- * an error occured during the build.
- *
- * @param event the build event for this notification
- */
- void targetFinished(BuildEvent event);
-
- /**
- * Fired when a task is started.
- *
- * @param event the build event for this notification
- */
- void taskStarted(BuildEvent event);
-
- /**
- * Fired when a task has finished. This event will still be throw if an
- * error occured during the build.
- *
- * @param event the build event for this notification
- */
- void taskFinished(BuildEvent event);
-
- /**
- * Fired whenever a message is logged.
- *
- * @param event the build event for this notification
- */
- void messageLogged(BuildEvent event);
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/event/BuildListenerAdapter.java b/proposal/mutant/src/java/common/org/apache/ant/common/event/BuildListenerAdapter.java
deleted file mode 100644
index 4713bb26f..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/event/BuildListenerAdapter.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.event;
-
-/**
- * Abstract adapter for build listeners which don't want to implement all of
- * the BuildListener methods
- *
- * @author Conor MacNeill
- * @created 9 April 2002
- */
-public abstract class BuildListenerAdapter implements BuildListener {
- /**
- * Fired before any targets are started.
- *
- * @param event the build event for this notification
- */
- public void buildStarted(BuildEvent event) {
- }
-
-
- /**
- * Fired after the last target has finished. This event will still be
- * thrown if an error occured during the build.
- *
- * @param event the build event for this notification
- */
- public void buildFinished(BuildEvent event) {
- }
-
-
-
- /**
- * Fired when a target is started.
- *
- * @param event the build event for this notification
- */
- public void targetStarted(BuildEvent event) {
- }
-
-
-
- /**
- * Fired when a target has finished. This event will still be thrown if an
- * error occured during the build.
- *
- * @param event the build event for this notification
- */
- public void targetFinished(BuildEvent event) {
- }
-
-
-
- /**
- * Fired when a task is started.
- *
- * @param event the build event for this notification
- */
- public void taskStarted(BuildEvent event) {
- }
-
-
-
- /**
- * Fired when a task has finished. This event will still be throw if an
- * error occured during the build.
- *
- * @param event the build event for this notification
- */
- public void taskFinished(BuildEvent event) {
- }
-
-
-
- /**
- * Fired whenever a message is logged.
- *
- * @param event the build event for this notification
- */
- public void messageLogged(BuildEvent event) {
- }
-
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/event/MessageLevel.java b/proposal/mutant/src/java/common/org/apache/ant/common/event/MessageLevel.java
deleted file mode 100644
index 27176d55e..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/event/MessageLevel.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.event;
-
-/**
- * The levels at which a log message may be sent.
- *
- * @author Conor MacNeill
- * @created 16 January 2002
- */
-public class MessageLevel {
- /** Error message level */
- public static final int ERROR = 0;
- /** Warnign message level */
- public static final int WARNING = 1;
- /** Informational message level */
- public static final int INFO = 2;
- /** Verbose message level */
- public static final int VERBOSE = 3;
- /** Debug Message level */
- public static final int DEBUG = 4;
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/input/InputRequest.java b/proposal/mutant/src/java/common/org/apache/ant/common/input/InputRequest.java
deleted file mode 100644
index d4c50a51b..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/input/InputRequest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-
-package org.apache.ant.common.input;
-
-/**
- * Encapsulates an input request.
- *
- * @author Stefan Bodewig
- * @version $Revision$
- * @since Ant 1.5
- */
-public class InputRequest {
- /** Prompt to show the user */
- private String prompt;
-
- /** Input collected from user */
- private String input;
-
- /**
- * @param prompt The prompt to show to the user. Must not be null.
- */
- public InputRequest(String prompt) {
- if (prompt == null) {
- throw new IllegalArgumentException("prompt must not be null");
- }
-
- this.prompt = prompt;
- }
-
- /**
- * Retrieves the prompt text.
- *
- * @return the prompt text.
- */
- public String getPrompt() {
- return prompt;
- }
-
- /**
- * Sets the user provided input.
- *
- * @param input the user provided input.
- */
- public void setInput(String input) {
- this.input = input;
- }
-
- /**
- * Is the user input valid?
- *
- * @return true if the input is valid.
- */
- public boolean isInputValid() {
- return true;
- }
-
- /**
- * Retrieves the user input.
- *
- * @return the user's input.
- */
- public String getInput() {
- return input;
- }
-}
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/logger/BuildLogger.java b/proposal/mutant/src/java/common/org/apache/ant/common/logger/BuildLogger.java
deleted file mode 100755
index 35fb658e3..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/logger/BuildLogger.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.logger;
-
-import java.io.PrintStream;
-import org.apache.ant.common.event.BuildListener;
-
-/**
- * Interface used by Ant to log the build output. A build logger is a build
- * listener which has the 'right' to send output to the ant log, which is
- * usually System.out unles redirected by the -logfile option.
- *
- * @author Conor MacNeill
- * @created 15 January 2002
- */
-public interface BuildLogger extends BuildListener {
- /**
- * Set the msgOutputLevel this logger is to respond to. Only messages
- * with a message level lower than or equal to the given level are
- * output to the log.
- *
- * @param level the logging level for the logger.
- */
- void setMessageOutputLevel(int level);
-
- /**
- * Set the output stream to which this logger is to send its output.
- *
- * @param output the output stream for the logger.
- */
- void setOutputPrintStream(PrintStream output);
-
- /**
- * Set the output stream to which this logger is to send error messages.
- *
- * @param err the error stream for the logger.
- */
- void setErrorPrintStream(PrintStream err);
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/logger/DefaultLogger.java b/proposal/mutant/src/java/common/org/apache/ant/common/logger/DefaultLogger.java
deleted file mode 100755
index 18069bfdf..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/logger/DefaultLogger.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.logger;
-
-import java.io.PrintStream;
-import org.apache.ant.common.antlib.ExecutionComponent;
-import org.apache.ant.common.antlib.Task;
-import org.apache.ant.common.event.BuildEvent;
-import org.apache.ant.common.event.BuildListenerAdapter;
-import org.apache.ant.common.event.MessageLevel;
-import org.apache.ant.common.model.Target;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.Location;
-
-/**
- * Writes build event to a PrintStream. Currently, it only writes which
- * targets are being executed, and any messages that get logged.
- *
- * @author Conor MacNeill
- * @created 15 January 2002
- */
-public class DefaultLogger extends BuildListenerAdapter implements BuildLogger {
-
- /** Standard field separator */
- private static String lSep = System.getProperty("line.separator");
- /** spacing to allow for task tags */
- private static final int LEFT_COLUMN_SIZE = 12;
-
- /** The stream where output should be written */
- private PrintStream out;
- /** The stream to where errors should be written */
- private PrintStream err;
- /** The level of messages which should be let through */
- private int messageOutputLevel = MessageLevel.ERROR;
-
- /** Controls whether adornments are added */
- private boolean emacsMode = false;
- /** The time at which the build started */
- private long startTime = System.currentTimeMillis();
-
- /**
- * Format the time into something readable
- *
- * @param millis Java millis value
- * @return the formatted time
- */
- protected static String formatTime(long millis) {
- long seconds = millis / 1000;
- long minutes = seconds / 60;
-
- if (minutes > 0) {
- return Long.toString(minutes) + " minute"
- + (minutes == 1 ? " " : "s ")
- + Long.toString(seconds % 60) + " second"
- + (seconds % 60 == 1 ? "" : "s");
- } else {
- return Long.toString(seconds) + " second"
- + (seconds % 60 == 1 ? "" : "s");
- }
-
- }
-
- /**
- * Set the messageOutputLevel this logger is to respond to. Only
- * messages with a message level lower than or equal to the given level
- * are output to the log.
- *
- * Constants for the message levels are in Project.java. The order of
- * the levels, from least to most verbose, is MSG_ERR, MSG_WARN,
- * MSG_INFO, MSG_VERBOSE, MSG_DEBUG. The default message level for
- * DefaultLogger is Project.MSG_ERR.
- *
- * @param level the logging level for the logger.
- */
- public void setMessageOutputLevel(int level) {
- this.messageOutputLevel = level;
- }
-
-
- /**
- * Set the output stream to which this logger is to send its output.
- *
- * @param output the output stream for the logger.
- */
- public void setOutputPrintStream(PrintStream output) {
- this.out = output;
- }
-
- /**
- * Set the output stream to which this logger is to send error messages.
- *
- * @param err the error stream for the logger.
- */
- public void setErrorPrintStream(PrintStream err) {
- this.err = err;
- }
-
- /**
- * Set this logger to produce emacs (and other editor) friendly output.
- *
- * @param emacsMode true if output is to be unadorned so that emacs and
- * other editors can parse files names, etc.
- */
- public void setEmacsMode(boolean emacsMode) {
- this.emacsMode = emacsMode;
- }
-
- /**
- * Report an exception
- *
- * @param t The exception to be reported.
- */
- public void reportException(Throwable t) {
- if (t instanceof AntException) {
- AntException e = (AntException) t;
- Location location = e.getLocation();
- Throwable cause = e.getCause();
- if (location != null && location != Location.UNKNOWN_LOCATION) {
- out.print(location);
- }
- out.println(e.getMessage());
-
- if (messageOutputLevel >= MessageLevel.VERBOSE) {
- t.printStackTrace(out);
- }
-
- if (!cause.getMessage().equals(t.getMessage())) {
- out.println("Root cause: " + cause.toString());
- }
- } else {
- t.printStackTrace(err);
- }
- }
-
- /**
- * Description of the Method
- *
- * @param event Description of Parameter
- */
- public void buildStarted(BuildEvent event) {
- startTime = System.currentTimeMillis();
- }
-
- /**
- * Description of the Method
- *
- * @param event Description of Parameter
- */
- public void buildFinished(BuildEvent event) {
- Throwable cause = event.getCause();
-
- if (cause == null) {
- out.println(lSep + "BUILD SUCCESSFUL");
- } else {
- err.println(lSep + "BUILD FAILED" + lSep);
-
- reportException(cause);
- }
-
- out.println(lSep + "Total time: "
- + formatTime(System.currentTimeMillis() - startTime));
- }
-
- /**
- * Description of the Method
- *
- * @param event Description of Parameter
- */
- public void targetStarted(BuildEvent event) {
- if (MessageLevel.INFO <= messageOutputLevel) {
- Target target = (Target) event.getSource();
- out.println(lSep + target.getName() + ":");
- }
- }
-
- /**
- * Description of the Method
- *
- * @param event Description of Parameter
- */
- public void targetFinished(BuildEvent event) {
- }
-
- /**
- * Description of the Method
- *
- * @param event Description of Parameter
- */
- public void taskStarted(BuildEvent event) {
- }
-
- /**
- * Description of the Method
- *
- * @param event Description of Parameter
- */
- public void taskFinished(BuildEvent event) {
- }
-
- /**
- * Description of the Method
- *
- * @param event Description of Parameter
- */
- public void messageLogged(BuildEvent event) {
- PrintStream logTo
- = event.getPriority() == MessageLevel.ERROR ? err : out;
-
- // Filter out messages based on priority
- if (event.getPriority() <= messageOutputLevel) {
-
- String name = null;
- Object source = event.getSource();
- if (source instanceof Task) {
- name = ((Task) source).getTaskName();
- }
-
- if (name == null && source instanceof ExecutionComponent) {
- name = ((ExecutionComponent) source).getComponentType();
- }
-
- if (name != null) {
- // Print out the name of the task if we're in one
- if (!emacsMode) {
- String tag = "[" + name + "] ";
- int indentSize = LEFT_COLUMN_SIZE - tag.length();
- for (int i = 0; i < indentSize; i++) {
- logTo.print(" ");
- }
- logTo.print(tag);
- }
- }
-
- // Print the message
- logTo.println(event.getMessage());
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/model/BuildElement.java b/proposal/mutant/src/java/common/org/apache/ant/common/model/BuildElement.java
deleted file mode 100644
index 2a93a2947..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/model/BuildElement.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.model;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ant.common.util.Location;
-
-/**
- * A BuildElement is a holder of configuration information for an element of
- * the build. BuildElements may be grouped into a hierarchy to capture any
- * level of element nesting.
- *
- * @author Conor MacNeill
- * @created 20 January 2002
- */
-public class BuildElement extends ModelElement {
- /** The attributes of this build element */
- private Map attributes = new HashMap();
-
- /** The element's name or type */
- private String type;
-
- /** The nested task elements that make up this task element. */
- private List nestedElements = new ArrayList();
-
- /** The content (text) of this element */
- private String text = "";
-
- /**
- * Create a Build Element of the given type
- *
- * @param location the location of the element
- * @param type the element's type
- */
- public BuildElement(Location location, String type) {
- super(location);
- this.type = type;
- }
-
- /**
- * Get the text of this element
- *
- * @return the elements's text.
- */
- public String getText() {
- return text;
- }
-
- /**
- * Get an iterator over this element's nested elements
- *
- * @return an iterator which provides BuildElement instances
- */
- public Iterator getNestedElements() {
- return nestedElements.iterator();
- }
-
- /**
- * Get the type of this element
- *
- * @return the element's type
- */
- public String getType() {
- return type;
- }
-
- /**
- * Get an iterator over the elements's attributes
- *
- * @return an iterator which provide's attribute names
- */
- public Iterator getAttributeNames() {
- return attributes.keySet().iterator();
- }
-
- /**
- * Get the value of an attribute.
- *
- * @param attributeName the name of the attribute
- * @return the value of the attribute or null if there is no such
- * attribute.
- */
- public String getAttributeValue(String attributeName) {
- return (String) attributes.get(attributeName);
- }
-
- /**
- * Add text to this element.
- *
- * @param text the element text to add.
- */
- public void addText(String text) {
- this.text += text;
- }
-
- /**
- * Add a nested element to this element
- *
- * @param nestedElement the build element to be added.
- */
- public void addNestedElement(BuildElement nestedElement) {
- nestedElements.add(nestedElement);
- }
-
- /**
- * Add an attribute to this element
- *
- * @param attributeName the name of the attribute
- * @param attributeValue the attribute's value.
- */
- public void addAttribute(String attributeName, String attributeValue) {
- attributes.put(attributeName, attributeValue);
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/model/ModelElement.java b/proposal/mutant/src/java/common/org/apache/ant/common/model/ModelElement.java
deleted file mode 100644
index 3a803e039..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/model/ModelElement.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.model;
-
-import java.util.Iterator;
-
-import org.apache.ant.common.util.Location;
-import org.apache.ant.common.util.AttributeCollection;
-
-/**
- * A ModelElement is an element of a build model. A location may be
- * associated with the model element for error reporting and debugging
- * purposes.
- *
- * @author Conor MacNeill
- * @created 11 January 2002
- */
-public abstract class ModelElement {
- /** The aspectValues defined for this element. */
- private NamespaceValueCollection namespaceValues
- = new NamespaceValueCollection();
-
- /** The starting location of this element */
- private Location location = Location.UNKNOWN_LOCATION;
-
- /** The ending location of this element */
- private Location endLocation = Location.UNKNOWN_LOCATION;
-
- /** A comment associated with this element, if any */
- private String comment;
-
- /**
- * Create a model element giving its location.
- *
- * @param location identifies where this element is defined
- */
- public ModelElement(Location location) {
- this.location = location;
- }
-
- /**
- * Set a comment associated with this element
- *
- * @param comment the comment to be associated with this element.
- */
- public void setComment(String comment) {
- this.comment = comment;
- }
-
- /**
- * Set the end location of this element
- *
- * @param endLocation the location where this element's definition ends
- */
- public void setEndLocation(Location endLocation) {
- this.endLocation = endLocation;
- }
-
- /**
- * Adds attributes of a given namespace detected for this element.
- *
- * @param uri the namespace's URI.
- * @param attributes the attribute collection of the namespace's attribute
- * values.
- */
- public void addNamespaceAttributes(String uri,
- AttributeCollection attributes) {
- namespaceValues.addAttributes(uri, attributes);
- }
-
- /**
- * Get the location of the source where this element is defined
- *
- * @return the element's location
- */
- public Location getLocation() {
- return location;
- }
-
- /**
- * Get the location of the source where this element's definition fiunishes
- *
- * @return the element's end location
- */
- public Location getEndLocation() {
- return endLocation;
- }
-
- /**
- * Get the comment associated with this element.
- *
- * @return the element's comment which may be null.
- */
- public String getComment() {
- return comment;
- }
-
- /**
- * Get an iterator on the namespaces which have been given values on this
- * element
- *
- * @return an iterator of Strings, being the namespaces which have been
- * given values on this element.
- */
- public Iterator getNamespaceURIs() {
- return namespaceValues.getNames();
- }
-
- /**
- * Get the set of attribute values related to the given namespace
- *
- * @param namespaceURI the namesace URI.
- * @return a map of the attribute values for the given namespace.
- */
- public AttributeCollection getNamespaceAttributes(String namespaceURI) {
- return namespaceValues.getAttributes(namespaceURI);
- }
-
- /**
- * Get the value of a single namespace attribute
- *
- * @param namepaceURI the aspect name
- * @param keyName the attribute name
- * @return the aspect value
- */
- public String getNamespaceAttributeValue(String namepaceURI,
- String keyName) {
- return namespaceValues.getAttributeValue(namepaceURI, keyName);
- }
-
- /**
- * Get the complete collection of namespace attribute values.
- *
- * @return an NamespaceValueCollection instance.
- */
- public NamespaceValueCollection getNamespaceAttributes() {
- return namespaceValues;
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/model/ModelException.java b/proposal/mutant/src/java/common/org/apache/ant/common/model/ModelException.java
deleted file mode 100644
index 32212a17d..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/model/ModelException.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.model;
-
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.Location;
-
-/**
- * A model exception is thrown when an operation is attempted which would
- * violate the integrity of the Project/Target/Task object model
- *
- * @author Conor MacNeill
- * @created 16 January 2002
- */
-public class ModelException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public ModelException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public ModelException(String msg, Location location) {
- super(msg, location);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public ModelException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public ModelException(String msg, Throwable cause,
- Location location) {
- super(msg, cause, location);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public ModelException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public ModelException(Throwable cause, Location location) {
- super(cause, location);
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/model/NamespaceValueCollection.java b/proposal/mutant/src/java/common/org/apache/ant/common/model/NamespaceValueCollection.java
deleted file mode 100644
index 374a756ee..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/model/NamespaceValueCollection.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.model;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import org.apache.ant.common.util.AttributeCollection;
-
-/**
- * The NamespaceValueCollection holds namespace values for a range of
- * namespaces. Values can be retrieved for a particular namespace attribute
- * or all attributes of a given namespace.
- *
- * @author Conor MacNeill
- * @created 11 January 2002
- */
-public class NamespaceValueCollection {
- /**
- * The namespaces defined for this collection. Each entry is an attribute
- * collection keyed by the namespace URI.
- */
- private Map namespaces = new HashMap();
-
- /**
- * Add the attributes of a given namespace to this collection.
- *
- * @param uri the namespace's URI.
- * @param attributes the collection of attributes for the given namespace.
- */
- public void addAttributes(String uri, AttributeCollection attributes) {
- AttributeCollection currentCollection
- = (AttributeCollection) namespaces.get(uri);
- if (currentCollection == null) {
- currentCollection = new AttributeCollection();
- namespaces.put(uri, currentCollection);
- }
- for (Iterator i = attributes.getAttributeNames(); i.hasNext();) {
- String attributeName = (String) i.next();
- currentCollection.putAttribute(attributeName,
- attributes.getAttribute(attributeName));
- }
- }
-
- /**
- * Get an iterator on the namespaces which have been given values on this
- * collection
- *
- * @return an iterator of Strings, being the namespaces which have been
- * given values on this element.
- */
- public Iterator getNames() {
- return namespaces.keySet().iterator();
- }
-
- /**
- * Get the set of attribute values related to the given namespace
- *
- * @param namespaceURI the namespace URI
- * @return an attribute collection
- */
- public AttributeCollection getAttributes(String namespaceURI) {
- return (AttributeCollection) namespaces.get(namespaceURI);
- }
-
- /**
- * Get the value of a single namespace attribute
- *
- * @param namespaceURI the namespace URI
- * @param keyName the attribute name
- * @return the namespace attribute value
- */
- public String getAttributeValue(String namespaceURI, String keyName) {
- AttributeCollection namespaceAttributes = getAttributes(namespaceURI);
- if (namespaceAttributes == null) {
- return null;
- }
- return namespaceAttributes.getAttribute(keyName);
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/model/Project.java b/proposal/mutant/src/java/common/org/apache/ant/common/model/Project.java
deleted file mode 100644
index 8646374ae..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/model/Project.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.model;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.apache.ant.common.util.CircularDependencyChecker;
-import org.apache.ant.common.util.CircularDependencyException;
-import org.apache.ant.common.util.Location;
-
-/**
- * A project is a collection of targets and global tasks. A project may
- * reference objects in other projects using named references of the form
- * refname:object
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class Project extends ModelElement {
- /**
- * The delimiter used to separate reference names in target names, data
- * values, etc
- */
- public static final String REF_DELIMITER = ":";
-
- /** The default target in this project. */
- private String defaultTarget = null;
-
- /**
- * The base URL of this project. Relative locations are relative to this
- * base.
- */
- private String base;
-
- /**
- * The name of this project when referenced by a script within this
- * project.
- */
- private String name;
-
- /**
- * These are the targets which belong to the project. They will have
- * interdependencies which are used to determine which targets need to be
- * executed before a given target.
- */
- private Map targets = new HashMap();
-
- /**
- * The global tasks for this project. These are the tasks that will get
- * executed whenever an execution context is associated with this project.
- */
- private List tasks = new ArrayList();
-
- /** The URL where the project is defined. */
- private URL sourceURL;
-
-
- /**
- * Create a Project
- *
- * @param sourceURL the URL where the project is defined.
- * @param location the location of this element within the source.
- */
- public Project(URL sourceURL, Location location) {
- super(location);
- this.sourceURL = sourceURL;
- }
-
-
- /**
- * Set the defautl target of this project.
- *
- * @param defaultTarget the name of the defaultTarget of this project.
- */
- public void setDefaultTarget(String defaultTarget) {
- this.defaultTarget = defaultTarget;
- }
-
-
- /**
- * Set the base URL for this project.
- *
- * @param base the baseURL for this project.
- */
- public void setBase(String base) {
- this.base = base;
- }
-
-
- /**
- * Set the name of this project.
- *
- * @param name the name for this project.
- */
- public void setName(String name) {
- this.name = name;
- }
-
-
- /**
- * Get the URL where this project is defined
- *
- * @return the project source URL
- */
- public URL getSourceURL() {
- return sourceURL;
- }
-
-
- /**
- * Get the Project's default Target, if any
- *
- * @return the project's defautl target or null if there is no default.
- */
- public String getDefaultTarget() {
- return defaultTarget;
- }
-
-
- /**
- * Get the base URL for this project.
- *
- * @return the baseURL for this project as a string.
- */
- public String getBase() {
- return base;
- }
-
-
- /**
- * Get the name of the project element
- *
- * @return the project's name
- */
- public String getName() {
- return name;
- }
-
-
- /**
- * Get the targets in this project.
- *
- * @return an iterator returning Target objects.
- */
- public Iterator getTargets() {
- return targets.values().iterator();
- }
-
-
- /**
- * Get the target with the given name
- *
- * @param targetName the name of the desired target.
- * @return the target with the given name or null if there is no such
- * target.
- */
- public Target getTarget(String targetName) {
- return (Target) targets.get(targetName);
- }
-
-
- /**
- * Get the initialisation tasks for this project
- *
- * @return an iterator over the set of tasks for this project.
- */
- public Iterator getTasks() {
- return tasks.iterator();
- }
-
- /**
- * Add a target to the project.
- *
- * @param target the Target to be added
- * @throws ModelException if a target with the same name already exists.
- */
- public void addTarget(Target target) throws ModelException {
- if (targets.containsKey(target.getName())) {
- throw new ModelException("A target with name '"
- + target.getName() +
- "' has already been defined in this project",
- target.getLocation());
- }
- targets.put(target.getName(), target);
- }
-
-
- /**
- * Add a task to the list of global tasks for this project.
- *
- * @param task a task to be executed when an execution context is
- * associated with the Project (a non-target task)
- */
- public void addTask(BuildElement task) {
- tasks.add(task);
- }
-
- /**
- * Validate this project
- *
- * @exception ModelException if the project is not valid
- */
- public void validate() throws ModelException {
- // check whether all of dependencies for our targets
- // exist in the model
-
- // visited contains the targets we have already visited and verified
- Set visited = new HashSet();
- // checker records the targets we are currently visiting
- CircularDependencyChecker checker
- = new CircularDependencyChecker("checking target dependencies");
- // dependency order is purely recorded for debug purposes
- List dependencyOrder = new ArrayList();
-
- for (Iterator i = getTargets(); i.hasNext();) {
- Target target = (Target) i.next();
-
- target.validate();
- fillinDependencyOrder(target, dependencyOrder,
- visited, checker);
- }
- }
-
-
- /**
- * Determine target dependency order within this project.
- *
- * @param target The target being examined
- * @param dependencyOrder The dependency order of targets
- * @param visited Set of targets in this project already visited.
- * @param checker A circular dependency checker
- * @exception ModelException if the dependencies of the project's targets
- * are not valid.
- */
- public void fillinDependencyOrder(Target target,
- List dependencyOrder, Set visited,
- CircularDependencyChecker checker)
- throws ModelException {
- if (visited.contains(target.getName())) {
- return;
- }
-
- try {
- String targetName = target.getName();
- checker.visitNode(targetName);
-
- for (Iterator i = target.getDependencies(); i.hasNext();) {
- String dependency = (String) i.next();
- boolean localTarget = (dependency.indexOf(REF_DELIMITER) == -1);
- if (localTarget) {
- Target dependencyTarget = getTarget(dependency);
-
- if (dependencyTarget == null) {
- StringBuffer sb = new StringBuffer("Target '");
-
- sb.append(dependency);
- sb.append("' does not exist in this project. ");
- throw new ModelException(new String(sb),
- target.getLocation());
- }
-
- // need to check the targets we depend on
- fillinDependencyOrder(dependencyTarget,
- dependencyOrder, visited, checker);
- }
- }
-
- visited.add(targetName);
- checker.leaveNode(targetName);
- dependencyOrder.add(targetName);
- } catch (CircularDependencyException e) {
- throw new ModelException(e.getMessage(),
- target.getLocation());
- }
- }
-
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/model/Target.java b/proposal/mutant/src/java/common/org/apache/ant/common/model/Target.java
deleted file mode 100644
index 63e30f50f..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/model/Target.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.model;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.ant.common.util.Location;
-
-/**
- * A Target is a collection of tasks. It may have dependencies on other
- * targets
- *
- * @author Conor MacNeill
- * @created 12 January 2002
- */
-public class Target extends ModelElement {
- /** This target's dependencies on other targets, if any */
- private List dependencies = new ArrayList();
-
- /** This target's list of tasks */
- private List tasks = new ArrayList();
-
- /** The target's name. */
- private String name;
-
- /** The Target's description */
- private String description;
-
- /** Description of the Field */
- private String ifCondition;
-
- /** Description of the Field */
- private String unlessCondition;
-
- /**
- * Construct the target, given its name
- *
- * @param location the location of the element
- * @param name the target's name.
- */
- public Target(Location location, String name) {
- super(location);
- this.name = name;
- }
-
- /**
- * Sets the IfCondition of the Target
- *
- * @param ifCondition The new IfCondition value
- */
- public void setIfCondition(String ifCondition) {
- this.ifCondition = ifCondition;
- }
-
- /**
- * Sets the UnlessCondition of the Target
- *
- * @param unlessCondition The new UnlessCondition value
- */
- public void setUnlessCondition(String unlessCondition) {
- this.unlessCondition = unlessCondition;
- }
-
- /**
- * Sets the Target's description
- *
- * @param description The new description value
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * Gets the IfCondition of the Target
- *
- * @return The IfCondition value
- */
- public String getIfCondition() {
- return ifCondition;
- }
-
- /**
- * Gets the UnlessCondition of the Target
- *
- * @return The UnlessCondition value
- */
- public String getUnlessCondition() {
- return unlessCondition;
- }
-
- /**
- * Get this target's name.
- *
- * @return the target's name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Gets the Target's description
- *
- * @return The description value
- */
- public String getDescription() {
- return description;
- }
-
-
- /**
- * Get this target's dependencies.
- *
- * @return an iterator over the target's dependencies.
- */
- public Iterator getDependencies() {
- return dependencies.iterator();
- }
-
- /**
- * Get the tasks for this target
- *
- * @return an iterator over the set of tasks for this target.
- */
- public Iterator getTasks() {
- return tasks.iterator();
- }
-
- /**
- * Add a task to this target
- *
- * @param task the task to be added to the target.
- */
- public void addTask(BuildElement task) {
- tasks.add(task);
- }
-
- /**
- * Add a dependency to this target
- *
- * @param dependency the name of a target upon which this target
- * depends
- */
- public void addDependency(String dependency) {
- dependencies.add(dependency);
- }
-
- /**
- * Validate that this build element is configured correctly
- *
- * @exception ModelException if the element is invalid
- */
- public void validate() throws ModelException {
- if (name == null) {
- throw new ModelException("Target must have a name",
- getLocation());
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/service/ComponentService.java b/proposal/mutant/src/java/common/org/apache/ant/common/service/ComponentService.java
deleted file mode 100644
index ba134f83e..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/service/ComponentService.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.service;
-import java.net.URL;
-import org.apache.ant.common.antlib.AntLibFactory;
-import org.apache.ant.common.model.BuildElement;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.AttributeCollection;
-
-
-/**
- * The Component Service is used to manage the definitions that Ant uses at
- * runtime. It supports the following operations
- *
- *
Definition of library search paths
- *
Importing tasks from a library
- *
taskdefs
- *
typedefs
- *
- *
- *
- * @author Conor MacNeill
- * @created 27 January 2002
- */
-public interface ComponentService {
- /**
- * Load a single or multiple Ant libraries
- *
- * @param libLocation the location of the library or the libraries
- * @param importAll true if all components of the loaded libraries
- * should be imported
- * @exception AntException if the library or libraries cannot be
- * imported.
- */
- void loadLib(URL libLocation, boolean importAll)
- throws AntException;
-
- /**
- * Add a library path to the given library. The library path is used in
- * the construction of the library's classloader
- *
- * @param libraryId the library's unique identifier
- * @param libPath the path to be added to the list of paths used by the
- * library.
- * @exception AntException if the path cannot be used.
- */
- void addLibPath(String libraryId, URL libPath) throws AntException;
-
- /**
- * Define a new type
- *
- * @param typeName the name by which this type will be referred
- * @param factory the library factory object to create the type
- * instances
- * @param loader the class loader to use to create the particular types
- * @param className the name of the class implementing the type
- * @exception AntException if the type cannot be defined
- */
- void typedef(AntLibFactory factory, ClassLoader loader,
- String typeName, String className)
- throws AntException;
-
- /**
- * Experimental - define a new task
- *
- * @param taskName the name by which this task will be referred
- * @param factory the library factory object to create the task
- * instances
- * @param loader the class loader to use to create the particular tasks
- * @param className the name of the class implementing the task
- * @exception AntException if the task cannot be defined
- */
- void taskdef(AntLibFactory factory, ClassLoader loader,
- String taskName, String className)
- throws AntException;
-
-
- /**
- * Import a single component from a library, optionally aliasing it to a
- * new name
- *
- * @param libraryId the unique id of the library from which the
- * component is being imported
- * @param defName the name of the component within its library
- * @param alias the name under which this component will be used in the
- * build scripts. If this is null, the components default name is
- * used.
- * @exception AntException if the component cannot be imported
- */
- void importComponent(String libraryId, String defName,
- String alias) throws AntException;
-
- /**
- * Import a complete library into the current execution frame
- *
- * @param libraryId The id of the library to be imported
- * @exception AntException if the library cannot be imported
- */
- void importLibrary(String libraryId) throws AntException;
-
- /**
- * Imports a component defined in another frame.
- *
- * @param relativeName the qualified name of the component relative to
- * this execution frame
- * @param alias the name under which this component will be used in the
- * build scripts. If this is null, the components default name is
- * used.
- * @exception AntException if the component cannot be imported
- */
- void importFrameComponent(String relativeName, String alias)
- throws AntException;
-
- /**
- * Create a component. The component will have a context but will not be
- * configured. It should be configured using the appropriate set methods
- * and then validated before being used.
- *
- * @param componentName the name of the component
- * @return the created component. The return type of this method depends
- * on the component type.
- * @exception AntException if the component cannot be created
- */
- Object createComponent(String componentName) throws AntException;
-
- /**
- * Create a component given its libraryId and local name within the
- * library. This method is unambiguous in the face of imports, aliases and
- * taskdefs performed in the build.
- *
- * @param libraryId the component's library identifier.
- * @param localName the name component within the library.
- * @return the created component. The return type of this method depends
- * on the component type.
- * @exception AntException if the component cannot be created
- */
- Object createComponent(String libraryId, String localName)
- throws AntException;
-
- /**
- * Create a component from a build model. The returned object will be
- * configured according to the model.
- *
- * @param model the build element to use to create and configure the
- * component
- * @return the created component.
- * @exception AntException if the component cannot be created
- */
- Object createComponent(BuildElement model) throws AntException;
-
- /**
- * Set an attribute on an object.
- *
- * This method is useful for manipulating components without assuming
- * anything about the component's type. The context classloader should be
- * set to the component's loaded when calling this method.
- *
- * @param component the component on which to set the attribute
- * @param attributeName the attribute name
- * @param attributeValue the required value
- *
- * @exception AntException if the attribute cannot be set.
- */
- void setAttribute(Object component, String attributeName,
- String attributeValue) throws AntException;
-
- /**
- * Add a nested element to a component.
- *
- * This method is useful for manipulating components without assuming
- * anything about the component's type. The context classloader should be
- * set to the component's loaded when calling this method.
- *
- * @param component the component to which the nested element will be added.
- * @param nestedElementName the name of the nested element.
- * @param nestedElement the actual object to be added.
- *
- * @exception AntException if the nested element cannot be added.
- */
- void addNestedElement(Object component, String nestedElementName,
- Object nestedElement) throws AntException;
-
- /**
- * configure an object with attribtes from the given map
- *
- * @param object the object to be configured.
- * @param attributeValues a map containing named attribute values.
- * @param ignoreUnsupported if this is true, attribute names for which no
- * setter method exists are ignored.
- * @exception AntException if the object does not support an
- * attribute in the map.
- */
- void configureAttributes(Object object, AttributeCollection attributeValues,
- boolean ignoreUnsupported)
- throws AntException;
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/service/DataService.java b/proposal/mutant/src/java/common/org/apache/ant/common/service/DataService.java
deleted file mode 100644
index 4e7e79179..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/service/DataService.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.service;
-import java.util.Map;
-
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.util.DataValue;
-
-/**
- * Service interface for Data value manipulation operations provided by the
- * core.
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public interface DataService {
-
- /**
- * Get a data value
- *
- * @param valueName the name of the data value
- * @return the current object associated with the name or null if no value
- * is currently associated with the name
- * @exception AntException if the value cannot be retrieved.
- */
- Object getDataValue(String valueName) throws AntException;
-
- /**
- * Indicate if a data value has been set
- *
- * @param name the name of the data value - may contain reference
- * delimiters
- * @return true if the value exists
- * @exception AntException if the containing frame for the value does not
- * exist
- */
- boolean isDataValueSet(String name) throws AntException;
-
- /**
- * Set a data value. If an existing data value exists, associated with the
- * given name, the value will not be changed
- *
- * @param valueName the name of the data value
- * @param value the value to be associated with the name
- * @param mutable if true, existing values can be changed
- * @exception AntException if the value cannot be set
- */
- void setDataValue(String valueName, DataValue value, boolean mutable)
- throws AntException;
-
- /**
- * Replace ${} style constructions in the given value with the string
- * value of the corresponding data values in the frame
- *
- * @param value the string to be scanned for property references.
- * @return the string with all property references replaced
- * @exception AntException if any of the properties do not exist
- */
- String replacePropertyRefs(String value) throws AntException;
-
- /**
- * Replace ${} style constructions in the given value with the string
- * value of the objects in the given map. Any values which are not found
- * are left unchanged.
- *
- * @param value the string to be scanned for property references.
- * @param replacementValues the collection of replacement values
- * @return the string with all property references replaced
- * @exception AntException if any of the properties do not exist
- */
- String replacePropertyRefs(String value, Map replacementValues)
- throws AntException;
-
- /**
- * Get all the properties from the frame and any references frames. This
- * is an expensive operation since it must clone all of the property
- * stores in all frames
- *
- * @return a Map containing the frames data values indexed by their full
- * name.
- * @exception AntExceptionif the values cannot be retrieved.
- */
- Map getAllDataValues() throws AntException;
-
- /**
- * Merge one set of values into another
- *
- * @param values the values to which the new values are added
- * @param newValues the values to be added in.
- */
- void mergeDataValues(Map values, Map newValues);
-
- /**
- * Merge in values which are of a given priority or higher.
- *
- * @param values the values to which the new values are added
- * @param newValues the values to be added in.
- * @param threshold The require data value priority for a value to be
- * merged.
- */
- void mergeDataValues(Map values, Map newValues, int threshold);
-
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/service/EventService.java b/proposal/mutant/src/java/common/org/apache/ant/common/service/EventService.java
deleted file mode 100644
index ebb25f9cb..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/service/EventService.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.service;
-import org.apache.ant.common.event.BuildListener;
-import org.apache.ant.common.util.AntException;
-
-/**
- * Core service to manage receiving of events by components within Ant.
- *
- * @author Conor MacNeill
- * @created 7 February 2002
- */
-public interface EventService {
- /**
- * Add a build listener to the current frame
- *
- * @param listener the lister which will receive build events
- * @exception AntException if the listener cannot be added
- */
- void addBuildListener(BuildListener listener) throws AntException;
-
- /**
- * Remove a listener from the current frame
- *
- * @param listener the listener to be removed
- * @exception AntException if the listener could not be removed
- */
- void removeBuildListener(BuildListener listener) throws AntException;
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/service/ExecService.java b/proposal/mutant/src/java/common/org/apache/ant/common/service/ExecService.java
deleted file mode 100644
index 0feed6576..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/service/ExecService.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.service;
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-import org.apache.ant.common.antlib.Task;
-import org.apache.ant.common.model.Project;
-import org.apache.ant.common.util.AntException;
-import org.apache.ant.common.model.NamespaceValueCollection;
-import org.apache.ant.common.event.BuildListener;
-
-/**
- * The ExecService provides executiuon services to tasks
- *
- * @author Conor MacNeill
- * @created 8 February 2002
- */
-public interface ExecService {
- /**
- * Parse an XML file into a build model.
- *
- * @param xmlBuildFile The file containing the XML build description.
- * @return A Project model for the build.
- * @exception AntException if the build cannot be parsed
- */
- Project parseXMLBuildFile(File xmlBuildFile) throws AntException;
-
-
- /**
- * Create a project reference.
- *
- * @param referenceName the name under which the project will be
- * referenced.
- * @param model the project model.
- * @param initialData the project's initial data load.
- * @exception AntException if the project cannot be referenced.
- */
- void createProjectReference(String referenceName, Project model,
- Map initialData) throws AntException;
-
-
- /**
- * Setup a sub-build.
- *
- * @param model the project model to be used for the build
- * @param dataValue the initial properties to be used in the build
- * @param addListeners true if the current frame's listeners should be
- * added to the created Frame
- * @return a key to the build allowing it to be executed and managed
- * @exception AntException if the subbuild cannot be setup
- */
- Object setupBuild(Project model, Map dataValue, boolean addListeners)
- throws AntException;
-
-
- /**
- * Setup a sub-build using the current frame's project model
- *
- * @param dataValue the initial properties to be used in the build
- * @param addListeners true if the current frame's listeners should be
- * added to the created Frame
- * @return a key to the build allowing it to be executed and managed
- * @exception AntException if the subbuild cannot be setup
- */
- Object setupBuild(Map dataValue, boolean addListeners)
- throws AntException;
-
-
- /**
- * Force initialisation of a particular ant library in the context of the
- * given subbuild.
- *
- * @param key the build key.
- * @param libraryId the id of the library to be initialized.
- * @exception AntException if the build cannot be run
- */
- void initializeBuildLibrary(Object key, String libraryId)
- throws AntException;
-
- /**
- * Add a listener to a subbuild
- *
- * @param key the key identifying the build previously setup
- * @param listener the listener to add to the build.
- *
- * @exception AntException if the build cannot be found.
- */
- void addBuildListener(Object key, BuildListener listener)
- throws AntException;
-
-
- /**
- * Run a build which have been previously setup
- *
- * @param key the key returned previously when the build was
- * setup
- * @param targets A list of targets to be run
- * @exception AntException if the build cannot be run
- */
- void runBuild(Object key, List targets)
- throws AntException;
-
- /**
- * execute a task. The task should have already been initialised by the
- * core
- *
- * @param task the task to be executed.
- * @exception AntException if there is a problem in execution.
- */
- void executeTask(Task task) throws AntException;
-
-
- /**
- * Execute a task with a set of aspect values. Normally aspect values come
- * from a build model but not all tasks will be created from a build model.
- * Some may be created dynamically and configured programatically. This
- * method allows aspect values to provided for execution of such tasks since
- * by their nature, aspect values are not part of the task configuration.
- *
- * @param task the task to be executed
- * @param namespaceValues the namespace attribute values.
- * @exception AntException if there is an execution problem
- */
- void executeTask(Task task, NamespaceValueCollection namespaceValues)
- throws AntException;
-
-
- /**
- * get the name of the project associated with this execution.
- *
- * @return the project's name
- */
- String getProjectName();
-
-
- /**
- * Get the basedir for the current execution
- *
- * @return the base directory for this execution of Ant
- */
- File getBaseDir();
-
- /**
- * Set the basedir for the current execution
- *
- * @param baseDir the new base directory for this execution of Ant
- * @exception AntException if the base directory cannot be set to the given
- * value.
- */
- void setBaseDir(File baseDir) throws AntException ;
-
-
- /**
- * Handle subbuild output.
- *
- * @param subbuildKey the core's key for managing the subbuild.
- * @param line the content produce by the current thread.
- * @param isErr true if this content is from the thread's error stream.
- * @exception AntException if the subbuild cannot be found.
- */
- void handleBuildOutput(Object subbuildKey, String line, boolean isErr)
- throws AntException;
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/service/FileService.java b/proposal/mutant/src/java/common/org/apache/ant/common/service/FileService.java
deleted file mode 100644
index 897a9419e..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/service/FileService.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.service;
-
-import java.io.File;
-import org.apache.ant.common.util.AntException;
-
-/**
- * Service interface for File manipulation operations provided by the Ant
- * Core
- *
- * @author Conor MacNeill
- * @created 27 January 2002
- */
-public interface FileService {
- /**
- * Resolve a file according to the base directory of the project
- * associated with this context
- *
- * @param fileName the file name to be resolved.
- * @return the file resolved to the project's base dir
- * @exception AntException if the file cannot be resolved
- */
- File resolveFile(String fileName) throws AntException;
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/service/InputService.java b/proposal/mutant/src/java/common/org/apache/ant/common/service/InputService.java
deleted file mode 100644
index 5bd7d6302..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/service/InputService.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.service;
-
-import org.apache.ant.common.input.InputRequest;
-import org.apache.ant.common.util.AntException;
-
-/**
- * Service interface for input management
- *
- * @author Conor MacNeill
- * @created 30 April 2002
- */
-public interface InputService {
- /**
- * Handle an input request
- *
- * @param request an input request
- * @exception AntException if the request cannot be handled
- */
- void handleInput(InputRequest request) throws AntException;
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/service/MagicProperties.java b/proposal/mutant/src/java/common/org/apache/ant/common/service/MagicProperties.java
deleted file mode 100644
index 7125f76ef..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/service/MagicProperties.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.service;
-
-/**
- * Ant's magic properties
- *
- * @author Conor MacNeill
- * @created 7 February 2002
- */
-public class MagicProperties {
- /**
- * This property describes the basedir which is being used for an Ant
- * run.
- */
- public static final String BASEDIR = "basedir";
-
- /** This property provides the location of Ant's home directory */
- public static final String ANT_HOME = "ant.home";
-
- /** The file containing the current project model, if any */
- public static final String ANT_FILE = "ant.file";
-
- /** The name of the project */
- public static final String ANT_PROJECT_NAME = "ant.project.name";
-
- /** The version of Ant */
- public static final String ANT_VERSION = "ant.version";
-
- /** The version of java detected by Ant. */
- public static final String ANT_JAVA_VERSION = "ant.java.version";
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/AntException.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/AntException.java
deleted file mode 100755
index 7ae63c48f..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/AntException.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.util;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-/**
- * An AntException indicates some exceptional case has been encountered in
- * the processing of Ant. AntExceptions may accept a Throwable as a cause
- * allowing exceptions to be nested
- *
- * @author Conor MacNeill
- * @created 15 January 2002
- */
-public abstract class AntException extends Exception {
- /** Exception that might have caused this one. */
- private Throwable cause = null;
-
- /**
- * The location of the element which is associated with this exception
- * if known.
- */
- private Location location = Location.UNKNOWN_LOCATION;
-
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public AntException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public AntException(String msg, Throwable cause) {
- super(msg);
- this.cause = cause;
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public AntException(String msg, Throwable cause, Location location) {
- this(msg, cause);
- setLocation(location, true);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public AntException(Throwable cause) {
- super(cause.getMessage() == null
- ? cause.getClass().getName() : cause.getMessage());
- this.cause = cause;
- }
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public AntException(String msg, Location location) {
- super(msg);
- setLocation(location, true);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public AntException(Throwable cause, Location location) {
- this(cause);
- setLocation(location, true);
- }
-
- /**
- * Sets the file location where the error occured.
- *
- * @param newLocation the new location value
- * @param override true if the location should override any currently
- * set location
- */
- public void setLocation(Location newLocation, boolean override) {
- if (override || location == Location.UNKNOWN_LOCATION) {
- if (newLocation == null) {
- this.location = Location.UNKNOWN_LOCATION;
- } else {
- this.location = newLocation;
- }
- }
- }
-
- /**
- * Returns the nested exception.
- *
- * @return the underlying exception
- */
- public Throwable getCause() {
- return cause;
- }
-
- /**
- * Returns the file location where the error occured.
- *
- * @return the location value
- */
- public Location getLocation() {
- return location;
- }
-
- /** Print the stack trace to System.err */
- public void printStackTrace() {
- printStackTrace(System.err);
- }
-
- /**
- * Print the stack trace to the given PrintStream
- *
- * @param ps the PrintStream onto which the stack trace of this
- * exception is to be printed
- */
- public void printStackTrace(PrintStream ps) {
- synchronized (ps) {
- super.printStackTrace(ps);
- if (cause != null) {
- ps.println("--- Nested Exception ---");
- cause.printStackTrace(ps);
- }
- }
- }
-
- /**
- * Print the stack trace to the given PrintWriter
- *
- * @param pw the PrintWriter onto which the stack trace of this
- * exception is to be printed
- */
- public void printStackTrace(PrintWriter pw) {
- synchronized (pw) {
- super.printStackTrace(pw);
- if (cause != null) {
- pw.println("--- Nested Exception ---");
- cause.printStackTrace(pw);
- }
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/AttributeCollection.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/AttributeCollection.java
deleted file mode 100644
index a652d9fa2..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/AttributeCollection.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.util;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import java.util.Map;
-
-/**
- * An Attribute collection is a simple collection of named values
- *
- * @author Conor MacNeill
- * @created 14 June 2002
- */
-public class AttributeCollection {
- /** The attribute values */
- private Map attributes = new HashMap();
-
- /**
- * Get the value of an attribute given its name
- *
- * @param attributeName the attribute name
- * @return the attribute value or null if there is no such attribute.
- */
- public String getAttribute(String attributeName) {
- return (String) attributes.get(attributeName);
- }
-
- /**
- * Set the value of an attribute.
- *
- * @param attributeName the name of the attribute.
- * @param attributeValue the value of the attribute.
- */
- public void putAttribute(String attributeName, String attributeValue) {
- attributes.put(attributeName, attributeValue);
- }
-
- /**
- * Get an iterator over the names of all the attributes in the collection.
- *
- * @return an iterator of attribute names.
- */
- public Iterator getAttributeNames() {
- return attributes.keySet().iterator();
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/CircularDependencyChecker.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/CircularDependencyChecker.java
deleted file mode 100644
index e619bfd36..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/CircularDependencyChecker.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.util;
-import java.util.Stack;
-
-/**
- * Checks for circular dependencies when visiting nodes of an object
- * hierarchy
- *
- * @author Conor MacNeill
- * @created 14 January 2002
- */
-public class CircularDependencyChecker {
- /**
- * The activity being undertaken which checking for circular
- * redundancies. This is used for reporting exceptions
- */
- private String activity;
-
- /** The nodes which we are currently visiting */
- private Stack nodes = new Stack();
-
- /**
- * Constructor for the CircularDependencyChecker object
- *
- * @param activity the activity being undertaken
- */
- public CircularDependencyChecker(String activity) {
- this.activity = activity;
- }
-
- /**
- * Visit a Node to check its relationships to other nodes
- *
- * @param node an object which is being visited and analyzed
- * @exception CircularDependencyException if this node is alreay being
- * visited.
- */
- public void visitNode(Object node) throws CircularDependencyException {
- if (nodes.contains(node)) {
- throw new CircularDependencyException(getDescription(node));
- }
- nodes.push(node);
- }
-
- /**
- * Complete the examination of the node and leave.
- *
- * @param node an object for which the examination of relationships has
- * been completed
- * @exception CircularDependencyException if the given node was not
- * expected.
- */
- public void leaveNode(Object node) throws CircularDependencyException {
- if (!nodes.pop().equals(node)) {
- throw new CircularDependencyException("Internal error: popped " +
- "element was unexpected");
- }
- }
-
- /**
- * Gets the description of the circular dependency
- *
- * @param endNode the node which was revisited and where the circular
- * dependency was detected
- * @return the description of the circular dependency
- */
- private String getDescription(Object endNode) {
- StringBuffer sb = new StringBuffer("Circular dependency while "
- + activity + ": ");
- sb.append(endNode);
- Object o = null;
- do {
- o = nodes.pop();
- sb.append(" <- ");
- sb.append(o.toString());
- } while (!(o.equals(endNode)));
-
- return new String(sb);
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/CircularDependencyException.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/CircularDependencyException.java
deleted file mode 100644
index b8a0ba75a..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/CircularDependencyException.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.util;
-
-/**
- * A CircularDependencyException indicates that a circular dependency has
- * been detected
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class CircularDependencyException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public CircularDependencyException(String msg) {
- super(msg);
- }
-
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public CircularDependencyException(String msg, Location location) {
- super(msg, location);
- }
-
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public CircularDependencyException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public CircularDependencyException(String msg, Throwable cause,
- Location location) {
- super(msg, cause, location);
- }
-
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public CircularDependencyException(Throwable cause) {
- super(cause);
- }
-
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public CircularDependencyException(Throwable cause, Location location) {
- super(cause, location);
- }
-
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/DataValue.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/DataValue.java
deleted file mode 100644
index b9af44f31..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/DataValue.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.util;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import java.util.Map;
-
-/**
- * A DataValue is an arbitrary value with an associated priority.
- *
- * @author Conor MacNeill
- * @created 26 June 2002
- */
-public class DataValue {
- /** Base priority level */
- public static final int PRIORITY_BASE = 0;
- /** Prioirty of values inherited from a super build. */
- public static final int PRIORITY_INHERIT = 10;
- /** Priority of values specified by the user. */
- public static final int PRIORITY_USER = 20;
-
- /** The DataValue's priority */
- private int priority;
- /** The actual data. */
- private Object value;
-
- /**
- * Create a DataValue with the given data and priority.
- *
- * @param value the actual value
- * @param priority the priority associated with this value.
- */
- public DataValue(Object value, int priority) {
- this.priority = priority;
- this.value = value;
- }
-
- /**
- * Convert plain named values into a collection of DataValues with the
- * given priority
- *
- * @param values A collection of values named by String keys
- * @param priority The required data value to be applied to the values.
- * @return A collection of datavalues corresponding to the input collection
- * and having the specified priority.
- */
- public static Map makeDataValues(Map values, int priority) {
- Map dataValues = new HashMap();
- for (Iterator i = values.keySet().iterator(); i.hasNext();) {
- Object key = i.next();
- Object value = values.get(key);
- dataValues.put(key, new DataValue(value, priority));
- }
- return dataValues;
- }
-
- /**
- * Gets the priority of the DataValue object
- *
- * @return the priority value
- */
- public int getPriority() {
- return priority;
- }
-
- /**
- * Gets the value of the DataValue object
- *
- * @return the value value
- */
- public Object getValue() {
- return value;
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/DemuxOutputReceiver.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/DemuxOutputReceiver.java
deleted file mode 100644
index a10471de0..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/DemuxOutputReceiver.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001-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
- * .
- */
-package org.apache.ant.common.util;
-
-/**
- * A Demux output receiver receives buffered content which has been
- * demultiplexed from the output potentially generated by multiple threads
- *
- * @author Conor MacNeill
- * @created 22 February 2002
- */
-public interface DemuxOutputReceiver {
- /**
- * Handle the content from a single thread. This method will be called
- * by the thread producing the content. The content is broken up into
- * separate lines
- *
- * @param line the content produce by the current thread.
- * @param isErr true if this content is from the thread's error stream.
- */
- void threadOutput(String line, boolean isErr);
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/DemuxOutputStream.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/DemuxOutputStream.java
deleted file mode 100644
index 5ae762a6e..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/DemuxOutputStream.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001-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
- * .
- */
-package org.apache.ant.common.util;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import java.io.OutputStream;
-import java.util.Hashtable;
-
-/**
- * Buffers content written per thread and forwards the buffers onto the
- * given receiver
- *
- * @author Conor MacNeill
- * @created 22 February 2002
- */
-public class DemuxOutputStream extends OutputStream {
-
- /**
- * A data class to store information about a buffer. Such informatio is
- * stored on a per-thread basis.
- *
- * @author Conor MacNeill
- * @created 22 February 2002
- */
- private static class BufferInfo {
- /** The per-thread output stream */
- private ByteArrayOutputStream buffer;
-
- /**
- * Whether the next line-terminator should be skipped in terms of
- * processing the buffer or not. Used to avoid \r\n invoking
- * processBuffer twice.
- */
- private boolean skip = false;
- }
-
- /** Maximum buffer size */
- private static final int MAX_SIZE = 1024;
- /** Mapping from thread to buffer (Thread to BufferInfo) */
- private Hashtable buffers = new Hashtable();
-
- /** The object which receives the output */
- private DemuxOutputReceiver receiver;
-
- /** Whether or not this stream represents an error stream */
- private boolean isErrorStream;
-
- /**
- * Creates a new instance of this class.
- *
- * @param isErrorStream true if this is the error string, otherwise a
- * normal output stream. This is passed to the project so it knows
- * which stream it is receiving.
- * @param receiver The receiver to which demux'd content is sent.
- */
- public DemuxOutputStream(DemuxOutputReceiver receiver,
- boolean isErrorStream) {
- this.receiver = receiver;
- this.isErrorStream = isErrorStream;
- }
-
- /**
- * Writes the data to the buffer and flushes the buffer if a line
- * separator is detected or if the buffer has reached its maximum size.
- *
- * @param cc data to log (byte).
- * @exception IOException if the data cannot be written to the stream
- */
- public void write(int cc) throws IOException {
- final byte c = (byte) cc;
-
- BufferInfo bufferInfo = getBufferInfo();
- if ((c == '\n') || (c == '\r')) {
- if (!bufferInfo.skip) {
- processBuffer(bufferInfo.buffer);
- }
- } else {
- bufferInfo.buffer.write(cc);
- if (bufferInfo.buffer.size() > MAX_SIZE) {
- processBuffer(bufferInfo.buffer);
- }
- }
- bufferInfo.skip = (c == '\r');
- }
-
- /**
- * Equivalent to calling {@link #flush flush} on the stream.
- *
- * @exception IOException if there is a problem closing the stream.
- */
- public void close() throws IOException {
- flush();
- }
-
- /**
- * Writes all remaining data in the buffer associated with the current
- * thread to the project.
- *
- * @exception IOException if there is a problem flushing the stream.
- */
- public void flush() throws IOException {
- BufferInfo bufferInfo = getBufferInfo();
- if (bufferInfo.buffer.size() > 0) {
- processBuffer(bufferInfo.buffer);
- }
- }
-
-
- /**
- * Converts the buffer to a string and sends it to {@link
- * Project#demuxOutput(String,boolean) Project.demuxOutput}.
- *
- * @param buffer the ByteArrayOutputStream used to collect the output
- * until a line separator is seen.
- */
- protected void processBuffer(ByteArrayOutputStream buffer) {
- String output = buffer.toString();
- receiver.threadOutput(output, isErrorStream);
- resetBufferInfo();
- }
-
- /**
- * Returns the buffer associated with the current thread.
- *
- * @return a ByteArrayOutputStream for the current thread to write data
- * to
- */
- private BufferInfo getBufferInfo() {
- Thread current = Thread.currentThread();
- BufferInfo bufferInfo = (BufferInfo) buffers.get(current);
- if (bufferInfo == null) {
- bufferInfo = new BufferInfo();
- bufferInfo.buffer = new ByteArrayOutputStream();
- bufferInfo.skip = false;
- buffers.put(current, bufferInfo);
- }
- return bufferInfo;
- }
-
- /** Resets the buffer for the current thread. */
- private void resetBufferInfo() {
- Thread current = Thread.currentThread();
- buffers.remove(current);
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/FileUtils.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/FileUtils.java
deleted file mode 100644
index 1d59d6951..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/FileUtils.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001-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
- * .
- */
-package org.apache.ant.common.util;
-
-import java.io.File;
-import java.util.Stack;
-import java.util.StringTokenizer;
-
-/**
- * This class encapsulates methods which allow Files to be refered to using
- * abstract path names which are translated to native system file paths at
- * runtime as well as copying files or setting there last modification time.
- *
- * @author duncan@x180.com
- * @author Conor MacNeill
- * @author Stefan Bodewig
- * @created 21 January 2002
- */
-public class FileUtils {
-
- /** Empty constructor. */
- protected FileUtils() {
- }
-
- /**
- * Factory method.
- *
- * @return The FileUtils instance to actually use. May be a subclass of
- * this class.
- */
- public static FileUtils newFileUtils() {
- return new FileUtils();
- }
-
- /**
- * Interpret the filename as a file relative to the given file - unless
- * the filename already represents an absolute filename.
- *
- * @param file the "reference" file for relative paths. This instance
- * must be an absolute file and must not contain "./" or
- * "../" sequences (same for \ instead of /). If it is
- * null, this call is equivalent to
- * new java.io.File(filename).
- * @param filename the filename to be resolved
- * @return an absolute file that doesn't contain "./" or
- * "../" sequences and uses the correct separator for the
- * current platform.
- * @exception GeneralException if the file cannot be resolved
- */
- public File resolveFile(File file, String filename)
- throws GeneralException {
- String platformFilename = filename.replace('/', File.separatorChar)
- .replace('\\', File.separatorChar);
-
- // deal with absolute files
- if (platformFilename.startsWith(File.separator) ||
- (platformFilename.length() >= 2 &&
- Character.isLetter(platformFilename.charAt(0)) &&
- platformFilename.charAt(1) == ':')) {
- return normalize(platformFilename);
- }
-
- if (file == null) {
- return new File(platformFilename);
- }
-
- File helpFile = new File(file.getAbsolutePath());
- StringTokenizer tok
- = new StringTokenizer(platformFilename, File.separator);
- while (tok.hasMoreTokens()) {
- String part = tok.nextToken();
- if (part.equals("..")) {
- helpFile = helpFile.getParentFile();
- if (helpFile == null) {
- String msg = "The file or path you specified ("
- + filename + ") is invalid relative to "
- + file.getPath();
- throw new GeneralException(msg);
- }
- } else if (part.equals(".")) {
- // Do nothing here
- } else {
- helpFile = new File(helpFile, part);
- }
- }
-
- return new File(helpFile.getAbsolutePath());
- }
-
- /**
- * "normalize" the given absolute path.
- *
- * This includes:
- *
- *
Uppercase the drive letter if there is one.
- *
Remove redundant slashes after the drive spec.
- *
resolve all ./, .\, ../ and ..\ sequences.
- *
DOS style paths that start with a drive letter will have \ as
- * the separator.
- *
- *
- *
- * @param path the path to be normalized
- * @return the normalized path
- * @exception GeneralException if there is a problem with the path
- * @throws NullPointerException if the file path is equal to null.
- */
- public File normalize(String path)
- throws NullPointerException, GeneralException {
-
- String platformPath = path.replace('/', File.separatorChar)
- .replace('\\', File.separatorChar);
-
- // make sure we are dealing with an absolute path
- if (!platformPath.startsWith(File.separator) &&
- !(platformPath.length() >= 2 &&
- Character.isLetter(platformPath.charAt(0)) &&
- platformPath.charAt(1) == ':')) {
- String msg = path + " is not an absolute path";
- throw new GeneralException(msg);
- }
-
- boolean dosWithDrive = false;
- String root = null;
- // Eliminate consecutive slashes after the drive spec
- if (platformPath.length() >= 2 &&
- Character.isLetter(platformPath.charAt(0)) &&
- platformPath.charAt(1) == ':') {
-
- dosWithDrive = true;
-
- char[] ca = platformPath.replace('/', '\\').toCharArray();
- StringBuffer sb = new StringBuffer();
- sb.append(Character.toUpperCase(ca[0])).append(':');
-
- for (int i = 2; i < ca.length; i++) {
- if ((ca[i] != '\\') ||
- (ca[i] == '\\' && ca[i - 1] != '\\')) {
- sb.append(ca[i]);
- }
- }
-
- platformPath = sb.toString().replace('\\', File.separatorChar);
- if (platformPath.length() == 2) {
- root = platformPath;
- platformPath = "";
- } else {
- root = platformPath.substring(0, 3);
- platformPath = platformPath.substring(3);
- }
-
- } else {
- if (platformPath.length() == 1) {
- root = File.separator;
- platformPath = "";
- } else if (platformPath.charAt(1) == File.separatorChar) {
- // UNC drive
- root = File.separator + File.separator;
- platformPath = platformPath.substring(2);
- } else {
- root = File.separator;
- platformPath = platformPath.substring(1);
- }
- }
-
- Stack s = new Stack();
- s.push(root);
- StringTokenizer tok = new StringTokenizer(platformPath, File.separator);
- while (tok.hasMoreTokens()) {
- String thisToken = tok.nextToken();
- if (".".equals(thisToken)) {
- continue;
- } else if ("..".equals(thisToken)) {
- if (s.size() < 2) {
- throw new GeneralException("Cannot resolve path "
- + path);
- } else {
- s.pop();
- }
- } else {// plain component
- s.push(thisToken);
- }
- }
-
- StringBuffer sb = new StringBuffer();
- int size = s.size();
- for (int i = 0; i < size; i++) {
- if (i > 1) {
- // not before the filesystem root and not after it, since root
- // already contains one
- sb.append(File.separatorChar);
- }
- sb.append(s.elementAt(i));
- }
-
- platformPath = sb.toString();
- if (dosWithDrive) {
- platformPath = platformPath.replace('/', '\\');
- }
- return new File(platformPath);
- }
-
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/GeneralException.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/GeneralException.java
deleted file mode 100644
index 3cfd4edec..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/GeneralException.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.util;
-
-/**
- * A General Ant exception. This exception is usually thrown by utility classes.
- *
- * @author Conor MacNeill
- */
-public class GeneralException extends AntException {
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public GeneralException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an exception with the given descriptive message and a
- * location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public GeneralException(String msg, Location location) {
- super(msg, location);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public GeneralException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause and a location in a file.
- *
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public GeneralException(String msg, Throwable cause,
- Location location) {
- super(msg, cause, location);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public GeneralException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs an exception with the given exception as a root cause and
- * a location in a file.
- *
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public GeneralException(Throwable cause, Location location) {
- super(cause, location);
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/Location.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/Location.java
deleted file mode 100755
index 11ac8f082..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/Location.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.util;
-
-/**
- * Stores the file name and line number in a file.
- *
- * @author Conor MacNeill
- * @created 16 January 2002
- */
-public class Location {
-
- /** Standard unknown location constant; */
- public static final Location UNKNOWN_LOCATION = new Location();
-
- /** The source URL to which this location relates. */
- private String source;
-
- /** The line number of this location within the source */
- private int lineNumber;
-
- /** The column number of this location within the source */
- private int columnNumber;
-
- /**
- * Creates a location consisting of a source location but no line
- * number.
- *
- * @param source the source (URL) to which this location is associated.
- */
- public Location(String source) {
- this(source, 1, 1);
- }
-
- /**
- * Creates a location consisting of a source location and co-ordinates
- * within that source
- *
- * @param source the source (URL) to which this location is associated.
- * @param lineNumber the line number of this location
- * @param columnNumber the column number of this location
- */
- public Location(String source, int lineNumber, int columnNumber) {
- this.source = source;
- this.lineNumber = lineNumber;
- this.columnNumber = columnNumber;
- }
-
- /** Creates an "unknown" location. */
- public Location() {
- this(null, 0, 0);
- }
-
- /**
- * Get the source for this location
- *
- * @return the location's source
- */
- public String getSource() {
- return source;
- }
-
- /**
- * Get the line number of this location
- *
- * @return an integer line number
- */
- public int getLineNumber() {
- return lineNumber;
- }
-
- /**
- * Get the column number of this location
- *
- * @return an integer column number
- */
- public int getColumnNumber() {
- return columnNumber;
- }
-
- /**
- * Returns the source name, line number and a trailing space. An error
- * message can be appended easily. For unknown locations, returns an
- * empty string.
- *
- * @return a suitable string representation of the location
- */
- public String toString() {
- StringBuffer buf = new StringBuffer();
-
- if (source != null) {
- if (source.startsWith("file:")) {
- buf.append(source.substring(5));
- } else {
- buf.append(source);
- }
-
- if (lineNumber != 0) {
- buf.append(":");
- buf.append(lineNumber);
- }
-
- buf.append(": ");
- }
-
- return buf.toString();
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/PathTokenizer.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/PathTokenizer.java
deleted file mode 100755
index 57c6f49ea..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/PathTokenizer.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.util;
-import java.io.File;
-import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
-
-/**
- * A Path tokenizer takes a path and returns the components that make up
- * that path. The path can use path separators of either ':' or ';' and file
- * separators of either '/' or '\'
- *
- * @author Conor MacNeill
- * @created 20 January 2002
- */
-public class PathTokenizer {
- /**
- * A tokenizer to break the string up based on the ':' or ';'
- * separators.
- */
- private StringTokenizer tokenizer;
-
- /**
- * A String which stores any path components which have been read ahead.
- */
- private String lookahead = null;
-
- /**
- * Flag to indicate whether we are running on a platform with a DOS
- * style filesystem
- */
- private boolean dosStyleFilesystem;
-
- /**
- * Create a path tokenizer to access the components of the path
- *
- * @param path the path to be tokenized
- */
- public PathTokenizer(String path) {
- tokenizer = new StringTokenizer(path, ":;", false);
- dosStyleFilesystem = File.pathSeparatorChar == ';';
- }
-
- /**
- * Indicate if there are more tokens available
- *
- * @return true if there are more tokens available
- */
- public boolean hasMoreTokens() {
- if (lookahead != null) {
- return true;
- }
-
- return tokenizer.hasMoreTokens();
- }
-
- /**
- * Get the next token from the path's list of components
- *
- * @return the path component
- * @exception NoSuchElementException if there are no more components
- * available.
- */
- public String nextToken() throws NoSuchElementException {
- String token = null;
- if (lookahead != null) {
- token = lookahead;
- lookahead = null;
- } else {
- token = tokenizer.nextToken().trim();
- }
-
- if (token.length() == 1 && Character.isLetter(token.charAt(0))
- && dosStyleFilesystem
- && tokenizer.hasMoreTokens()) {
- // we are on a dos style system so this path could be a drive
- // spec. We look at the next token
- String nextToken = tokenizer.nextToken().trim();
- if (nextToken.startsWith("\\") || nextToken.startsWith("/")) {
- // we know we are on a DOS style platform and the next path
- // starts with a slash or backslash, so we know this is a
- // drive spec
- token += ":" + nextToken;
- } else {
- // store the token just read for next time
- lookahead = nextToken;
- }
- }
-
- return token;
- }
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/PropertyUtils.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/PropertyUtils.java
deleted file mode 100644
index cedc5e060..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/PropertyUtils.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.util;
-
-import java.util.List;
-
-/**
- * A set of utilities for handling Ant properties and values
- *
- * @author Conor MacNeill
- * @created 31 January 2002
- */
-public class PropertyUtils {
- /**
- * This method will parse a string containing ${value} style property
- * values into two lists. The first list is a collection of text
- * fragments, while the other is a set of string property names. Null
- * entries in the first list indicate a property reference from the
- * second list.
- *
- * @param value the string to be parsed
- * @param fragments the fragments parsed out of the string
- * @param propertyRefs the property refs to be replaced
- * @exception GeneralException if there is a problem parsing out the
- * values
- */
- public static void parsePropertyString(String value, List fragments,
- List propertyRefs)
- throws GeneralException {
- int prev = 0;
- int pos;
- while ((pos = value.indexOf("$", prev)) >= 0) {
- if (pos > 0) {
- fragments.add(value.substring(prev, pos));
- }
-
- if (pos == (value.length() - 1)) {
- fragments.add("$");
- prev = pos + 1;
- } else if (value.charAt(pos + 1) != '{') {
- fragments.add(value.substring(pos + 1, pos + 2));
- prev = pos + 2;
- } else {
- int endName = value.indexOf('}', pos);
- if (endName < 0) {
- throw new GeneralException("Syntax error in property: "
- + value);
- }
- String propertyName = value.substring(pos + 2, endName);
- fragments.add(null);
- propertyRefs.add(propertyName);
- prev = endName + 1;
- }
- }
-
- if (prev < value.length()) {
- fragments.add(value.substring(prev));
- }
- }
-
- /**
- * returns the boolean equivalent of a string, which is considered true
- * if either "on", "true", or "yes" is found, ignoring case.
- *
- * @param s the string value to be interpreted at a boolean
- * @return the value of s as a boolean
- */
- public static boolean toBoolean(String s) {
- return (s != null && (s.equalsIgnoreCase("on")
- || s.equalsIgnoreCase("true")
- || s.equalsIgnoreCase("yes")));
- }
-
-}
-
diff --git a/proposal/mutant/src/java/common/org/apache/ant/common/util/StringUtils.java b/proposal/mutant/src/java/common/org/apache/ant/common/util/StringUtils.java
deleted file mode 100644
index 4a6c07ac9..000000000
--- a/proposal/mutant/src/java/common/org/apache/ant/common/util/StringUtils.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.common.util;
-import java.io.PrintWriter;
-
-import java.io.StringWriter;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * A set of helper methods related to string manipulation.
- *
- * @author Stephane Bailliez
- */
-public final class StringUtils {
-
- /** the line separator for this OS */
- public static final String LINE_SEP = System.getProperty("line.separator");
-
- /**
- * Convenient method to retrieve the full stacktrace from a given
- * exception.
- *
- * @param t the exception to get the stacktrace from.
- * @return the stacktrace from the given exception.
- */
- public static String getStackTrace(Throwable t) {
- StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw, true);
- t.printStackTrace(pw);
- pw.flush();
- pw.close();
- return sw.toString();
- }
-
- /**
- * Splits up a string into a list of lines. It is equivalent to
- * split(data, '\n') .
- *
- * @param data the string to split up into lines.
- * @return the list of lines available in the string.
- */
- public static List lineSplit(String data) {
- return split(data, '\n');
- }
-
- /**
- * Splits up a string where elements are separated by a specific
- * character and return all elements.
- *
- * @param data the string to split up.
- * @param ch the separator character.
- * @return the list of elements.
- */
- public static List split(String data, int ch) {
- List elems = new ArrayList();
- int pos = -1;
- int i = 0;
- while ((pos = data.indexOf(ch, i)) != -1) {
- String elem = data.substring(i, pos);
- elems.add(elem);
- i = pos + 1;
- }
- elems.add(data.substring(i));
- return elems;
- }
-
- /**
- * Replace occurrences into a string.
- *
- * @param data the string to replace occurrences into
- * @param from the occurrence to replace.
- * @param to the occurrence to be used as a replacement.
- * @return the new string with replaced occurrences.
- */
- public static String replace(String data, String from, String to) {
- StringBuffer buf = new StringBuffer(data.length());
- int pos = -1;
- int i = 0;
- while ((pos = data.indexOf(from, i)) != -1) {
- buf.append(data.substring(i, pos)).append(to);
- i = pos + from.length();
- }
- buf.append(data.substring(i));
- return buf.toString();
- }
-
-}
-
diff --git a/proposal/mutant/src/java/frontend/org/apache/ant/cli/Commandline.java b/proposal/mutant/src/java/frontend/org/apache/ant/cli/Commandline.java
deleted file mode 100755
index 701fed8e6..000000000
--- a/proposal/mutant/src/java/frontend/org/apache/ant/cli/Commandline.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.cli;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import org.apache.ant.antcore.config.AntConfig;
-import org.apache.ant.antcore.execution.Frame;
-import org.apache.ant.antcore.frontend.FrontendException;
-import org.apache.ant.antcore.frontend.FrontendUtils;
-import org.apache.ant.antcore.modelparser.XMLProjectParser;
-import org.apache.ant.antcore.xml.XMLParseException;
-import org.apache.ant.common.event.BuildEvent;
-import org.apache.ant.common.event.BuildListener;
-import org.apache.ant.common.event.MessageLevel;
-import org.apache.ant.common.logger.BuildLogger;
-import org.apache.ant.common.logger.DefaultLogger;
-import org.apache.ant.common.model.Project;
-import org.apache.ant.common.util.DataValue;
-import org.apache.ant.common.util.DemuxOutputStream;
-import org.apache.ant.init.AntEnvironment;
-import org.apache.ant.init.Frontend;
-import org.apache.ant.init.InitUtils;
-
-/**
- * This is the command line front end. It drives the core.
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class Commandline implements Frontend {
- /** The initialisation configuration for Ant */
- private AntEnvironment antEnv;
-
- /** Stream that we are using for logging */
- private PrintStream out = System.out;
-
- /** Stream that we are using for logging error messages */
- private PrintStream err = System.err;
-
- /** Names of classes to add as listeners to project */
- private List listeners = new ArrayList(2);
-
- /** The list of targets to be evaluated in this invocation */
- private List targets = new ArrayList(4);
-
- /** The command line properties */
- private Map definedValues = new HashMap();
-
- /** The Config files to use in this run */
- private List configFiles = new ArrayList();
-
- /** This is the build to run. */
- private String buildSource;
-
- /**
- * The Ant logger class. There may be only one logger. It will have the
- * right to use the 'out' PrintStream. The class must implements the
- * BuildLogger interface
- */
- private String loggerClassname = null;
-
- /** Our current message output status. Follows MessageLevel values */
- private int messageOutputLevel = MessageLevel.INFO;
-
- /** The logger that will be used for the build */
- private BuildLogger logger = null;
-
- /**
- * Adds a feature to the BuildListeners attribute of the Commandline
- * object
- *
- * @param eventSource the build event source to which listeners will be
- * added.
- * @exception FrontendException if the necessary listener instances could
- * not be created
- */
- protected void addBuildListeners(Frame eventSource)
- throws FrontendException {
-
- // Add the default listener
- eventSource.addBuildListener(logger);
-
- for (Iterator i = listeners.iterator(); i.hasNext();) {
- String className = (String) i.next();
- try {
- BuildListener listener =
- (BuildListener) Class.forName(className).newInstance();
- eventSource.addBuildListener(listener);
- } catch (ClassCastException e) {
- System.err.println("The specified listener class "
- + className +
- " does not implement the Listener interface");
- throw new FrontendException("Unable to instantiate listener "
- + className, e);
- } catch (Exception e) {
- System.err.println("Unable to instantiate specified listener "
- + "class " + className + " : "
- + e.getClass().getName());
- throw new FrontendException("Unable to instantiate listener "
- + className, e);
- }
- }
- }
-
- /**
- * Get an option value
- *
- * @param args the full list of command line arguments
- * @param position the position in the args array where the value shoudl
- * be
- * @param argType the option type
- * @return the value of the option
- * @exception FrontendException if the option cannot be read
- */
- private String getOption(String[] args, int position, String argType)
- throws FrontendException {
- String value = null;
- try {
- value = args[position];
- } catch (IndexOutOfBoundsException e) {
- throw new FrontendException("You must specify a value for the "
- + argType + " argument");
- }
- return value;
- }
-
-
- /**
- * Start the command line front end for mutant.
- *
- * @param args the commandline arguments
- * @param antEnv Ant's initialization configuration
- */
- public void start(final String[] args, final AntEnvironment antEnv) {
- this.antEnv = antEnv;
-
- Frame mainFrame = null;
- Project project = null;
- try {
- parseArguments(args);
- createLogger();
- URL buildSourceURL = determineBuildFile();
-
- AntConfig config = new AntConfig();
- AntConfig userConfig =
- FrontendUtils.getAntConfig(antEnv.getUserConfigArea());
- AntConfig systemConfig
- = FrontendUtils.getAntConfig(antEnv.getSystemConfigArea());
-
- if (systemConfig != null) {
- config.merge(systemConfig);
- }
- if (userConfig != null) {
- config.merge(userConfig);
- }
-
- for (Iterator i = configFiles.iterator(); i.hasNext();) {
- File configFile = (File) i.next();
- AntConfig runConfig
- = FrontendUtils.getAntConfigFile(configFile);
- config.merge(runConfig);
- }
-
- if (buildSourceURL.getProtocol().equals("file")) {
- System.out.println("Buildfile: " + buildSource);
- } else if (!config.isRemoteProjectAllowed()) {
- throw new FrontendException("Remote Projects are not allowed: "
- + buildSourceURL);
- } else {
- System.out.println("Build: " + buildSourceURL);
- }
-
- project = parseProject(buildSourceURL);
-
- // create the execution manager to execute the build
- mainFrame = new Frame(antEnv, config);
- OutputStream demuxOut
- = new DemuxOutputStream(mainFrame, false);
- OutputStream demuxErr
- = new DemuxOutputStream(mainFrame, true);
- System.setOut(new PrintStream(demuxOut));
- System.setErr(new PrintStream(demuxErr));
- addBuildListeners(mainFrame);
- mainFrame.setProject(project);
- mainFrame.initialize(definedValues);
- } catch (Throwable e) {
- if (logger != null) {
- BuildEvent finishedEvent
- = new BuildEvent(this, BuildEvent.BUILD_FINISHED, e);
- logger.buildFinished(finishedEvent);
- } else {
- e.printStackTrace();
- }
- System.exit(1);
- }
-
- try {
- mainFrame.startBuild(targets);
- System.exit(0);
- } catch (Throwable t) {
- System.exit(1);
- }
- }
-
- /**
- * Use the XML parser to parse the build into a project model
- *
- * @param buildSourceURL the location of the build XML source.
- * @return a project model representation of the project file
- * @exception XMLParseException if the project cannot be parsed
- */
- private Project parseProject(URL buildSourceURL)
- throws XMLParseException {
- XMLProjectParser parser = new XMLProjectParser();
- Project project = parser.parseBuildFile(buildSourceURL);
- return project;
- }
-
- /**
- * Handle build argument
- *
- * @param buildSource the build to process
- */
- private void argBuild(String buildSource) {
- this.buildSource = buildSource;
- }
-
- /**
- * Handle the log file option
- *
- * @param arg the value of the log file option
- * @exception FrontendException if the log file is not writeable
- */
- private void argLogFile(String arg) throws FrontendException {
- try {
- File logFile = new File(arg);
- out = new PrintStream(new FileOutputStream(logFile));
- err = out;
- } catch (IOException ioe) {
- throw new FrontendException("Cannot write on the specified log " +
- "file. Make sure the path exists and " +
- "you have write permissions.", ioe);
- }
- }
-
- /**
- * Handle the logger attribute
- *
- * @param arg the logger classname
- * @exception FrontendException if a logger has already been defined
- */
- private void argLogger(String arg) throws FrontendException {
- if (loggerClassname != null) {
- throw new FrontendException("Only one logger class may be " +
- "specified.");
- }
- loggerClassname = arg;
- }
-
-
- /**
- * Determine the build to use
- *
- * @return the URL of the build source.
- * @exception FrontendException if the build cannot be found
- */
- private URL determineBuildFile() throws FrontendException {
-
- URL buildSourceURL = null;
- try {
- if (buildSource == null) {
- buildSource = FrontendUtils.DEFAULT_BUILD_FILENAME;
- File defaultBuildFile = new File(buildSource);
- if (!defaultBuildFile.exists()) {
- String ant1File = FrontendUtils.DEFAULT_ANT1_FILENAME;
- File ant1BuildFile = new File(ant1File);
- if (ant1BuildFile.exists()) {
- buildSource = ant1File;
- defaultBuildFile = ant1BuildFile;
- } else {
- throw new FrontendException("No build file "
- + FrontendUtils.DEFAULT_BUILD_FILENAME + " or "
- + FrontendUtils.DEFAULT_ANT1_FILENAME + " found.");
- }
- }
- buildSourceURL = InitUtils.getFileURL(defaultBuildFile);
- } else {
- // we have been given a file as a string - try to figure out if
- // it is a URL or just a file
- try {
- buildSourceURL = new URL(buildSource);
- } catch (MalformedURLException e) {
- // must be a file
- File buildFile = new File(buildSource);
- if (!buildFile.exists()) {
- throw new FrontendException("Cannot find build: "
- + buildSource);
- }
- buildSourceURL = InitUtils.getFileURL(buildFile);
- }
- }
- return buildSourceURL;
- } catch (MalformedURLException e) {
- throw new FrontendException("Build file " + buildSource
- + " is not valid", e);
- }
- }
-
- /**
- * Parse the command line arguments.
- *
- * @param args the command line arguments
- * @exception FrontendException thrown when the command line contains some
- * sort of error.
- */
- private void parseArguments(String[] args)
- throws FrontendException {
-
- int i = 0;
- while (i < args.length) {
- String arg = args[i++];
-
- if (arg.equals("-buildfile") || arg.equals("-file")
- || arg.equals("-f")) {
- argBuild(getOption(args, i++, arg));
- } else if (arg.equals("-logfile") || arg.equals("-l")) {
- argLogFile(getOption(args, i++, arg));
- } else if (arg.equals("-quiet") || arg.equals("-q")) {
- messageOutputLevel = MessageLevel.WARNING;
- } else if (arg.equals("-verbose") || arg.equals("-v")) {
- // printVersion();
- messageOutputLevel = MessageLevel.VERBOSE;
- } else if (arg.equals("-debug")) {
- // printVersion();
- messageOutputLevel = MessageLevel.DEBUG;
- } else if (arg.equals("-config") || arg.equals("-c")) {
- configFiles.add(new File(getOption(args, i++, arg)));
- } else if (arg.equals("-listener")) {
- listeners.add(getOption(args, i++, arg));
- } else if (arg.equals("-logger")) {
- argLogger(getOption(args, i++, arg));
- } else if (arg.startsWith("-D")) {
- String name = arg.substring(2, arg.length());
- String value = null;
- int posEq = name.indexOf("=");
- if (posEq > 0) {
- value = name.substring(posEq + 1);
- name = name.substring(0, posEq);
- } else {
- value = getOption(args, i++, arg);
- }
- definedValues.put(name,
- new DataValue(value, DataValue.PRIORITY_USER));
- } else if (arg.startsWith("-")) {
- // we don't have any more args to recognize!
- System.out.println("Unknown option: " + arg);
- return;
- } else {
- // if it's no other arg, it must be a target
- targets.add(arg);
- }
- }
-
- }
-
- /**
- * Creates the default build logger for sending build events to the ant
- * log.
- *
- * @exception FrontendException if the logger cannot be instantiatd
- */
- private void createLogger() throws FrontendException {
- if (loggerClassname != null) {
- try {
- Class loggerClass = Class.forName(loggerClassname);
- logger = (BuildLogger) loggerClass.newInstance();
- } catch (ClassCastException e) {
- System.err.println("The specified logger class "
- + loggerClassname +
- " does not implement the BuildLogger interface");
- throw new FrontendException("Unable to instantiate logger "
- + loggerClassname, e);
- } catch (Exception e) {
- System.err.println("Unable to instantiate specified logger "
- + "class " + loggerClassname + " : "
- + e.getClass().getName());
- throw new FrontendException("Unable to instantiate logger "
- + loggerClassname, e);
- }
- } else {
- logger = new DefaultLogger();
- }
-
- logger.setMessageOutputLevel(messageOutputLevel);
- logger.setOutputPrintStream(out);
- logger.setErrorPrintStream(err);
- }
-}
-
diff --git a/proposal/mutant/src/java/init/org/apache/ant/init/AntEnvironment.java b/proposal/mutant/src/java/init/org/apache/ant/init/AntEnvironment.java
deleted file mode 100644
index ca333d5a3..000000000
--- a/proposal/mutant/src/java/init/org/apache/ant/init/AntEnvironment.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.init;
-import java.io.File;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-/**
- * AntEnvironment describes the environment in which Ant is operating. It
- * provides the locations of a number of key Ant components.
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class AntEnvironment {
-
- /**
- * How to navigate from a URL retrieved from a core class to
- * the Ant Home area
- */
- public static final String CORECLASS_TO_ANTHOME = "../../..";
-
- /** The configuration directory */
- public static final String SYSTEM_CONFDIR = "conf";
-
- /** The User's configuration directory */
- public static final String USER_CONFDIR = ".ant/conf";
-
- /** The library diurectory */
- public static final String LIB_DIR = "lib/";
-
- /** Common libraries directory */
- public static final String COMMON_DIR = "core/common/";
-
- /** Parser library directory */
- public static final String PARSER_DIR = "core/parser/";
-
- /** Core libraries directory */
- public static final String ANTCORE_DIR = "core/antcore/";
-
- /** System Ant libraries directory */
- public static final String SYSLIBS_DIR = "core/syslibs/";
-
- /** Standard Ant Libraries directory */
- public static final String ANTLIBS_DIR = "antlibs/";
-
- /** The Ant Home property */
- public static final String ANTHOME_PROPERTY = "ant.home";
-
- /** The default name of the jar containing the XML parser */
- public static final String DEFAULT_PARSER_JAR = "crimson.jar";
-
- /** The system classloader */
- private ClassLoader systemLoader;
-
- /**
- * The common class loader loads components which are common to tasks and
- * the core
- */
- private ClassLoader commonLoader;
-
- /**
- * The core loader is the loader which loads classes which are exclusively
- * used by the Ant core
- */
- private ClassLoader coreLoader;
-
- /**
- * The tools.jar URL is available for things which require the Sun tools
- * jar
- */
- private URL toolsJarURL;
-
- /**
- * The URLs to the Ant XML parser. These are available to allow tasks
- * which require XML support to use the standard parser rather than having
- * to supply their own
- */
- private URL[] parserURLs;
-
- /**
- * The location of the Ant library directory from which tasks may be
- * loaded
- */
- private URL libraryURL;
-
- /** The location of the system configuration file */
- private File systemConfigArea;
-
- /** The location of ANT_HOME */
- private URL antHome;
-
- /** The location of the user config file */
- private File userConfigArea;
-
- /**
- * Create an unconfigured AntEnvironment which will be configured manually
- * by the user
- */
- public AntEnvironment() {
- }
-
- /**
- * Create and automatically configure the Ant Environment
- *
- * @param coreClass - a core Ant class
- * @exception InitException if the configuration cannot be initialized
- */
- public AntEnvironment(Class coreClass) throws InitException {
- try {
- // is Ant Home set?
- String antHomeProperty = System.getProperty(ANTHOME_PROPERTY);
- if (antHomeProperty == null) {
- URL classURL = getAntLibURL(coreClass);
- antHome = new URL(classURL, CORECLASS_TO_ANTHOME);
- } else {
- try {
- antHome = new URL(antHomeProperty);
- } catch (MalformedURLException e) {
- // try as a file
- File antHomeDir = new File(antHomeProperty);
- if (!antHomeDir.exists()) {
- throw new InitException("ant.home value \""
- + antHomeProperty + "\" is not valid.");
- }
- antHome = InitUtils.getFileURL(antHomeDir);
- }
- }
-
- setLibraryURL(new URL(antHome, LIB_DIR));
-
- if (antHome.getProtocol().equals("file")) {
- File systemConfigArea
- = new File(antHome.getFile(), SYSTEM_CONFDIR);
- setSystemConfigArea(systemConfigArea);
- }
- File userConfigArea
- = new File(System.getProperty("user.home"), USER_CONFDIR);
- setUserConfigArea(userConfigArea);
-
- // set up the class loaders that will be used when running Ant
- ClassLoader systemLoader = getClass().getClassLoader();
- setSystemLoader(systemLoader);
- URL toolsJarURL = ClassLocator.getToolsJarURL();
- setToolsJarURL(toolsJarURL);
-
- URL commonJarLib = new URL(libraryURL, COMMON_DIR);
- ClassLoader commonLoader
- = new URLClassLoader(LoaderUtils.getLocationURLs(commonJarLib,
- "common.jar"), systemLoader);
- setCommonLoader(commonLoader);
-
- // core needs XML parser for parsing various XML components.
- URL parserBase = new URL(libraryURL, PARSER_DIR);
- URL[] parserURLs
- = LoaderUtils.getLocationURLs(parserBase, DEFAULT_PARSER_JAR);
- setParserURLs(parserURLs);
-
- URL antcoreBase = new URL(libraryURL, ANTCORE_DIR);
- URL[] coreURLs
- = LoaderUtils.getLocationURLs(antcoreBase, "antcore.jar");
- URL[] combinedURLs = new URL[parserURLs.length + coreURLs.length];
- System.arraycopy(coreURLs, 0, combinedURLs, 0, coreURLs.length);
- System.arraycopy(parserURLs, 0, combinedURLs, coreURLs.length,
- parserURLs.length);
- ClassLoader coreLoader = new URLClassLoader(combinedURLs,
- commonLoader);
- setCoreLoader(coreLoader);
- } catch (MalformedURLException e) {
- throw new InitException(e);
- }
- }
-
- /**
- * Sets the location of the user configuration files
- *
- * @param userConfigArea the new user config area
- */
- public void setUserConfigArea(File userConfigArea) {
- this.userConfigArea = userConfigArea;
- }
-
- /**
- * Set the location of ANT_HOME
- *
- * @param antHome the new value of ANT_HOME
- */
- public void setAntHome(URL antHome) {
- this.antHome = antHome;
- }
-
- /**
- * Sets the location of the system configuration files
- *
- * @param systemConfigArea the new system config area
- */
- public void setSystemConfigArea(File systemConfigArea) {
- this.systemConfigArea = systemConfigArea;
- }
-
- /**
- * Sets the systemLoader of the AntEnvironment
- *
- * @param systemLoader the new systemLoader value
- */
- public void setSystemLoader(ClassLoader systemLoader) {
- this.systemLoader = systemLoader;
- }
-
- /**
- * Sets the commonLoader of the AntEnvironment
- *
- * @param commonLoader the new commonLoader value
- */
- public void setCommonLoader(ClassLoader commonLoader) {
- this.commonLoader = commonLoader;
- }
-
- /**
- * Sets the coreLoader of the AntEnvironment
- *
- * @param coreLoader the new coreLoader value
- */
- public void setCoreLoader(ClassLoader coreLoader) {
- this.coreLoader = coreLoader;
- }
-
- /**
- * Sets the toolsJarURL of the AntEnvironment
- *
- * @param toolsJarURL the new toolsJarURL value
- */
- public void setToolsJarURL(URL toolsJarURL) {
- this.toolsJarURL = toolsJarURL;
- }
-
- /**
- * Sets the parserURLs of the AntEnvironment
- *
- * @param parserURLs the new parserURLs value
- */
- public void setParserURLs(URL[] parserURLs) {
- this.parserURLs = parserURLs;
- }
-
- /**
- * Sets the libraryURL of the AntEnvironment
- *
- * @param libraryURL the new libraryURL value
- */
- public void setLibraryURL(URL libraryURL) {
- this.libraryURL = libraryURL;
- }
-
- /**
- * Get the location of the user's config files
- *
- * @return the location of the user's Ant config files
- */
- public File getUserConfigArea() {
- return userConfigArea;
- }
-
- /**
- * Get the location of Ant's home area
- *
- * @return the location of ANT_HOME
- */
- public URL getAntHome() {
- return antHome;
- }
-
- /**
- * Get the location of the system config files
- *
- * @return the location of the system Ant config files
- */
- public File getSystemConfigArea() {
- return systemConfigArea;
- }
-
- /**
- * Gets the systemLoader of the AntEnvironment
- *
- * @return the systemLoader value
- */
- public ClassLoader getSystemLoader() {
- return systemLoader;
- }
-
- /**
- * Gets the commonLoader of the AntEnvironment
- *
- * @return the commonLoader value
- */
- public ClassLoader getCommonLoader() {
- return commonLoader;
- }
-
- /**
- * Gets the coreLoader of the AntEnvironment
- *
- * @return the coreLoader value
- */
- public ClassLoader getCoreLoader() {
- return coreLoader;
- }
-
- /**
- * Gets the toolsJarURL of the AntEnvironment
- *
- * @return the toolsJarURL value
- */
- public URL getToolsJarURL() {
- return toolsJarURL;
- }
-
- /**
- * Gets the parserURLs of the AntEnvironment
- *
- * @return the parserURLs value
- */
- public URL[] getParserURLs() {
- return parserURLs;
- }
-
- /**
- * Gets the libraryURL of the AntEnvironment
- *
- * @return the libraryURL value
- */
- public URL getLibraryURL() {
- return libraryURL;
- }
-
- /**
- * Get the location of the antlibs directory
- *
- * @return a URL giving the location of the antlibs directory
- * @exception MalformedURLException if the URL cannot be formed.
- */
- public URL getSyslibsURL() throws MalformedURLException {
- return new URL(libraryURL, SYSLIBS_DIR);
- }
-
- /**
- * Get the location of the syslibs directory
- *
- * @return a URL giving the location of the syslibs directory
- * @exception MalformedURLException if the URL cannot be formed.
- */
- public URL getAntlibsURL() throws MalformedURLException {
- return new URL(libraryURL, ANTLIBS_DIR);
- }
-
- /**
- * Get a URL to the Ant Library directory.
- *
- * @param libraryClass - a class loaded from the Ant library area.
- * @return the URL for the Ant library directory
- * @throws MalformedURLException if there is a problem constructing the
- * library URL
- */
- private URL getAntLibURL(Class libraryClass) throws MalformedURLException {
- URL initClassURL = ClassLocator.getClassLocationURL(libraryClass);
-
- String initURLString = initClassURL.toString();
- int index = initURLString.lastIndexOf("/");
- if (index != -1) {
- initURLString = initURLString.substring(0, index + 1);
- }
-
- return new URL(initURLString);
- }
-}
-
diff --git a/proposal/mutant/src/java/init/org/apache/ant/init/ClassLocator.java b/proposal/mutant/src/java/init/org/apache/ant/init/ClassLocator.java
deleted file mode 100755
index 7348a9ccf..000000000
--- a/proposal/mutant/src/java/init/org/apache/ant/init/ClassLocator.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.init;
-import java.net.MalformedURLException;
-
-import java.net.URL;
-import java.io.File;
-
-/**
- * The ClassLocator is a utility class which is used to determine the URL
- * from which a class was loaded.
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class ClassLocator {
- /**
- * Get the URL for the given class's load location.
- *
- * @param theClass the class whose loadURL is desired.
- * @return a URL which identifies the component from which this class
- * was loaded.
- * @throws MalformedURLException if the class' URL cannot be
- * constructed.
- */
- public static URL getClassLocationURL(Class theClass)
- throws MalformedURLException {
- String className = theClass.getName().replace('.', '/') + ".class";
- URL classRawURL = theClass.getClassLoader().getResource(className);
-
- String fileComponent = classRawURL.getFile();
- if (classRawURL.getProtocol().equals("file")) {
- // Class comes from a directory of class files rather than
- // from a jar.
- int classFileIndex = fileComponent.lastIndexOf(className);
- if (classFileIndex != -1) {
- fileComponent = fileComponent.substring(0, classFileIndex);
- }
-
- return new URL("file:" + fileComponent);
- } else if (classRawURL.getProtocol().equals("jar")) {
- // Class is coming from a jar. The file component of the URL
- // is actually the URL of the jar file
- int classSeparatorIndex = fileComponent.lastIndexOf("!");
- if (classSeparatorIndex != -1) {
- fileComponent = fileComponent.substring(0, classSeparatorIndex);
- }
-
- return new URL(fileComponent);
- } else {
- // its running out of something besides a jar.
- // We just return the Raw URL as a best guess
- return classRawURL;
- }
- }
-
- /**
- * Get the URLs necessary to load the Sun compiler tools. In some JVMs
- * this is available in the VM's system loader, in others we have to
- * find it ourselves
- *
- * @return the URL to the tools jar if available, null otherwise
- * @throws InitException if the URL to the tools jar cannot be formed.
- */
- public static URL getToolsJarURL()
- throws InitException {
- try {
- // just check whether this throws an exception
- Class.forName("sun.tools.javac.Main");
- // tools jar is on system classpath - no need for URL
- return null;
- } catch (ClassNotFoundException cnfe) {
- try {
- // couldn't find compiler - try to find tools.jar
- // based on java.home setting
- String javaHome = System.getProperty("java.home");
- if (javaHome.endsWith("jre")) {
- javaHome = javaHome.substring(0, javaHome.length() - 4);
- }
- File toolsjar = new File(javaHome + "/lib/tools.jar");
- if (!toolsjar.exists()) {
- System.out.println("Unable to locate tools.jar. "
- + "Expected to find it in " + toolsjar.getPath());
- return null;
- }
- URL toolsJarURL = InitUtils.getFileURL(toolsjar);
- return toolsJarURL;
- } catch (MalformedURLException e) {
- throw new InitException(e);
- }
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/init/org/apache/ant/init/Frontend.java b/proposal/mutant/src/java/init/org/apache/ant/init/Frontend.java
deleted file mode 100644
index 585edb3e2..000000000
--- a/proposal/mutant/src/java/init/org/apache/ant/init/Frontend.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.init;
-
-/**
- * Interface which all front ends implement and is used to launch the front
- * end.
- *
- * @author Conor MacNeill
- * @created 26 June 2002
- */
-public interface Frontend {
- /**
- * Start a frontend.
- *
- * @param args the command line arguments is any
- * @param antEnv the AntEnvironment describing the operating environment.
- */
- void start(String[] args, AntEnvironment antEnv);
-}
-
diff --git a/proposal/mutant/src/java/init/org/apache/ant/init/InitException.java b/proposal/mutant/src/java/init/org/apache/ant/init/InitException.java
deleted file mode 100755
index ac4372da8..000000000
--- a/proposal/mutant/src/java/init/org/apache/ant/init/InitException.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.init;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-/**
- * An InitException is an exception which occurs during Ant initialization
- * phase. Such exceptions are usually fatal because Ant cannot be
- * sufficiently initialised to properly handle the exception.
- *
- * @author Conor MacNeill
- * @created 11 January 2002
- */
-public class InitException extends Exception {
-
- /** Nested Exception if any. */
- private Throwable cause = null;
-
- /**
- * Constructs an exception with the given descriptive message.
- *
- * @param msg Description of or information about the exception.
- */
- public InitException(String msg) {
- super(msg);
- }
-
-
- /**
- * Constructs an exception with the given message and exception as a
- * root cause.
- *
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public InitException(String msg, Throwable cause) {
- super(msg);
- this.cause = cause;
- }
-
-
- /**
- * Constructs an exception with the given exception as a root cause.
- *
- * @param cause Exception that might have caused this one.
- */
- public InitException(Throwable cause) {
- super(cause.getMessage());
- this.cause = cause;
- }
-
-
- /** Print the stack trace to System.err */
- public void printStackTrace() {
- printStackTrace(System.err);
- }
-
-
- /**
- * Print the stack trace to the given PrintStream
- *
- * @param ps the PrintStream onto which the stack trace of this
- * exception is to be printed
- */
- public void printStackTrace(PrintStream ps) {
- synchronized (ps) {
- ps.println(this);
- if (cause != null) {
- ps.println("--- Nested Exception ---");
- cause.printStackTrace(ps);
- }
- }
- }
-
-
- /**
- * Print the stack trace to the given PrintWriter
- *
- * @param pw the PrintWriter onto which the stack trace of this
- * exception is to be printed
- */
- public void printStackTrace(PrintWriter pw) {
- synchronized (pw) {
- pw.println(this);
- if (cause != null) {
- pw.println("--- Nested Exception ---");
- cause.printStackTrace(pw);
- }
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/init/org/apache/ant/init/InitUtils.java b/proposal/mutant/src/java/init/org/apache/ant/init/InitUtils.java
deleted file mode 100755
index 8a33c5b21..000000000
--- a/proposal/mutant/src/java/init/org/apache/ant/init/InitUtils.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.init;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-/**
- * A set of utility methods required during initialisation and beyond
- *
- * @author Conor MacNeill
- * @created 20 January 2002
- */
-public class InitUtils {
- /**
- * Get the URL for a file taking into account # characters
- *
- * @param file the file whose URL representation is required.
- * @return The FileURL value
- * @throws MalformedURLException if the URL representation cannot be
- * formed.
- */
- public static URL getFileURL(File file) throws MalformedURLException {
- String uri = "file:" + file.getAbsolutePath().replace('\\', '/');
- for (int i = uri.indexOf('#'); i != -1; i = uri.indexOf('#')) {
- uri = uri.substring(0, i) + "%23" + uri.substring(i + 1);
- }
- if (file.isDirectory()) {
- uri += "/";
- }
- return new URL(uri);
- }
-
-}
-
diff --git a/proposal/mutant/src/java/init/org/apache/ant/init/LoaderUtils.java b/proposal/mutant/src/java/init/org/apache/ant/init/LoaderUtils.java
deleted file mode 100755
index fc5b7a240..000000000
--- a/proposal/mutant/src/java/init/org/apache/ant/init/LoaderUtils.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.init;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * LoaderUtils is a utility class with methods for configuring a class
- * loader from a URL.
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class LoaderUtils {
-
- /**
- * This is the file that is consulted on remote systems to specify
- * available jars
- */
- public static final String LIST_FILE = "file.list";
-
-
- /**
- * Get the URLs of a set of libraries in the given location
- *
- * @param location the location to be searched
- * @param defaultFile default file if none can be found
- * @return an array of URLs for the relevant jars
- * @exception MalformedURLException the URLs cannot be created
- */
- public static URL[] getLocationURLs(URL location, String defaultFile)
- throws MalformedURLException {
- return getLocationURLs(location, defaultFile, new String[]{".jar"});
- }
-
- /**
- * Get the URLs of a set of libraries in the given location
- *
- * @param location the location to be searched
- * @param extensions array of allowable file extensions
- * @param defaultFile default file if none can be found
- * @return an array of URLs for the relevant jars
- * @exception MalformedURLException if the URL to the jars could not be
- * formed
- */
- public static URL[] getLocationURLs(URL location, String defaultFile,
- String[] extensions)
- throws MalformedURLException {
- URL[] urls = null;
- if (location.getProtocol().equals("file")) {
- // URL is local filesystem.
- urls = getLocalURLs(new File(location.getFile()), extensions);
- } else {
- // URL is remote - try to read a file with the list of jars
- URL jarListURL = new URL(location, LIST_FILE);
- BufferedReader reader = null;
- List jarList = new ArrayList();
- try {
- InputStreamReader isr
- = new InputStreamReader(jarListURL.openStream());
- reader = new BufferedReader(isr);
- String line = null;
- while ((line = reader.readLine().trim()) != null) {
- for (int i = 0; i < extensions.length; ++i) {
- if (line.endsWith(extensions[i])) {
- jarList.add(new URL(location, line));
- break;
- }
- }
- }
- urls = (URL[]) jarList.toArray(new URL[0]);
- } catch (IOException e) {
- // use the default location
- if (defaultFile != null) {
- urls = new URL[]{new URL(location, defaultFile)};
- }
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException e) {
- }
- }
- }
- }
-
- return urls;
- }
-
- /**
- * Get the classpath from a classloader. This can only extract path
- * components from the loaders which are instances of URLClassLoaders
- *
- * @param loader the loader whose path is required
- * @return the loader's configuration expressed as a classpath
- */
- public static String getClasspath(ClassLoader loader) {
- StringBuffer pathBuffer = null;
- if (loader instanceof URLClassLoader) {
- URLClassLoader urlLoader = (URLClassLoader) loader;
- URL[] urls = urlLoader.getURLs();
- for (int i = 0; i < urls.length; ++i) {
- if (!urls[i].getProtocol().equals("file")) {
- continue;
- }
- String pathElement = urls[i].getFile();
- if (pathBuffer == null) {
- pathBuffer = new StringBuffer(pathElement);
- } else {
- pathBuffer.append(File.pathSeparatorChar);
- pathBuffer.append(pathElement);
- }
- }
- }
- String path = pathBuffer == null ? "" : pathBuffer.toString();
- ClassLoader parentLoader = loader.getParent();
- if (parentLoader != null) {
- String parentPath = getClasspath(parentLoader);
- if (parentPath.length() != 0) {
- path = parentPath + File.pathSeparator + path;
- }
- }
-
- return path;
- }
-
-
- /**
- * Debug method to dump a class loader hierarchy to a PrintStream
- * URLClassLoaders dump their URLs
- *
- * @param loader the class loaders whose configuration is dumped
- * @param ps PrintStream to which info is sent
- */
- public static void dumpLoader(PrintStream ps, ClassLoader loader) {
- if (loader instanceof URLClassLoader) {
- URLClassLoader urlLoader = (URLClassLoader) loader;
- URL[] urls = urlLoader.getURLs();
- if (urls.length == 0) {
- ps.println(" No URLs");
- } else {
- for (int i = 0; i < urls.length; ++i) {
- ps.println(" URL: " + urls[i]);
- }
- }
- } else {
- ps.println("Class Loader: " + loader.getClass().getName());
- }
- ps.println();
-
- ClassLoader parentLoader = loader.getParent();
- if (parentLoader != null) {
- ps.println("Parent Loader:");
- dumpLoader(ps, parentLoader);
- }
- }
-
-
- /**
- * Get an array of URLs for each file in the filesystem. If the given
- * location is a directory, it is searched for files of the given
- * extension. If it is a file, it is returned as a URL if it matches the
- * given extension list.
- *
- * @param location the location within the local filesystem to be
- * searched
- * @param extensions an array of file extensions to be considered in the
- * search
- * @return an array of URLs for the file found in the directory.
- * @exception MalformedURLException if the URLs to the jars cannot be
- * formed
- */
- private static URL[] getLocalURLs(File location,
- final String[] extensions)
- throws MalformedURLException {
- URL[] urls = new URL[0];
-
- if (!location.exists()) {
- return urls;
- }
-
- if (!location.isDirectory()) {
- urls = new URL[1];
- String path = location.getPath();
- for (int i = 0; i < extensions.length; ++i) {
- if (path.endsWith(extensions[i])) {
- urls[0] = InitUtils.getFileURL(location);
- break;
- }
- }
- return urls;
- }
-
- File[] jars = location.listFiles(
- new FilenameFilter() {
- public boolean accept(File dir, String name) {
- for (int i = 0; i < extensions.length; ++i) {
- if (name.endsWith(extensions[i])) {
- return true;
- }
- }
- return false;
- }
- });
- urls = new URL[jars.length];
- for (int i = 0; i < jars.length; ++i) {
- urls[i] = InitUtils.getFileURL(jars[i]);
- }
- return urls;
- }
-
- /**
- * Set the context loader of the current thread and returns the existing
- * classloader
- *
- * @param newLoader the new context loader
- * @return the old context loader
- */
- public static ClassLoader setContextLoader(ClassLoader newLoader) {
- Thread thread = Thread.currentThread();
- ClassLoader currentLoader = thread.getContextClassLoader();
- thread.setContextClassLoader(newLoader);
- return currentLoader;
- }
-
-}
-
diff --git a/proposal/mutant/src/java/remote/org/apache/ant/remote/RemoteMain.java b/proposal/mutant/src/java/remote/org/apache/ant/remote/RemoteMain.java
deleted file mode 100644
index 35d5d5ee2..000000000
--- a/proposal/mutant/src/java/remote/org/apache/ant/remote/RemoteMain.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.remote;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.lang.reflect.Method;
-
-/**
- * Command line to run Ant core from a remote server
- *
- * @author Conor MacNeill
- * @created 27 January 2002
- */
-public class RemoteMain {
- /**
- * The main program for the RemoteLauncher class
- *
- * @param args The command line arguments
- * @exception Exception if the launcher encounters a problem
- */
- public static void main(String[] args) throws Exception {
-
- if (args.length == 0) {
- throw new Exception("You must specify the location of the "
- + "remote server");
- }
-
- String antHome = args[0];
-
- URL[] remoteStart = new URL[1];
- remoteStart[0] = new URL(antHome + "/lib/start.jar");
- URLClassLoader remoteLoader = new URLClassLoader(remoteStart);
-
- String[] realArgs = new String[args.length - 1];
- System.arraycopy(args, 1, realArgs, 0, realArgs.length);
-
- System.out.print("Loading remote Ant ... ");
- Class launcher
- = Class.forName("org.apache.ant.start.Main", true, remoteLoader);
-
- final Class[] param = {Class.forName("[Ljava.lang.String;")};
- final Method startMethod = launcher.getMethod("main", param);
- final Object[] arguments = {realArgs};
- System.out.println("Done");
- System.out.println("Starting Ant from remote server");
- startMethod.invoke(null, arguments);
- }
-}
-
diff --git a/proposal/mutant/src/java/start/org/apache/ant/start/Main.java b/proposal/mutant/src/java/start/org/apache/ant/start/Main.java
deleted file mode 100755
index 3e4a6d386..000000000
--- a/proposal/mutant/src/java/start/org/apache/ant/start/Main.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.ant.start;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.jar.Attributes;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
-import org.apache.ant.init.AntEnvironment;
-import org.apache.ant.init.InitException;
-import org.apache.ant.init.Frontend;
-import java.io.File;
-
-/**
- * This is the main startup class for the command line interface of Ant. It
- * establishes the classloaders used by the other components of Ant.
- *
- * @author Conor MacNeill
- * @created 9 January 2002
- */
-public class Main {
- /** The default front end name */
- public static final String DEFAULT_FRONTEND = "cli";
-
-
- /**
- * Entry point for starting command line Ant
- *
- * @param args commandline arguments
- * @exception Exception if there is a problem running Ant
- */
- public static void main(String[] args) throws Exception {
- Main main = new Main();
- int frontendIndex = -1;
- String frontend = DEFAULT_FRONTEND;
-
- for (int i = 0; i < args.length; ++i) {
- if (args[i].equals("-frontend")) {
- frontendIndex = i;
- break;
- }
- }
-
- String[] mainArgs = args;
- if (frontendIndex != -1) {
- try {
- frontend = args[frontendIndex + 1];
- } catch (IndexOutOfBoundsException e) {
- throw new InitException("You must specify a value for the "
- + "-frontend argument");
- }
-
- mainArgs = new String[args.length - 2];
-
- System.arraycopy(args, 0, mainArgs, 0, frontendIndex);
- if (args.length > (frontendIndex + 2)) {
- System.arraycopy(args, frontendIndex + 2, mainArgs,
- frontendIndex, args.length - frontendIndex - 2);
- }
- }
-
- main.start(frontend, mainArgs);
- }
-
-
- /**
- * Internal start method used to initialise front end
- *
- * @param frontendName the frontend jar to launch
- * @param args commandline arguments
- * @exception InitException if the front end cannot be started
- */
- public void start(String frontendName, String[] args)
- throws InitException {
- try {
- AntEnvironment antEnv = new AntEnvironment(getClass());
-
- URL frontendJar = new URL(antEnv.getLibraryURL(),
- "frontend/" + frontendName + ".jar");
- URL[] frontendJars = new URL[]{frontendJar};
- ClassLoader frontEndLoader
- = new URLClassLoader(frontendJars, antEnv.getCoreLoader());
-
- //System.out.println("Front End Loader config");
- //LoaderUtils.dumpLoader(System.out, frontEndLoader);
-
- if (frontendJar.getProtocol().equals("file")) {
- File jarFile = new File(frontendJar.getFile());
- if (!jarFile.exists()) {
- throw new InitException("Could not find jar for frontend \""
- + frontendName + "\" - expected at " + frontendJar);
- }
- }
- String mainClass = getMainClass(frontendJar);
-
- if (mainClass == null) {
- throw new InitException("Unable to determine main class "
- + " for \"" + frontendName + "\" frontend");
- }
-
- // Now start the front end by reflection.
- Class frontendClass = Class.forName(mainClass, true,
- frontEndLoader);
-
- Frontend frontend = (Frontend) frontendClass.newInstance();
- frontend.start(args, antEnv);
- } catch (Exception e) {
- throw new InitException(e);
- }
- }
-
-
- /**
- * Pick up the main class from a jar's manifest
- *
- * @param jarURL the URL to the jar
- * @return the jar's main-class or null if it is not specified or
- * cannot be determined.
- */
- private String getMainClass(URL jarURL) {
- try {
- JarInputStream stream = null;
-
- try {
- stream = new JarInputStream(jarURL.openStream());
-
- Manifest manifest = stream.getManifest();
-
- if (manifest == null) {
- return null;
- }
- Attributes mainAttributes = manifest.getMainAttributes();
-
- return mainAttributes.getValue("Main-Class");
- } finally {
- if (stream != null) {
- stream.close();
- }
- }
- } catch (IOException e) {
- // ignore
- return null;
- }
- }
-}
-
diff --git a/proposal/mutant/src/java/start/org/apache/tools/ant/Main.java b/proposal/mutant/src/java/start/org/apache/tools/ant/Main.java
deleted file mode 100755
index 9acd8c672..000000000
--- a/proposal/mutant/src/java/start/org/apache/tools/ant/Main.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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
- * .
- */
-package org.apache.tools.ant;
-
-/**
- * Old Ant1 entry point
- *
- * @author Conor MacNeill
- * @created 4 April 2002
- */
-public class Main {
- /**
- * Entry point for starting command line Ant
- *
- * @param args commandline arguments
- * @exception Exception if there is a problem running Ant
- */
- public static void main(String[] args) throws Exception {
- org.apache.ant.start.Main.main(args);
- }
-}
-
diff --git a/proposal/mutant/src/script/mutant b/proposal/mutant/src/script/mutant
deleted file mode 100644
index d759f4b18..000000000
--- a/proposal/mutant/src/script/mutant
+++ /dev/null
@@ -1,172 +0,0 @@
-#! /bin/sh
-# Copyright (c) 2002 The Apache Software Foundation. All rights
-# reserved.
-
-# load system-wide ant configuration
-if [ -f "/etc/mutant.conf" ] ; then
- . /etc/mutant.conf
-fi
-
-# provide default values for people who don't use RPMs
-if [ -z "$rpm_mode" ] ; then
- rpm_mode=false;
-fi
-if [ -z "$usejikes" ] ; then
- usejikes=false;
-fi
-
-# load user ant configuration
-if [ -f "$HOME/.antrc" ] ; then
- . $HOME/.antrc
-fi
-
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
- Darwin*) darwin=true
- if [ -z "$JAVA_HOME" ] ; then
- JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
- fi
- ;;
-esac
-
-if [ -z "$MUTANT_HOME" ] ; then
- # try to find MUTANT
- if [ -d /opt/mutant ] ; then
- MUTANT_HOME=/opt/mutant
- fi
-
- if [ -d ${HOME}/opt/mutant ] ; then
- MUTANT_HOME=${HOME}/opt/mutant
- fi
-
- ## resolve links - $0 may be a link to ant's home
- PRG=$0
- progname=`basename $0`
- saveddir=`pwd`
-
- # need this for relative symlinks
- cd `dirname $PRG`
-
- while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG="`dirname $PRG`/$link"
- fi
- done
-
- MUTANT_HOME=`dirname "$PRG"`/..
-
- # make it fully qualified
- MUTANT_HOME=`cd "$MUTANT_HOME" && pwd`
-
- cd $saveddir
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$MUTANT_HOME" ] &&
- MUTANT_HOME=`cygpath --unix "$MUTANT_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- else
- JAVACMD=java
- fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly."
- echo " We cannot execute $JAVACMD"
- exit 1
-fi
-
-# in rpm_mode get ant/optional/xml parser&api from JAVALIBDIR
-if $rpm_mode; then
- JAVALIBDIR=/usr/share/java
- # TODO - RPM structure for Mutant needs to be determined
-else
- # add in the dependency .jar files in non-RPM mode (the default)
- STARTJARPATH="${MUTANT_HOME}"/lib/core/start/start.jar
-fi
-
-if [ -n "$JAVA_HOME" ] ; then
- if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
- TOOLSJARPATH="$JAVA_HOME/lib/tools.jar"
- fi
-
- # OSX hack to make Ant work with jikes
- if $darwin ; then
- OSXHACK="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes"
- if [ -d ${OSXHACK} ] ; then
- for i in ${OSXHACK}/*.jar
- do
- JIKESPATH=$JIKESPATH:$i
- done
- fi
- fi
-else
- echo "Warning: JAVA_HOME environment variable is not set."
- echo " If build fails because sun.* classes could not be found"
- echo " you will need to set the JAVA_HOME environment variable"
- echo " to the installation directory of java."
-fi
-
-# supply JIKESPATH to Ant as jikes.class.path
-if [ -n "$JIKESPATH" ] ; then
- if $cygwin ; then
- JIKESPATH=`cygpath --path --windows "$JIKESPATH"`
- fi
- ANT_OPTS="$ANT_OPTS -Djikes.class.path=$JIKESPATH"
-fi
-
-# Allow Jikes support (off by default)
-if $usejikes; then
- ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes"
-fi
-
-LOCALCLASSPATH=$STARTJARPATH
-
-if [ -n "$CLASSPATH" ] ; then
- LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
-fi
-
-#Setup policy file
-if [ -z $ANT_POLICY ] ; then
- if [ -f $MUTANT_HOME/conf/ant.policy ] ; then
- ANT_POLICY=file:$MUTANT_HOME/conf/ant.policy
- fi
-fi
-
-if [ -n $ANT_POLICY ] ; then
- ANT_OPTS="$ANT_OPTS -Djava.security.manager -Djava.security.policy=$ANT_POLICY"
-fi
-
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- MUTANT_HOME=`cygpath --path --windows "$MUTANT_HOME"`
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- STARTJARPATH=`cygpath --path --windows "$STARTJARPATH"`
- TOOLSJARPATH=`cygpath --path --windows "$TOOLSJARPATH"`
- LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
- ANT_OPTS="$ANT_OPTS -Dcygwin.user.home="`cygpath --path --windows "$HOME"`
-fi
-
-"$JAVACMD" -classpath "$LOCALCLASSPATH" $ANT_OPTS -Dant.home=$MUTANT_HOME org.apache.ant.start.Main $ANT_ARGS "$@"
diff --git a/proposal/mutant/xdocs/desc.xml b/proposal/mutant/xdocs/desc.xml
deleted file mode 100644
index a97dd149c..000000000
--- a/proposal/mutant/xdocs/desc.xml
+++ /dev/null
@@ -1,607 +0,0 @@
-
-
-
-
- Conor MacNeill
- Mutant Design Notes
-
-
-
-
-
-
-This is a brief, albeit rambling description of Mutant.
-Mutant has many experimental ideas which may or may not prove useful.
-I'll try to describe what is there and let anyone who is interested
-comment. Mutant is still immature. You'll notice that there is, at this
-time, just one task, a hacked version of the echo task, which I have
-been using to test out ideas. Most tasks would end up being pretty
-similar to their Ant 1.x version.
-
-
-
-OK, let me start with some of the motivating requirements. There are of
-coure many Ant2 requirements but I want to focus on these two for now.
-Mutant does also address many of the other Ant2 requirements.
-
-
-
-I'll use the terms Ant and mutant somewhat interchangeably - just
-habit, not an assumption of any sort.
-
-
-
-One of the things which is pretty difficult in Ant 1.x is the
-management of classpaths and classloaders. For example, today the
-antlr task requires the antlr classes in the classpath used to start
-ant. I'm talking here about the classpath built up in the ant.bat/ant
-script launchers. At the same time, the checkstyle task
-which uses antlr won't run if the antlr classes are in the classpath
-because then those classes cannot "see" the classes in the taskdef's
-classpath.
-
-
-
-Another requirement I have is extensibility. In Ant 1.x this is
-difficult because whenever a new type is created, each task which
-needs to support this type must be changed to provide the new addXXX
-method. The ejbjar task is on example of this problem with its concept of vendor
-specific tools. The zip/jar task, with its support for different types
-of fileset, is another. The addition of the classfileset to Ant requires
-a change to the zip task.
-
-
-
-
-
-Mutant defines a classloader hierarchy somewhat similar to that used
-in Tomcat 4. Tasks join into this hierarchy at a particular point to
-ensure they have visibility of the necessary interface classes and no
-visibility of the Ant core itself. There is nothing particularly novel
-about this approach, but tasks are able to request certain additional resources
-as we will see later.
-
-
-
-Mutant starts with two jars. One is the start.jar which contains just
-one class, Main.java which establishes the initial configuration and
-then runs the appropriate front end command line class. If a different
-front end was desired, a different launch class, in its own jar, would
-be used. This would perhaps configure the classloader hierarchy somewhat
-differently and start the approriate GUI front end class.
-
-
-
-The second jar, init.jar, provides a number of initialisation utilities. These
-are used by Main.java to setup Ant and would also be used by any other front end
-to configure Ant. The important class here is the
-InitConfig which communicates the state of Ant at startup into the the core of
-Ant when it starts up. Main determines the location of ANT_HOME based on the
-location of the start classes and then populates the InitConfig with both
-classloaders and information about the location of various jars and config
-files.
-
-
-
-At the top of the classloader hierarchy
-are the bootstrap and system classloaders. I won't really
-distinguish between these in mutant. Combined they provide the JDK
-classes, plus the classes from the init and start jars. One objective is
-to keep the footprint of the init and start jars small so they do not
-require any external classes, which may then become visible lower in the
-hierarchy. Main does not explicitly create these loaders, of course, but
-just adds a reference to the init config as system class loader
-
-
-
-The next jar is for the common area. This provides interface definitions
-and utility classes for use by both the core and by tasks/types etc. It
-is loaded from ANT_HOME/lib/common/*.jar. Typically this is just
-lib/common/common.jar but any other jars in here are loaded. This
-pattern is used in the construction of all of the classloaders.
-
-
-
-Next up is the core loader. It includes the lib/antcore/antcore.jar plus
-any others including the XML parser jars. Mutant's core does not assume that
-the project model will come from an XML description but XML facilities
-are needed in the core for reading in Ant library defs and config files.
-The parser jar locations are also stored in the init config. This lets
-the jars be added to any Ant library that wants to use Ant's XML parser
-rather than providing its own. Similarly tools.jar's location is
-determined automatically and added to the config for use by tasks which
-request it. I'll go into more detail when discussing the antlib processing.
-
-
-
-The final jar that is loaded is the jar for the frontend - cli.jar. This
-is not passed in init config since these classes are not visible to the
-core and are not needed by it. So the hierarchy is
-
-Task classloaders generally will come in at common, hiding the core classes, front
-end and XML parser classes from tasks.
-
-
-
-Once Main has setup the initConfig, it creates the front end commandline
-class and launches mutant proper, passing it the command line args and
-the init config.
-
-
-
-A GUI would typically replace start.jar and the cli.jar with its own
-versions which manage model construction from GUI processes rather than
-from XML files. It may be possible to move some of Main.java's
-processing into init.jar if it is useful to other front ends. I haven't
-looked at that balance.
-
-
-
-
-
-The front end is responsible for coordinating execution of Ant. It
-manages command line arguments, builds a model of the Project to be
-evaluated and coordinates the execution services of the core. cli.jar
-contains not only the front-end code but also the XML parsing code for
-building a project model from an XML description. Other front ends may
-choose to build project models in different ways. Commandline is pretty
-similar to Ant 1.x's Main.java - it handles arguments, building loggers,
-listeners, defines, etc - actually I haven't fully implemented
-command line defines in
-mutant yet but it would be similar to Ant 1.x.
-
-
-
-Commandline then moves to building a project model from the XML
-representation. I have just expanded the approach in Ant 1's
-ProjectHelper for XML parsing, moving away from a stack of inner classes.
-The classes in the front end XML parsing use some XML utility base
-classes from the core.
-
-
-
-The XML parsing handles two elements at parse time. One is the <ref>
-element which is used for project references - that is relationships
-between project files. The referenced project is parsed as well. The
-second is the <include> element which includes either another complete
-project or a project <fragment> directly into the project. All the other
-elements are used to build a project model which is later processed in
-the core.
-
-
-
-The project model itself is organized like this
-
-
-
-
-
A project contains
-
-
named references to other projects
-
targets
-
build elements (tasks, type instances)
-
-
-
A target contains
-
-
build elements (tasks, type instances)
-
-
-
-
A build element contains
-
-
build elements (nested elements)
-
-
-
-
-
-So, for now the project model contains top level tasks and type
-instances. I'm still thinking about those and property scoping
-especially in the face of project refs and property overrides. Anyway,
-the running of these tasks is currently disabled.
-
-
-
-Once the model is built, the commandline creates an execution manager
-instance, passing it the initConfig built by Main.jar. It adds build
-listeners and then starts the build using the services of the
-ExecutionManager.
-
-
-
-
-
-Before we get into execution proper, I'll deal with the structure of an
-ant library and how it works. An antlibrary is a jar file with a library
-descriptor located in META-INF/antlib.xml. This defines what
-typedefs/taskdefs/converters the library makes available to Ant. The
-classes or at least some of the classes for the library will normally be
-available in the jar. The descriptor looks like this (I'll provide two
-examples here)
-
-the "libid" attribute is used to globally identify a library. It is used
-in Ant to pick which tasks you want to make available to a build file.
-As the number of tasks available goes up, this is used to prevent name
-collisions, etc. The name is constructed similarly to a Java package name -
-i.e Reverse DNS order.
-
-
-
-The "home" attribute is a bit of fluff unused by mutant to allow tools
-to manage libraries and update them etc. More thought could go into
-this.
-
-
-
-"reqxml" allows a library to say that it wants to use Ant's XML parser
-classes. Note that these will be coming from the library's classloader
-so they will not, in fact, be the same runtime classes as used in Ant's core,
-but it saves tasks packaging their own XML parsers.
-
-
-
-"reqtools" allows a library to specify that it uses classes from Sun's
-tools.jar file. Again, if tools.jar is available it will be added to the
-list of classes in the library's classloader
-
-
-
-"extends" allows for a single "inheritance" style relationship between
-libraries. I'm not sure how useful this may be yet but it seems
-important for accessing common custom types. It basically translates
-into the class loader for this library using the one identified in
-extends as its parent.
-
-
-
-"isolate" specifies that each task created from this libary comes from
-its own classloader. This can be used with tasks derived from Java
-applications which have static initialisers. This used to be an issue
-with the Anakia task, for example. Similarly it could be used to ensure that
-tool.jar classes are unloaded to stop memory leaks. Again this is
-experimental so may not prove ultimately useful.
-
-
-
-The <typedef> in the example creates a <thread> type. That is just a bit of fun which
-I'll use in an example later. It does show the typedefing of a type from
-outside the ant library however.
-
-
-
-<taskdef> is pretty obvious. It identifies a taskname with a class from
-the library. The import task, which I have not yet implemented will
-allow this name to be aliased - something like
-
-Tasks are not made available automatically. The build file must state
-which tasks it wants to use using an <import> task. This is similar to
-Java's import statement. Similarly classes whose ids start with "ant."
-are fully imported at the start of execution.
-
-
-
-
-
-When mutant starts execution, it reads in a config file. Actually it
-attempts to read two files, one from $ANT_HOME/conf/antconfig.xml and
-another from $HOME/.ant/antconfig.xml. Others could be added even
-specified in the command line. These config files are used to provide
-two things - libpaths and task dirs.
-
-
-
-Taskdirs are locations to search for additional ant libraries. As people
-bundle Ant tasks and types with their products, it will not be practical
-to bundle all this into ANT_HOME/lib. These additional dirs are scanned
-for ant libraries. All .zip/.jar/.tsk files which contain the
-META-INF/antlib.xml file will be processed.
-
-
-
-Sometimes, of course, the tasks and the libraries upon which they depend
-are not produced by the same people. It is not feasible to go in and
-edit manifests to connect the ant library with its required support
-jars, so the libpath element in the config file is used to specify
-additional paths to be added to a library's classloader. An example
-config would be
-
-Obviously other information can be added to the config - standard
-property values, compiler prefs, etc. I haven't done that yet. User
-level config override system level configs.
-
-
-
-So, when a ant library creates a classloader, it will take a number of
-URLS. One is the task library itself, the XML parser classes if
-requested, the tools.jar if requested, and any additional libraries
-specified in the <antconfig>. The parent loader is the common loader
-from the initconfig. unless this library is an extending library.
-
-
-
-
-
-Execution of a build is provided by the core through two key classes.
-One if the ExecutionManager and the other is the ExecutionFrame. An
-execution frame is created for each project in the project model
-hierarchy. It represents the execution state of the project - data
-values, imported tasks, typedefs, taskdefs, etc.
-
-
-
-The ExecutionManager begins by reading configs, searching for ant
-libraries, configuring and appending any additional paths, etc. It then
-creates a root ExecutionFrame which represents the root project. when a
-build is commenced, the project model is validated and then passed to
-the ExecutionFrame.
-
-
-
-the ExecutionFrame is the main execution class. When it is created it
-imports all ant libraries with ids that start with ant.*. All others are
-available but must be explicitly imported with <import> tasks. When the
-project is passed in, ExecutionFrames are created for any referenced
-projects. This builds an ExecutionFrame hierarchy which parallels the
-project hierarchy. Each <ref> uses a name to identify the referenced
-project. All property and target references use these reference names to
-identify the particular frame that hold the data. As an example, look at
-this build file
-
-Notice the depends reference to the test2 target in the test.ant project
-file. I am still using the ":" as a separator for refs. It doesn't
-collide with XML namespaces so that should be OK.
-
-
-
-Execution proceeds by determining the targets in the various frames
-which need to be executed. The appropriate frame is requested to execute
-the target's tasks and type instances. The imports for the frame are
-consulted to determine what is the approrpiate library and class from
-that library. A classloader is fetched, the class is instantiated,
-introspected and then configured from the corresponding part of the
-project model. Ant 1.x's IntrospectionHelper has been split into two -
-the ClassIntrospector and the Reflector. When the task is being
-configured, the context classloader is set. Similarly it is set when the
-task is being executed. Types are handled similarly. When a type in
-instantiated or a task executed, and they support the appropriate
-interface, they will be passed a context through which they can access
-the services of the core. Currently the context is an interface although
-I have wondered if an abstract class may be better to handle expansion
-of the services available over time.
-
-
-
-
-
-Introspection is not a lot different from Ant 1.x. After some thought I
-have dropped the createXXX method to allow for polymorphic type support, discussed
-below. setXXX methods, coupled with an approriate string to
-type converter are used for attributes. addXXX methods are used for
-nested elements. All of the value setting has been moved to a Reflector
-object. Object creation for addXXX methods is no longer provided in the
-reflector class, just the storage of the value. This allows support for
-add methods defined in terms of interfaces. For example, the hacked Echo
-task I am using has this definition
-
-So when mutant encounteres a nested element it does the following checks
-
-
-
-Is the value specified by reference?
-
-
-
-<run ant:refid="test"/>
-
-
-
-Is it specified by as a polymorphic type?
-
-
-
-<run ant:type="thread"/>
-
-
-
-or is it just a normal run o' the mill nested element, which is
-instantiated by a zero arg constructor.
-
-
-
-Note the use of the ant namespace for the metadata. In essence the
-nested element name <run> identifies the add method to be used, while
-the refId or type elements specify the actual instance or type to be
-used. The ant:type identifies an Ant datatype to be instantiated. If
-neither is specified, the type that is expected by the identified
-method, addRun in this case, is used to create an instance. In this case
-that would fail.
-
-
-
-Polymorphism, coupled with typedefs is one way, and a good way IMHO, of
-solving the extensibility of tasks such as ejbjar.
-
-
-
-OK, that is about the size of it. Let me finish with two complete build
-files and the result of running mutant on them.
-
-test2:
- [echo] Adding runnable of type java.lang.Thread
- [echo] hello2
- [echo] Adding runnable of type java.lang.Thread
- [echo] hello3
-
-test:
- [echo] hello
-
-BUILD SUCCESSFUL
-
-Total time: 0 seconds
-
-
-
-
-Lets change the <run> definition to
-
-
-
-<run/> in test.ant and the result becomes
-
-
-
-
-test2:
- [echo] Adding runnable of type java.lang.Thread
- [echo] hello2
-
-BUILD FAILED
-
-/home/conor/dev/mutant/test/test.ant:10:
-No element can be created for nested element <run>.
-Please provide a value by reference or specify the value type
-
-This page describes the major features in Mutant which are significantly
-different from those of Ant1. These are covered from a user perspective. Other
-pages describe the differences from the perspectives of a task developer and an
-Ant core developer.
-
-
-
-
-
-When Mutant is installed, the most immediately obvious difference will be in the
-directory layout, particularly the lib directory. Where Ant1's lib directory
-contained ant.jar, optional.jar and the bundled XML jars, Mutant's lib directory
-contain a number of subdirectories.
-
-
-
-In the root directory, there are a number of jars. These jars are the startup
-jars
-
-
-
-
init.jar
-
a set of low level utility routines required at startup
-
-
-
start.jar
-
the Mutant launcher class
-
-
-
ant.jar
-
old Ant1 entry point
-
-
-
-
-The subdirectories have the following functions
-
-
-
-
parser
-
The XML parser jars. This is not available to task libraries unless
-they explicitly indicate that it is required.
-
-
-
antcore
-
Mutant's core classes. These classes are not available to
-tasks.
-
-
-
common
-
classes which are available to both the core and all task
-libraries.
-
-
-
syslibs/antlibs
-
Task libraries. The distinction between the two is
-discussed below.
-
-
-
frontend
-
Ant Frontends. Different frontends may be plugged in by placing
-jars here.
-
-
-
-
-The directory a jar is in will control the visibility of the jar's classes and
-resources. This is closely related to the classloader hiearchy used by
-Mutant.
-
-
-
-
-
-
-Mutant supports the concept of Ant Libraries. These are collections of
-components (tasks and types) and their supporting classes packaged into a
-Jar. In Mutant each library has a globally unique identifier. This identifier
-uses the same conventions as Java package naming - i.e. a reverse DNS name.
-
-
-
The jar does not need to be exclusively for Ant. For example, it may be the
-jar for a tool which wishes to provide some Ant tasks for using the tool. It
-could be the main jar of an appication server that bundles Ant tasks for
-deployment. The jar does not even need to be installed in Mutant's antlib
-directory - Mutant can be configured to look in jars in other locations for Ant
-Libraries.
-
-
-
-
-Whatever the jar contains and wherever it is located, Mutant looks for an XML
-based descriptor in the jar at META-INF/antlib.xml. This XML file describes the
-components in the jar that will be available to Mutant.
-
-
-
-Here is an example of the descriptor.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]]>
-
-
-As a user you generally won't need to worry about this decriptor. The library
-developer will have developed it to describe their library. Mutant uses the
-descriptor to understand what Ant related components the library provides.
-
-
-
-
-
-Library management in Mutant is split into two phases - a loading phase and an
-import phase. The loading phase is where Mutant loads the antlib.xml descriptor
-from the library. After loading, Mutant knows where the library is located and
-what components it provides. In general Mutant will not make the components
-available to build scripts automatically. A build script needs to notify Mutant
-what components it is using from each library. This is known as importing.
-
-
-
Mutant loads libraries from two locations within the Mutant directory
-structure when Mutant starts up - the lib/syslibs and lib/antlibs directories.
-The distinction between these two locations is explained in the configuration
-discussion below. All jars in these directories will be search for library
-descriptors. All libraries providing descriptors will be available for importing
-into builds
-
-
In addition to the automatically loaded libraries, it is possible to
-explicitly request additional libraries to be loaded using the
-<loadlib> task. Individual libraries may be loaded or a set
-of libraries loaded from a directory. Libraries may also be loaded from remote
-locations by specifying a URL. The loadlib task can request that all components
-in the loaded library also be imported at the time of loading. Examples of the
-loadlib task follow
-
-
-
-
-
-
-
-
-
-]]>
-
-
-In general the loading of libraries from absolute locations would be a
-configuration task. These would be specified in the Mutant configuration file
-and would not be used in a build file. The loading of project libraries from
-relative locations may be something that you would see in a build file.
-
-
-
-
-
-
-Mutant is designed to allow tasks to be defined simply by dropping a jar in a
-directory or configuring Mutant to look in particular places for jars. This will
-allow tasks and types developed by many different developers to be used. With
-many developers developing tasks, however, inevitably some tasks will end up
-with the same name.
-
-
-
-This is very similar to the situation faced by Java with Java class names.
-Many Java classes have the same name. When a Java programmer uses a class they
-must import that class with an import statement. This tells the Java compiler
-which particular class is being referenced by the classname. Effectively the
-import statement creates a mapping from a name used in the Java source file and
-a class in the global package namespace.
-
-
-
-Mutant provides an import task to specify, in a manner similar to Java's import
-statement, which components are being used. When a component is imported the
-library is identified by its unique id. By default the component is imported
-into the frame using the name it is known by within the library. When this would
-conflict with a name that has already been imported, the import task allows the
-component to be given a new name, or alias, by which it will be referenced. It
-is also possible to import all the components in a library. The folowing example
-shows the various methods by which the import task can be used to import
-components.
-
-
-
-
-
-
-
-
-
-
-]]>
-
-
-By using library identifiers, import operations are not tied to a particular
-library location. The separation of the loading and importing into separate
-phases allows environment-dependent locations to be specified as configuration
-information and location independent importing to be specified in the build
-file. This is similar to the case of Java imports. Java classes are imported by
-their global name without needing to known where the classfile is that contains
-that class. That information is provided externally in the CLASSPATH variable.
-
-
-
-
-
-
-Many libraries will have dependencies on external jars. For example, a task
-might make use of regular-expression libraries such as jakarta-regexp or a task
-may provide a wrapper around some external tool. In these cases the task will
-usually need to have the required classes available in the classloader from
-which the task itself was loaded. It is possible to avoid these direct
-dependencies using techniques such as reflection and explicitly loading the
-required classes through additional classloaders but the code is often harder to
-write and understand.
-
-
-
It is not always possible or desirable to bundle the required classes in the
-task's jar nor is it desirable that the system classpath contains the required
-classes. In fact it is often preferable to run Mutant with an empty classpath.
-Buildfiles which do not assume that the system classpath contains particular
-classes are generally more portable. Mutant provides a task,
-<libpath>, to allow additional paths to be assodicated with a
-library. As with the loadlib task, the libpath task may be used to associate a
-single file, all jars in a directory or remote jars with a library.
-
-
-]]>
-
-
The above example associates all the jars in
-/home/conor/jakarta-ant/lib/optional/ with the library whose unique id is
-ant.ant1compat. A path must be associated with a library before any components
-are imported from the library. Mutant associates the paths with the library and
-at the time a component is requested from the library, Mutant will form the
-classloader that will be used. The additional paths are added to the definition
-of the classloader. Once a component is loaded, further paths will not have any
-effect. For this reason, and since the additonal paths are likely to be absolute
-paths, the <libpath> task is normally used in Mutant's
-configuration phase.
-
-
-
-
-
-Mutant will automatically import all components of any library whose unique
-identifier begins with "ant." when the ;library is loaded. This is
-mainly a convenience to provide a minimum set of tasks with which to construct
-build files.
-
-
-
-
-
-
-
Mutant provides a mechanism for including build file fragments into a build
-file. This following example illustrates how this works
The include mechanism can be used to include a complete project file or as
-shown in the example, a fragment. When including a project, any attributes on
-the included <project> element are ignored and the contents
-of the project inserted into the including project. In all cases the included
-files must be a well formed XML file containing a root element.
-
-
-
-
This area of Mutant is subject to change.
-
-
At present include elements are processed at parse-time. As such they can
-only occur at the top-level of the build file. They cannot occur in a target.
-The use of the namespace to qualify the include element is intended to convey
-the fact that this is not part of the build structure.
-
-
An alternative approach would be to define include as a regular task. When an
-include is processed, the top-level tasks of the included project would be
-executed immediately and the targets added to the current project
-structure.
.
-
-
-
-
-
-
-
-
-
-Mutant allows build file writers to reference properties and targets in other
-projects by creating a project reference. Project references are introduced
-using the ref task.
-
-
-
-
-
-
-
-
-]]>
-
-
-The above example creates two project references - one to the build in main.xml
-and one to the build in test.xml. When a reference is created, it must be given
-a label. This label will be used to refer to items within the referenced
-project (see below). Note that the ref task is a regular task and the reference
-is only created when the ref task is executed. A ref task may be placed at the
-top level of a build to effectively create static references. Alternatively a
-reference may be created dynamically by putting the ref task in a target.
-
-
-
-
-
-The label given to a project reference is used when accessing items within the
-project. So, to access the build.dir property in the project referenced by the
-main label, you would use main:build.dir. Similarly the compile target would be
-referred to as main:compile. Since the referenced projects may also create their
-own project references, labels may be concatenated to access items at arbitrary
-depths. For example, if main.xml referenced another project under the label
-"sub", a property debug could be referenced as main:sub:debug. The
-following example shows various items in the referenced project being used.
-
-When a project is referenced, the top level tasks of the referenced project are
-run to allow the project to initialize itself. Mutant allows the referring
-build to set a property in a referenced project before the reference is
-created. When the reference is eventually created these properties are set
-before initialization occurs. In normal Ant fashion, these overriding
-properties take precedence. In particular properties in the referenced projects
-may be set from the command line as this example shows
-
-
- mutant -Dmain:build.dir=temp
-
-
-
-The example above shows a target in the referenced project being used as a
-dependency and also as a target in an antcall. Since refs are dynamic, Mutant
-will only evaluate such dependencies when required. If the alt target were
-never to be run, the dependency on main:fubar would never be checked.
-
-
-
-The import task allows components defined in a referenced project to be brought
-into the main build. For example, the following will bring the definition of
-tool from the test project in the build. The imported component may also be
-aliased to a new name.
-
-
-
-
-]]>
-
-
-
-
-
-
-As discussed above Mutant provides a number of tasks to manage libraries and
-it is appropriate to run many of these tasks as part of a user or system-wide
-configuration rather than incorporating them into the build file. Mutant
-provides a configuration system to support running these tasks at an appropriate
-time. A Mutant configuration file looks as follows
-
-
-
-
-
-
-
-
-
-
-]]>
-
-
-The antconfig element is the root element of the configuration file. It supports
-three attributes
-
-
-
-
allow-unset-properties
-
controls whether Mutant will fail a build which
-refers to a property which has not been set. This defaults to the Ant1 behaviour
-(true)
-
-
-
allow-remote-library
-
controls whether Mutant uses components defined in remote libraries
-
-
-
allow-remote-project
-
controls whether Mutant can run a project or reference a project which is
-located remotely.
-
-
-
-
-The configuration provides two collections of configuration tasks, global-tasks
-and project-tasks. Global-tasks are run once and are run in the context of the
-main project - i.e. the build file identified on the command line (defaults to
-build.xml/build.ant), whilst project-tasks are run as part of the initialization
-of every project including referenced projects and antcall projects. Looking at
-the above example, the global-tasks associate a path with the ant.ant1compat
-library while the per-project tasks import the antopt.monitor library into every
-project that Mutant processes.
-
-
-
-The tasks that can be run in the configuration phase are regular tasks but not
-all tasks are automatically available. This is the difference between the
-syslibs and antlibs directories. The global tasks are run after the syslibs
-libraries have been loaded but prior to the antlibs libraries being loaded. The
-syslibs library tasks are therefore available in the configuration phase. This
-arrangement is to allow the configuration tasks to setup library paths for the
-libraries contained in the antlibs directory, especially libraries in the Ant
-namespace which are automatically imported at the time they are loaded.
-
-
-
-If it is required to use tasks from libraries installed in the antlibs
-directory, the configuration tasks may explicitly load the library and import
-the required tasks. The following example shows the loading and use of the echo
-task in the configuration tasks. Note that the ant.home property has been set at
-the time the configuration tasks are started.
-
-
-
-
-
-
-
-
-
-
-
-]]>
-
-
-When Mutant starts up it will load configurations from two locations - The file
-.ant/conf/antconfig.xml in the user's home directory and the file
-conf/antconfig.xml in the Mutant home directory. In addition, config files can
-be specified on the command line using a -config argument. This allows project
-specific configurations to be used.
-
-
-
-
-
-
-
-Mutant allows any task or datatype to be placed outside of a target. All such
-components are processed when the project is initialized and before any targets
-are processed. In fact Mutant does not require that a project contain any
-targets. In this case the only operations performed are the top level tasks at
-project initialization. The following shows a simple example
-
-
-
-
-
-]]>
-
-
-
-
-
-
-
-Normally when a task supports a nested element, Ant automatically determines the
-type of the nested element and creates an instance of this type. This instance is
-then configured and passed to the task. Mutant extends this scheme by allowing
-a build file writer to specify the type of nested element to use rather than
-relying on the core to determine it. Mutant will process attributes and further
-nested elements based on the specified type. For example:
-
-
-
-
-
-
-
-]]>
-
-
-In this example the nested element is actually a classfileset which supports the
-<root> nested element. The actual type is specified using the notation from
-XML Schema. Mutant predclares the XML Schema namespace under the xsi prefix. You
-may explicitly declare this in the build file's XML and use a different prefix
-if you wish. For example, this is equivalent to the above
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]]>
-
-
-
-
-
-
In Ant1, the default build file name is build.xml. In Mutant, the default
-build file is build.ant. If build.xnt cannot be found, Mutant will then look for
-build.xml. This allows you to support both Ant1 and Ant2 users. The build.xml
-file can contain an Ant1 build file. The build.ant file can include or reference
-this build and make use of Mutant's capabilities such as library management,
-library path settings, etc.
-
-This page describes the key goals that have shaped the development of
-Mutant.
-
-
-
-The first section identifies a set of issues with Ant1 that have cropped up as
-Ant1 has evolved. The design implications of each issue are then summarized as a
-Mutant requirement. I do not want to suggest that these problems are unsolvable
-within the Ant1 design. Already I believe we have seen the Ant2 proposals
-influencing people trying to extend Ant1. These issues may be solvable, although at
-the risk of backward compatability impacts or further complication of the Ant1
-codebase.
-
-
-
-The second section covers a set of additional requirements that have emerged as
-the whole concept of Ant2 has developed. Many of these came from the discussions
-on the Ant-Dev mailing list.
-
-
-
-The realisation of these requirements as they impact a user is on the
-next page. Th implications for task developers and
-Ant developers are discussed in the following sections.
-
-
-
-
-
-
-
-The interface between the Ant core and tasks is not controlled. It
-allows tasks almost complete access to the internal data structures of the
-core. This is poor encapsulation. Whilst most tasks do not need and do not
-use this access, its existence nonetheless prevents changes being made to
-the core without raising concerns about impacting backward compatability.
-
-
-
-The uncontrolled nature of the task-core interface also makes it difficult
-to reuse tasks and types in a different context without almost completely
-duplicating the Ant core
-
-
-
-
-A tightly defined interface between the core and the components (tasks and
-types) will allow the core implementation to be changed without the risk
-of impacting tasks. It will also allow components to be reused in other
-contexts.
-
-
-
-
-
-
-
-Ant1 does not provide strong support for embedding Ant in other systems,
-particularly a GUI or IDE. The development of Antidote highlighted this
-difficultly. Antidote was forced to perform its own XML parsing so it could
-build its own model of the build. There is no communication medium for a GUI to
-communicate with the core. Without this capability any GUI will be limited to
-simply editing the XML representation of the build.
-
-
-
-
-The definition of a project model, a Java-based object-model of a build
-description would decouple Ant from the XML representation. This allows
-other representations to be used. Such an object model also forms the basis
-for communications between systems which want to embed Ant. An IDE could
-manipulate this project object model directly and pass to the core for
-processing without needing to convert to and from an external
-representations such as XML.
-
-
-
-
-
-
-The original implementation of Ant1 performed all task configuration at the
-time the XML description of the build was parsed (parse-time). This approach
-could not handle dynamically created tasks very well since in some
-instances the type of the task to be configured was not known at parse-time.
-This limitation was overcome with the introduction of the UnknownElement and
-RuntimeConfigurable classes. While these work well, they are confusing and at
-times surprising to most Ant developers. Also some operations still occur at
-parse-time, notably creation of nested elements of known types. This could be
-overcome by going to a fully dynamic model but the fear of backward
-incompatability constrains this change from occuring.
-
-
-
-
-Execution-time configuration of tasks allows for the latest information to be
-used for configuration. It is also necessary to support the concept of the
-project model. The project model cannot contain execution-time information as it
-does in Ant1
-
-
-
-The decoupling of the parsing and exection phases, communicating through the
-medium of the project model will allow the core to be modularized. The parsing
-and execution phases can be separated and one replaced without impacting the
-other.
-
-
-
-
-
-
-In Ant1, a task, once configured, may be used more than once - i.e. its
-execute method may be called more than once. This occurs when the Ant
-command line specifies the evaluation of two targets. If those targets have
-overlapping dependencies, the tasks in those overlapping dependencies will
-be executed twice. This arrangement requires task writers to preserve the
-state configured by Ant during the execution of the task so that the next
-execution has the correct configuration.
-
-
-
-Many task writers are not aware of this requirement. Frequently the task's
-state is changed during the execution method, which can lead to mysterious
-falures during subsequent executions. This need to preserve the configuration
-state makes writing tasks much harder.
-
-
-
-
-Once a task is configured, it should be executed once. If the execution of
-multiple targets is required, a new task instance should be created and
-configured from the same project model. If reuse of task instances is desired
-each instance must be reinitialized and reconfigured before use.
-
-
-
-
-
-
-Ant1 has a set of well-known tasks (and types). A well-known task is one
-for which a mapping between the taskname and its implementing class is
-predefined in Ant. This mapping is provided by the two defaults.properties
-files in Ant's code. These well-known tasks do not need to be taskdef'd to
-make them available in a build file. Conversely tasks which are not in this
-list need to be explicitly taskdef'd.
-
-
-
-Note that this distinction is not the same as the core/optional
-distinction found in Ant1. An Ant1 core task is notionally supported by Ant
-without requiring any additional external libraries - it just requires the
-classes available in the 1.1 JDK, in Ant and in the libraries Ant uses such
-as the XML parser. An optional task is a task which requires JDK 1.2+
-features or the support of an external library, such as jakarta-regexp.
-
-
-
-The problem with this system is that there is no namespace management. If a
-new task is added to Ant, it may invalidate buildfiles which are already
-using that taskname via a taskdef. Actually the taskdef may continue to work or
-it may not - it will depend on the nested elements that the task definitions
-support (see above discussion of regarding cofiguration at parse-time)
-
-
-
-
-Tasks need to be deployed in libraries by either placing them in well known
-directories of an Ant install or by telling Ant where to look for them. Removing
-the central management of defined task names allows tasks libraries to be
-developed and maintained independently of Ant much more easily.
-
-
-
-Once centralised management of the task namespace is removed, there is,
-however, the possibility of name collision. A mechanism is required to allow a
-build file writer to select which particular tasks are assigned to which
-tasknames.
-
-
-
-
-
-
-In Ant1 certain tasks may appear outside of any target. This is implemented as a
-set of hardcoded conditions in the XML parsing phase. The execution and
-configuration of these tasks does not involve the use of RuntimeConfigurable and
-UnknownElement.
-
-
-
-This hardcoding is not very inituitive. It is confusing to users who do not
-know why only some tasks may be run outside of a target. Also as the list of
-tasks that may be useful as a top-level task grows, further special cases must
-be added to the code making the code harder to maintain.
-
-
-
-
-The number of special names should be kept to a minimum. Special cases should
-be avoided as they are not inituitive.
-
-
-
-
-
-
-In Ant1, the inclusion of a set of build file definitions or targets is achieved
-through the use of XML entities. This is just cumbersome.
-
-
-
-A simplified include mechanism is required to replace the entity based
-inclusion of Ant1.
-
-
-
-
-
-
-
-Probably the greatest issue facing Ant1 today involves the management of the
-classpath and the associated visibility of classes. Most optional tasks in Ant1
-require the supporting classes for the task to be available on the system
-classpath. For example, the JUnit task is only usable if the JUnit jar is on
-the classpath. If it is not, Ant will complain about being unable to create the
-junit task.
-
-
-
-The usual solution when a user runs into this problem is to put the required jar
-into the ANT_HOME/lib directory. This just adds the required jar to the system
-classpath prior to starting Ant albeit without requiring the user to explicitly
-set the classpath.
-
-
-
-There are a number of issues with this approach. The classes on the
-classpath share the same classloader as Ant's classes and Ant's support
-libraries - particularly the XML parser. If a task wishes to use a specific XML
-parser, it may conflict with Ant's own parser. If two tasks require different
-versions of a supporting jar, these will conflict.
-
-
-
-Many tasks make use of factory objects (dynamic class instantiation, dynamic
-resource loading, etc). When the factory is in the system classpath it will not
-be able to load resources available in a taskdef'd task's custom classpath due
-to the delegating nature of classloaders. Such errors can be very confusing to
-users. More recent code is likely to attempt use of a context classloader but
-this is not set by Ant1 currently.
-
-
-
-
-Do not require jars to be added to ANT_HOME/lib to enable tasks. Allow users to
-specify the location of support jars on a per-library basis.
-
-
-
-
-
-
-The earliest versions Ant1 did not explicitly support any datatypes. The only
-datatype, property, was actually created as a side-effect of running the
-<property> task. If it were to be implemented today, property
-would probably be known as a string datatype, perhaps associated with a
-<load-properties> task. This is also the reason property
-is one of those tasks which is allowed to exist outside of a target.
-
-
-
As Ant1 evolved new types such as <path> and
-<fileset> were added. The concept of datatypes has continued
-to evolve to the point where users can now define new datatypes. It would be
-expected that in addition to new types there will be many sub-types created,
-such as new types of fileset. Ant1, however, does not strongly support such type
-extensibility. When a subtype is created by extending an existing type, Ant1
-requires it to be either used by reference or all tasks which accept the base
-type need to be modified to support the new type. Use by reference is not always
-possible. It will depend on whether the base type has been coded to support
-references.
-
-
-
-Support polymorphic behaviour, allowing a build file to pass a subtype to a
-task which is defined to accept the base type. Allow task interfaces to be
-defined in terms of interfaces.
-
-
-
-Move reference processing to the core to make it more regular removing the
-burden of type developers to explicitly support references.
-
-
-
-
-
-
-In Ant1 the Project object takes on too many roles including all of the
-following:
-
-
-
Holds the project model built when parsing the build file
-
Holds the run-time state of the build through the properties and current
-task definitions
-
Provides context for task execution. All tasks have a reference to their
-project instance and use it to access core functions
-
Provides the implementation of common task operations
-
Build event management
-
Message logging
-
Global filter definitions
-
Java Version
-
Property replacement
-
Message Levels
-
Utility functions such as boolean conversion and path translation
-
Integration point for embedding Ant
-
-
-
As a class, Project is not cohesive. Reuse of the Ant core functionality is
-difficulty as all of these concerns bring in many other support classes.
-
-
-
-
-Separate the various roles of Project into more cohesive classes.
-
-
-
-
-
-
-
-
-In addition to the issues which arise from Ant1 limitations, there are a number
-of requirements which have emerged in the mailing list discussions about Ant2.
-This isn't a complete list - just the ones I picked up for Mutant.
-
-
-
-
-
In Ant1 the only way to reuse build file definitions is to use the
-<ant> task. While useful, it is relatively coarse-grained. It
-can also be tedious if you are trying to extend an existing project definition -
-that is, adding new targets while retaining a user's ability to access the
-existing targets.
-
-
-In addition to the extension of projects, it should be possible to compose
-projects creating dependencies between the targets of the different projects,
-and to access the data and definitions of one project by a controlling project
-
-
-
-
-Allow a project to extend and control other projects
-
-
-
-
-
-
-While it has always been accepted that there will be come backward compatibility
-breaks in moving from Ant1 to Ant2, these should be minimized. If the changeover
-from Ant1 to Ant2 is difficult, it may never happen. On the other hand, the
-openness of the Ant1 interface means that some tasks will not work as expected -
-the most difficult being the <script> task.
-
-
-
-
-Achieve a practical level of compatability without degrading the integrity of
-the core's interfaces. A practical level of compatability is intentionally a
-vague measure but it would require the majority of projects in Gump to be built
-without noticeable differences from Ant1
-
-
-
-
-
-
-
-In Ant1 configuration of Ant is achieved either through the execution of OS
-dependent scripts by the launcher scripts or though properties files which have
-the limited capability to set properties.
-
-
-
-
-Provide an XML based configuration system with rich capabilities to configure
-the operation of Ant.
-
-
-
-
-
-
-In Ant1 there are many things which are common to a group of tasks but adding
-the capability to each task is repetitive and tedious. An example would be the
-failonerror attribute which controls whether a task will cause the build to stop
-when it fails. This started on just one task but has since been added to many
-other tasks as users want more fine control over when their builds stop. Aspects
-have been discussed as a mechanism for providing a single implementation of a
-concept or control that can then be applied to tasks independently.
-
-
-
-
-Investigate the use of an Aspect approach to provide common functionality
-across tasks with a single implementation
-
-These pages describe the design and implementation of Mutant.
-
-
-
-For some time, there has been the concept of Ant 2.0, a rearchitecting of
-Ant designed to address the shortcomings in the design of Ant 1.x, while
-drawing the experience gained in that development. This rearchitecting
-would most likely be accompanied by at least some break in backward
-compatability. Over time Ant 2.0 has come to be known as Ant2 and the current
-Ant codebase is generally known as Ant1.
-
-
-
-Mutant is my proposal, a revolution, for Ant2. Actually, I consider it more
-an evolution of the design and implementation used for Ant1, but in Jakarta
-parlance, being a separate codebase, it is termed a revolution.
-
-
-
-There is no special significance in the name Mutant. I chose it because, as
-a word, it is an extension of the word Ant and it also signifies a change
-from the previous generation
-
-
-
-
-
-Mutant is not the only proposed revolution for Ant2. Peter Donald has
-developed another known as
-Myrmidon
-which presents a different view of how Ant2 could be realized. Other
-people hold the view that Ant1 can continue to evolve and that there
-is no need for rearchitecture of its codebase. I recommend you
-investigate all these points of view.
-
-
-
-As I write this, no decision has been taken as to which codebase will be
-adopted for Ant2. It may not be Mutant and it could even be some entirely
-new proposal. These pages do not compare and contrast Mutant with these
-other proposals or points of view, at least not explicitly. They are just
-intended to describe how Mutant is designed and implemented and why it is the
-way it is.
-
-
-
-
-
-
Caution
-
-
-Mutant is not even an alpha release. While it is relatively stable, it is
-subject to change. There are no backward compatability guarantees for any of
-the classes, interfaces, build files, configuration, launch scripts, etc that
-Mutant provides.
-
-
-
In particular, some features in Mutant are experimental and may not, in the
-long run, prove to be worthwhile.
-
-
-
-
-Start now by looking at the key requirements which have
-shaped the design of Mutant.
-
- 